Fix Putrajaya, Malaysia

Ensures we can run the analysis for the city of Putrajaya, Malaysia.

Drive-by:
- Improves the console output.

Fixes: PeopleForBikes/PeopleForBikes.github.io#863
Signed-off-by: Rémy Greinhofer <remy.greinhofer@gmail.com>

Author: rgreinho

brokenspoke_analyzer/cli/importer.py

@@ -22,15 +22,17 @@ def all(
 ) -> None:
     """Import all files into database."""
     # Make MyPy happy.
-    if not region:
-        raise ValueError("`region` must be set")
     if not fips_code:
         raise ValueError("`fips_code` must be set")
     if not lodes_year:
         raise ValueError("`lodes_year` must be set")
     if not buffer:
         raise ValueError("`buffer` must be set")
 
+    # Set the region as the country if it was not provided.
+    if not region:
+        region = country
+
     ingestor.all_wrapper(
         database_url=database_url,
         input_dir=input_dir,

brokenspoke_analyzer/cli/prepare.py

@@ -124,8 +124,9 @@ async def prepare_(
     boundary_file = output_dir / f"{slug}.shp"
 
     # Download the OSM region file.
+    osm_region = region if region else country
     console.log(
-        f"[green]Fetching the OSM region file for {region}...",
+        f"[green]Fetching the OSM region file for {osm_region}...",
     )
     with console.status("Downloading..."):
         try:

brokenspoke_analyzer/cli/run_with.py

@@ -253,9 +253,11 @@ def run_(
 
     # Prepare the Rich output.
     console = rich.get_console()
-    console.log(
-        f"[bold bright_blue]Processing {country}, {region}, {city} ({fips_code})"
-    )
+    msg = [f"[bold bright_blue]Processing {country}"]
+    if region:
+        msg.append(region)
+    msg.append(f"{city} ({fips_code})")
+    console.log(", ".join(msg))
 
     # Prepare.
     logger.debug(f"{output_dir=}")

brokenspoke_analyzer/core/analysis.py

@@ -33,6 +33,8 @@ def osmnx_query(country: str, city: str, state: str | None) -> typing.Tuple[str,
 
     Returns: the OSMNX query and its slugified version.
     """
+    if country == state:
+        state = None
     query = ", ".join(filter(None, [city, state, country]))
     slug = slugify(query)
     return (query, slug)
@@ -240,6 +242,11 @@ def simulate_census_blocks(
 
 def retrieve_region_file(region: str, output_dir: pathlib.Path) -> pathlib.Path:
     """Retrieve the region file from Geofabrik or BBike."""
+    # As per https://github.com/PeopleForBikes/brokenspoke-analyzer/issues/863
+    # we must define an exception for the countries of Malaysia, Singapore and
+    # Brunei as they have been grouped together in the Geofabrik dataset.
+    if region in {"malaysia", "singapore", "brunei"}:
+        region = "malaysia_singapore_brunei"
     dataset = utils.normalize_unicode_name(region)
     dataset_file = data.get_data(dataset, directory=output_dir)  # type: ignore
     region_file_path: pathlib.Path = pathlib.Path(dataset_file)