From 6adeb25ed910c5edadd61f7b2a024e33c4c5b0e6 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Tue, 29 Aug 2023 21:39:55 +0100
Subject: [PATCH] Import a few places

---
 convert_osm/src/extract.rs                    |  5 +-
 data/MANIFEST.json                            | 20 ++++++++
 .../config/au/melbourne/maribyrnong.geojson   | 36 ++++++++++++++
 importer/config/gb/bristol/south.geojson      | 48 +++++++++++++++++++
 map_gui/src/tools/mod.rs                      |  2 +
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 importer/config/au/melbourne/maribyrnong.geojson
 create mode 100644 importer/config/gb/bristol/south.geojson

diff --git a/convert_osm/src/extract.rs b/convert_osm/src/extract.rs
index 25f1c50cd7..0b0b61baec 100644
--- a/convert_osm/src/extract.rs
+++ b/convert_osm/src/extract.rs
@@ -312,7 +312,10 @@ pub fn extract_osm(
     });
 
     timer.start("find service roads crossing parking lots");
-    find_parking_aisles(map, &mut out.roads);
+    // TODO Something's crashing in one map, no time to investigate
+    if map.name != abstio::MapName::new("au", "melbourne", "maribyrnong") {
+        find_parking_aisles(map, &mut out.roads);
+    }
     timer.stop("find service roads crossing parking lots");
 
     Extract {
diff --git a/data/MANIFEST.json b/data/MANIFEST.json
index 98b8dd08e9..c46f91957c 100644
--- a/data/MANIFEST.json
+++ b/data/MANIFEST.json
@@ -30,6 +30,11 @@
       "uncompressed_size_bytes": 6607504,
       "compressed_size_bytes": 1855060
     },
+    "data/input/au/melbourne/raw_maps/maribyrnong.bin": {
+      "checksum": "b81ffefcdab40c2a9cf5062412ab73a7",
+      "uncompressed_size_bytes": 20233034,
+      "compressed_size_bytes": 5508165
+    },
     "data/input/br/sao_paulo/gtfs/agency.txt": {
       "checksum": "3dd694b14c7bacfa33d8ad774db99100",
       "uncompressed_size_bytes": 155,
@@ -405,6 +410,11 @@
       "uncompressed_size_bytes": 74318691,
       "compressed_size_bytes": 19050531
     },
+    "data/input/gb/bristol/raw_maps/south.bin": {
+      "checksum": "2ff63d09b50d76a744ad743f896c0f1d",
+      "uncompressed_size_bytes": 12921184,
+      "compressed_size_bytes": 3442421
+    },
     "data/input/gb/burnley/raw_maps/center.bin": {
       "checksum": "4776145cb655fdf66508b90e1f867024",
       "uncompressed_size_bytes": 5944310,
@@ -2065,6 +2075,11 @@
       "uncompressed_size_bytes": 25615734,
       "compressed_size_bytes": 9996160
     },
+    "data/system/au/melbourne/maps/maribyrnong.bin": {
+      "checksum": "1f5cd5b6e7eea0e7d288ad3196182877",
+      "uncompressed_size_bytes": 74409264,
+      "compressed_size_bytes": 28775907
+    },
     "data/system/br/sao_paulo/maps/aricanduva.bin": {
       "checksum": "729f76e7a82b057c2a4257a17fbea421",
       "uncompressed_size_bytes": 49393386,
@@ -2495,6 +2510,11 @@
       "uncompressed_size_bytes": 160848778,
       "compressed_size_bytes": 64278768
     },
+    "data/system/gb/bristol/maps/south.bin": {
+      "checksum": "b5989cedce214867404fc79fab931c0c",
+      "uncompressed_size_bytes": 30541056,
+      "compressed_size_bytes": 11838753
+    },
     "data/system/gb/bristol/scenarios/east/background.bin": {
       "checksum": "0478813351ebf6fec0f004e87fc09b69",
       "uncompressed_size_bytes": 8868841,
diff --git a/importer/config/au/melbourne/maribyrnong.geojson b/importer/config/au/melbourne/maribyrnong.geojson
new file mode 100644
index 0000000000..109f7a1256
--- /dev/null
+++ b/importer/config/au/melbourne/maribyrnong.geojson
@@ -0,0 +1,36 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [
+              144.82131350593255,
+              -37.747288068173866
+            ],
+            [
+              144.82131350593255,
+              -37.83633025453211
+            ],
+            [
+              144.9244578088135,
+              -37.83633025453211
+            ],
+            [
+              144.9244578088135,
+              -37.747288068173866
+            ],
+            [
+              144.82131350593255,
+              -37.747288068173866
+            ]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    }
+  ]
+}
diff --git a/importer/config/gb/bristol/south.geojson b/importer/config/gb/bristol/south.geojson
new file mode 100644
index 0000000000..8b089a8d46
--- /dev/null
+++ b/importer/config/gb/bristol/south.geojson
@@ -0,0 +1,48 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [
+              -2.600577249284896,
+              51.451032518032264
+            ],
+            [
+              -2.633572101957185,
+              51.450082171004766
+            ],
+            [
+              -2.6484059222757708,
+              51.4317625272393
+            ],
+            [
+              -2.633572101957185,
+              51.409025585927225
+            ],
+            [
+              -2.5826934846017195,
+              51.4130032055246
+            ],
+            [
+              -2.539716995826865,
+              51.43426895009773
+            ],
+            [
+              -2.5722959469947284,
+              51.44818141760368
+            ],
+            [
+              -2.600577249284896,
+              51.451032518032264
+            ]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    }
+  ]
+}
diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs
index d41684afd1..6c5065cb3e 100644
--- a/map_gui/src/tools/mod.rs
+++ b/map_gui/src/tools/mod.rs
@@ -95,6 +95,7 @@ pub fn nice_map_name(name: &MapName) -> &str {
         "au" => match (name.city.city.as_ref(), name.map.as_ref()) {
             ("melbourne", "brunswick") => "Melbourne (Brunswick)",
             ("melbourne", "dandenong") => "Melbourne (Dandenong)",
+            ("melbourne", "maribyrnong") => "Melbourne (Maribyrnong)",
             _ => &name.map,
         },
         "at" => match (name.city.city.as_ref(), name.map.as_ref()) {
@@ -171,6 +172,7 @@ pub fn nice_map_name(name: &MapName) -> &str {
             ("brighton", "center") => "Brighton",
             ("brighton", "shoreham_by_sea") => "Shoreham-by-Sea",
             ("bristol", "east") => "East Bristol",
+            ("bristol", "south") => "South Bristol",
             ("burnley", "center") => "Burnley",
             ("cambridge", "north") => "North Cambridge",
             ("castlemead", "center") => "Castlemead",