Import the missing London boroughs. Closes a-b-street#794

chnfanyu · Aug 21, 2022 · 8684e39 · 8684e39
1 parent c1772c0
commit 8684e39
Show file tree

Hide file tree

Showing 7 changed files with 269 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/data/MANIFEST.json b/data/MANIFEST.json
@@ -1215,6 +1215,16 @@
       "uncompressed_size_bytes": 47889389,
       "compressed_size_bytes": 4809086
     },
+    "data/input/gb/london/osm/enfield-latest.osm.pbf": {
+      "checksum": "82e6f94382f0a219e0510a0057760cd3",
+      "uncompressed_size_bytes": 3368410,
+      "compressed_size_bytes": 3365589
+    },
+    "data/input/gb/london/osm/enfield.osm": {
+      "checksum": "1c8bf476b233a7087a7efb9010d3b405",
+      "uncompressed_size_bytes": 61156037,
+      "compressed_size_bytes": 6137221
+    },
     "data/input/gb/london/osm/greater-london-latest.osm.pbf": {
       "checksum": "97d9d04491ec22e754d6189ae944964b",
       "uncompressed_size_bytes": 81639486,
@@ -1280,11 +1290,21 @@
       "uncompressed_size_bytes": 35512778,
       "compressed_size_bytes": 3541002
     },
+    "data/input/gb/london/osm/lambeth.osm": {
+      "checksum": "3b6b899b548f1b7df5cbfb5447d8738e",
+      "uncompressed_size_bytes": 53188642,
+      "compressed_size_bytes": 5440929
+    },
     "data/input/gb/london/osm/lewisham.osm": {
       "checksum": "3b9f00f6480d783a7796db65372a708c",
       "uncompressed_size_bytes": 43953391,
       "compressed_size_bytes": 4401808
     },
+    "data/input/gb/london/osm/merton.osm": {
+      "checksum": "881428c760bc32ad908885d4db916478",
+      "uncompressed_size_bytes": 42843176,
+      "compressed_size_bytes": 4096999
+    },
     "data/input/gb/london/osm/newham.osm": {
       "checksum": "489bbfe8dee0fa44f7c9316f7ef90953",
       "uncompressed_size_bytes": 75183633,
@@ -1320,6 +1340,16 @@
       "uncompressed_size_bytes": 46147867,
       "compressed_size_bytes": 5233948
     },
+    "data/input/gb/london/osm/waltham_forest.osm": {
+      "checksum": "447ee5d8e803cf21f4330ea5db131ec2",
+      "uncompressed_size_bytes": 84706433,
+      "compressed_size_bytes": 7783852
+    },
+    "data/input/gb/london/osm/wandsworth.osm": {
+      "checksum": "190821053936e62195ad88f6cd3b8d47",
+      "uncompressed_size_bytes": 63244800,
+      "compressed_size_bytes": 6282412
+    },
     "data/input/gb/london/osm/westminster.osm": {
       "checksum": "29844268c1cab43bc0ad66dee6549602",
       "uncompressed_size_bytes": 70473993,
@@ -1375,6 +1405,11 @@
       "uncompressed_size_bytes": 14537606,
       "compressed_size_bytes": 2355233
     },
+    "data/input/gb/london/raw_maps/enfield.bin": {
+      "checksum": "bad6ac42de953fbafdc1e4facb5a1319",
+      "uncompressed_size_bytes": 17299435,
+      "compressed_size_bytes": 3173798
+    },
     "data/input/gb/london/raw_maps/greenwich.bin": {
       "checksum": "0c85b4eea36c980dbd8cc394f8a1b1df",
       "uncompressed_size_bytes": 14086757,
@@ -1435,11 +1470,21 @@
       "uncompressed_size_bytes": 10335142,
       "compressed_size_bytes": 1875110
     },
+    "data/input/gb/london/raw_maps/lambeth.bin": {
+      "checksum": "4a551a7915cfee72f37726b5987bdf02",
+      "uncompressed_size_bytes": 13421896,
+      "compressed_size_bytes": 2504876
+    },
     "data/input/gb/london/raw_maps/lewisham.bin": {
       "checksum": "022e47500e6bec5f53be2b33352eb70d",
       "uncompressed_size_bytes": 13286390,
       "compressed_size_bytes": 2332368
     },
+    "data/input/gb/london/raw_maps/merton.bin": {
+      "checksum": "42ccb924a27565822210565a521760f0",
+      "uncompressed_size_bytes": 13560176,
+      "compressed_size_bytes": 2117782
+    },
     "data/input/gb/london/raw_maps/newham.bin": {
       "checksum": "92deb3679485962312d48263bd2b6f35",
       "uncompressed_size_bytes": 22061433,
@@ -1475,6 +1520,16 @@
       "uncompressed_size_bytes": 13950662,
       "compressed_size_bytes": 2492410
     },
+    "data/input/gb/london/raw_maps/waltham_forest.bin": {
+      "checksum": "9feea2c8da64f51c70c3842a4a03ff50",
+      "uncompressed_size_bytes": 27077090,
+      "compressed_size_bytes": 4924537
+    },
+    "data/input/gb/london/raw_maps/wandsworth.bin": {
+      "checksum": "5aadc52a8c8243183e8ecba18dcbed76",
+      "uncompressed_size_bytes": 18706442,
+      "compressed_size_bytes": 3220028
+    },
     "data/input/gb/london/raw_maps/westminster.bin": {
       "checksum": "a8cb6dceb3e653fe7aff9d47c6438fd8",
       "uncompressed_size_bytes": 20700080,
@@ -4126,9 +4181,9 @@
       "compressed_size_bytes": 4458616
     },
     "data/system/gb/london/city.bin": {
-      "checksum": "3c8fb3e58e96128838b748a0cff4793d",
-      "uncompressed_size_bytes": 3571562,
-      "compressed_size_bytes": 1716989
+      "checksum": "cafd9e13860e5a31755faca53c1214c4",
+      "uncompressed_size_bytes": 3953000,
+      "compressed_size_bytes": 1896557
     },
     "data/system/gb/london/maps/barking_and_dagenham.bin": {
       "checksum": "80f71f80d36aa858b0990e9e924e7ffd",
@@ -4240,11 +4295,21 @@
       "uncompressed_size_bytes": 26657513,
       "compressed_size_bytes": 10021082
     },
+    "data/system/gb/london/maps/lambeth.bin": {
+      "checksum": "71a74d9a59957b81dc666f8a38968299",
+      "uncompressed_size_bytes": 35261851,
+      "compressed_size_bytes": 13027239
+    },
     "data/system/gb/london/maps/lewisham.bin": {
       "checksum": "34d18856d91c0cb99eda79466de1702a",
       "uncompressed_size_bytes": 33930141,
       "compressed_size_bytes": 12534410
     },
+    "data/system/gb/london/maps/merton.bin": {
+      "checksum": "bae446d7c20d5c8ef6122ac747a7be12",
+      "uncompressed_size_bytes": 29698728,
+      "compressed_size_bytes": 11027471
+    },
     "data/system/gb/london/maps/newham.bin": {
       "checksum": "aa06a6389cceca17f76c5f99f0ac58bd",
       "uncompressed_size_bytes": 43345887,
@@ -4280,6 +4345,16 @@
       "uncompressed_size_bytes": 31019633,
       "compressed_size_bytes": 11642201
     },
+    "data/system/gb/london/maps/waltham_forest.bin": {
+      "checksum": "a65460f46bbc9102f38d7bce1864fa9b",
+      "uncompressed_size_bytes": 47955183,
+      "compressed_size_bytes": 17402273
+    },
+    "data/system/gb/london/maps/wandsworth.bin": {
+      "checksum": "a1db680dd2cef6eed4728c7ddf0096da",
+      "uncompressed_size_bytes": 42573092,
+      "compressed_size_bytes": 15626287
+    },
     "data/system/gb/london/maps/westminster.bin": {
       "checksum": "593070589eb3e18009b4c50f50001880",
       "uncompressed_size_bytes": 34844575,
@@ -4390,11 +4465,21 @@
       "uncompressed_size_bytes": 15259705,
       "compressed_size_bytes": 3926012
     },
+    "data/system/gb/london/scenarios/lambeth/background.bin": {
+      "checksum": "e88400a6ca960f539836095858729332",
+      "uncompressed_size_bytes": 45398685,
+      "compressed_size_bytes": 12100138
+    },
     "data/system/gb/london/scenarios/lewisham/background.bin": {
       "checksum": "4e50eb51b4174f6c9b13046a0f6b1eb8",
       "uncompressed_size_bytes": 23895526,
       "compressed_size_bytes": 6335560
     },
+    "data/system/gb/london/scenarios/merton/background.bin": {
+      "checksum": "361eb223433f42e2349e35c2dcb95de1",
+      "uncompressed_size_bytes": 20051603,
+      "compressed_size_bytes": 5161556
+    },
     "data/system/gb/london/scenarios/newham/background.bin": {
       "checksum": "33026d5fd9c6f6c318d21ec8e33b7c50",
       "uncompressed_size_bytes": 23230571,
@@ -4430,6 +4515,16 @@
       "uncompressed_size_bytes": 40237905,
       "compressed_size_bytes": 10294635
     },
+    "data/system/gb/london/scenarios/waltham_forest/background.bin": {
+      "checksum": "944817da8061f9d1dc37b2ec0c414db4",
+      "uncompressed_size_bytes": 18684514,
+      "compressed_size_bytes": 4922724
+    },
+    "data/system/gb/london/scenarios/wandsworth/background.bin": {
+      "checksum": "93bd78694a06f2ae784fc97e55270519",
+      "uncompressed_size_bytes": 35251686,
+      "compressed_size_bytes": 9280650
+    },
     "data/system/gb/london/scenarios/westminster/background.bin": {
       "checksum": "31376e0e31f1434f77e9e699e1521494",
       "uncompressed_size_bytes": 91582390,

diff --git a/importer/config/gb/london/enfield.poly b/importer/config/gb/london/enfield.poly
@@ -0,0 +1,27 @@
+boundary
+1
+     -0.024267806392164    51.6213668673294
+     -0.03355295737364    51.6129349952325
+     -0.032673918293774    51.6085010635035
+     -0.039830896336334    51.6051303419881
+     -0.052761776384888    51.6083630786885
+     -0.137177939873971    51.6096939710332
+     -0.142929263859401    51.6149859858669
+     -0.13378989822444    51.621289999355
+     -0.127551073274027    51.631771951081
+     -0.150142248143029    51.6448669908907
+     -0.153178293018728    51.6550380643193
+     -0.184285376534396    51.6623410082481
+     -0.180503134962609    51.668109973155
+     -0.169991719317104    51.6735269696889
+     -0.16202306549643    51.6819100384849
+     -0.161908306346174    51.6876226359207
+     -0.147783912707317    51.6850252268086
+     -0.103257612550822    51.6913582883161
+     -0.08231806117569    51.6894722256934
+     -0.060423199761917    51.6825141703708
+     -0.009464776534222    51.6803749635184
+     -0.010659951924286    51.6457336860139
+     -0.024267806392164    51.6213668673294
+END
+END
diff --git a/importer/config/gb/london/lambeth.poly b/importer/config/gb/london/lambeth.poly
@@ -0,0 +1,40 @@
+boundary
+1
+     -0.134964353796009    51.4723944592617
+     -0.133223106114822    51.4736513728171
+     -0.124683823750032    51.4839649532113
+     -0.127959243955144    51.4853898101964
+     -0.122334887175764    51.4907820283815
+     -0.118942098917407    51.5055000529483
+     -0.109851618249191    51.5092323687263
+     -0.107548458429662    51.5093150874526
+     -0.104377907283287    51.5014980426567
+     -0.109835410449561    51.4959350653815
+     -0.101465292011957    51.4910090438095
+     -0.106844543118576    51.4853349094781
+     -0.102432191414438    51.4803450426202
+     -0.106747008719723    51.4798000032205
+     -0.098391317222942    51.4763579176973
+     -0.094389123911729    51.4693650059786
+     -0.091472913177961    51.4716119311586
+     -0.088470605374181    51.4656419466936
+     -0.099820306923765    51.4514379956225
+     -0.086711695188255    51.4289239972605
+     -0.076684024217856    51.4200516526493
+     -0.077066883273802    51.4193052720345
+     -0.104448726587371    51.4220560580581
+     -0.111107362461137    51.4227079737892
+     -0.126206180867387    51.4117939777848
+     -0.146455998370407    51.4123470715867
+     -0.13880528035001    51.4187290851318
+     -0.136829155802798    51.4299380918971
+     -0.133732687161512    51.4297720360919
+     -0.138462632844092    51.4363628922664
+     -0.134401316025534    51.4414790851923
+     -0.142045906525656    51.4412539846816
+     -0.140725237963582    51.4504499826821
+     -0.146145023191459    51.4517939536896
+     -0.149629108122898    51.4653699246633
+     -0.134964353796009    51.4723944592617
+END
+END
diff --git a/importer/config/gb/london/merton.poly b/importer/config/gb/london/merton.poly
@@ -0,0 +1,34 @@
+boundary
+1
+     -0.201924948635571    51.386703036857
+     -0.208202169711657    51.3877300515116
+     -0.216547081910742    51.3796259471327
+     -0.233068124108979    51.3900170305545
+     -0.238102168241044    51.388774020871
+     -0.245902873102173    51.3971279477352
+     -0.243064937591181    51.40382907571
+     -0.251390100360078    51.4228720004076
+     -0.24949614856393    51.4320480545021
+     -0.229481859744498    51.4376648931712
+     -0.210649675373067    51.4373509244906
+     -0.188487207022488    51.4409280292922
+     -0.189517745574367    51.4325190578113
+     -0.184204633016965    51.4325699359964
+     -0.18044803988147    51.4241820296092
+     -0.163494982866927    51.4195719560307
+     -0.158435986626118    51.4221490715478
+     -0.142965801065898    51.4172230170974
+     -0.13880528035001    51.4187290851318
+     -0.146455998370407    51.4123470715867
+     -0.126206180867387    51.4117939777848
+     -0.130718073896632    51.4064060203218
+     -0.122619421397    51.3970780609309
+     -0.132778215528678    51.3903620320991
+     -0.163693400189046    51.3874549992349
+     -0.173270938743459    51.3928949792026
+     -0.186861213609187    51.3849270506128
+     -0.195452332272869    51.3859839743868
+     -0.19891215991079    51.3843609838067
+     -0.201924948635571    51.386703036857
+END
+END
diff --git a/importer/config/gb/london/waltham_forest.poly b/importer/config/gb/london/waltham_forest.poly
@@ -0,0 +1,26 @@
+boundary
+1
+     0.014059534796527    51.5949307087244
+     0.020714627515213    51.5694190195145
+     0.015814149026174    51.5608169821066
+     0.021964762854572    51.5557589902218
+     0.007401553382455    51.5501400270341
+     -0.015570398419721    51.5512009288539
+     -0.026161776255566    51.5602609772178
+     -0.045485886629674    51.5620649498554
+     -0.05956863662496    51.5772810366937
+     -0.039830896336334    51.6051303419881
+     -0.032673918293774    51.6085010635035
+     -0.03355295737364    51.6129349952325
+     -0.024267806392164    51.6213668673294
+     -0.010659951924286    51.6457336860139
+     0.003025993466692    51.6411804195279
+     0.024322477447847    51.6406166849488
+     0.027341246215783    51.6340658793786
+     0.02342143421908    51.6283326482907
+     0.016126969530877    51.6184019350709
+     0.01040466456673    51.618581035121
+     0.022991996568569    51.6115349417026
+     0.014059534796527    51.5949307087244
+END
+END
diff --git a/importer/config/gb/london/wandsworth.poly b/importer/config/gb/london/wandsworth.poly
@@ -0,0 +1,42 @@
+boundary
+1
+     -0.133223106114822    51.4736513728171
+     -0.134964353796009    51.4723944592617
+     -0.149629108122898    51.4653699246633
+     -0.146145023191459    51.4517939536896
+     -0.140725237963582    51.4504499826821
+     -0.142045906525656    51.4412539846816
+     -0.134401316025534    51.4414790851923
+     -0.138462632844092    51.4363628922664
+     -0.133732687161512    51.4297720360919
+     -0.136829155802798    51.4299380918971
+     -0.13880528035001    51.4187290851318
+     -0.142965801065898    51.4172230170974
+     -0.158435986626118    51.4221490715478
+     -0.163494982866927    51.4195719560307
+     -0.18044803988147    51.4241820296092
+     -0.184204633016965    51.4325699359964
+     -0.189517745574367    51.4325190578113
+     -0.188487207022488    51.4409280292922
+     -0.210649675373067    51.4373509244906
+     -0.229481859744498    51.4376648931712
+     -0.24949614856393    51.4320480545021
+     -0.252447088742214    51.4367240525895
+     -0.240057921513351    51.4425670060299
+     -0.257524011343378    51.4544179293361
+     -0.254431906337001    51.4625260810806
+     -0.251325162648024    51.4647029971993
+     -0.231614021339917    51.4634530233233
+     -0.231022172549258    51.4721010553311
+     -0.220141148668726    51.4718450280119
+     -0.204557720654756    51.4644669540446
+     -0.188811325649901    51.4637619816027
+     -0.181296702914703    51.4670130236276
+     -0.176217921855791    51.4770410649765
+     -0.169329259824246    51.4811730419737
+     -0.148241091014931    51.4840461109385
+     -0.127959243955144    51.4853898101964
+     -0.124683823750032    51.4839649532113
+     -0.133223106114822    51.4736513728171
+END
+END