Import Camden. #794

a-b-street · Oct 31, 2021 · 04b54b0 · 04b54b0
1 parent a476328
commit 04b54b0
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/data/MANIFEST.json b/data/MANIFEST.json
@@ -996,15 +996,20 @@
       "compressed_size_bytes": 6769846
     },
     "data/input/gb/london/collisions.bin": {
-      "checksum": "4b7a3f48d99c9ed7d49b2e69d6da163b",
-      "uncompressed_size_bytes": 11611,
-      "compressed_size_bytes": 8457
+      "checksum": "b32fb1d59053325b686db7333971cedf",
+      "uncompressed_size_bytes": 87547,
+      "compressed_size_bytes": 57248
     },
     "data/input/gb/london/osm/a5.osm": {
       "checksum": "438ba14566a773a818b8dcdeb8300048",
       "uncompressed_size_bytes": 64552068,
       "compressed_size_bytes": 6487668
     },
+    "data/input/gb/london/osm/camden.osm": {
+      "checksum": "21fba899deaaa645d2a061bd661d4ab1",
+      "uncompressed_size_bytes": 98442567,
+      "compressed_size_bytes": 10895771
+    },
     "data/input/gb/london/osm/greater-london-latest.osm.pbf": {
       "checksum": "ef110d0831b482bb7336c82e36b115ed",
       "uncompressed_size_bytes": 62100025,
@@ -1020,6 +1025,11 @@
       "uncompressed_size_bytes": 18572486,
       "compressed_size_bytes": 3775010
     },
+    "data/input/gb/london/raw_maps/camden.bin": {
+      "checksum": "e51e5eca74bd7c289a1efca25862f95a",
+      "uncompressed_size_bytes": 28873561,
+      "compressed_size_bytes": 5921529
+    },
     "data/input/gb/london/raw_maps/southbank.bin": {
       "checksum": "140bea3f8ad3b9ee53f60cc5601eb801",
       "uncompressed_size_bytes": 3737576,
@@ -3335,11 +3345,21 @@
       "uncompressed_size_bytes": 44937098,
       "compressed_size_bytes": 15919698
     },
+    "data/system/gb/london/maps/camden.bin": {
+      "checksum": "556ddbe696fd18089e4fc1478adf517b",
+      "uncompressed_size_bytes": 63885296,
+      "compressed_size_bytes": 22601809
+    },
     "data/system/gb/london/maps/southbank.bin": {
       "checksum": "eb5d2bc09e27b32f127f42ccef62567d",
       "uncompressed_size_bytes": 8131653,
       "compressed_size_bytes": 2698946
     },
+    "data/system/gb/london/scenarios/camden/background.bin": {
+      "checksum": "61325202fb437ef5bf4dfb9a57ea1ac3",
+      "uncompressed_size_bytes": 10209374,
+      "compressed_size_bytes": 2688854
+    },
     "data/system/gb/long_marston/maps/center.bin": {
       "checksum": "791fd1af932799555e34c16e36193e4d",
       "uncompressed_size_bytes": 17828238,

diff --git a/importer/config/gb/london/camden.poly b/importer/config/gb/london/camden.poly
@@ -0,0 +1,16 @@
+boundary
+1
+     -0.22710800170898435    51.55572834577052
+     -0.207366943359375    51.53512459785485
+     -0.14265060424804688    51.50361379162682
+     -0.12256622314453124    51.50927666176991
+     -0.10419845581054688    51.51184074882069
+     -0.09372711181640624    51.51696848999419
+     -0.108489990234375    51.53864817973767
+     -0.1242828369140625    51.56800075481869
+     -0.14934539794921875    51.57952313204332
+     -0.17972946166992188    51.579096429416445
+     -0.20359039306640625    51.5717351784532
+     -0.22710800170898435    51.55572834577052
+END
+END
diff --git a/importer/src/lib.rs b/importer/src/lib.rs
@@ -223,11 +223,13 @@ impl Job {
                         }
                     };
 
+                    // The collision data will only cover one part of London, since we don't have a
+                    // region-wide map there yet
                     if name.city == CityName::new("de", "berlin") {
                         berlin::import_extra_data(&raw, &config, timer).await;
                     } else if name == MapName::new("gb", "leeds", "huge") {
                         uk::import_collision_data(&raw, &config, timer).await;
-                    } else if name.city == CityName::new("gb", "london") {
+                    } else if name == MapName::new("gb", "london", "camden") {
                         uk::import_collision_data(&raw, &config, timer).await;
                     }
                 }

diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs
@@ -164,6 +164,7 @@ pub fn nice_map_name(name: &MapName) -> &str {
             ("leeds", "west") => "West Leeds",
             ("lockleaze", "center") => "Lockleaze",
             ("london", "a5") => "London A5 (Hyde Park to Edgware)",
+            ("london", "Camden") => "Camden",
             ("london", "southbank") => "London (Southbank)",
             ("long_marston", "center") => "Long Marston (Stratford)",
             ("marsh_barton", "center") => "Marsh Barton",