diff --git a/.gitignore b/.gitignore index e1956e3434..099541d5ca 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ data/system/gb/brighton data/system/gb/bristol data/system/gb/burnley data/system/gb/cambridge +data/system/gb/cardiff data/system/gb/castlemead data/system/gb/chapelford data/system/gb/chapeltown_cohousing @@ -123,4 +124,4 @@ data/system/us/providence data/system/us/san_francisco data/system/us/seattle data/system/us/tucson -data/system/zz/oneshot \ No newline at end of file +data/system/zz/oneshot diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 22e3480e00..e53f8c3321 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -390,6 +390,11 @@ "uncompressed_size_bytes": 10235498, "compressed_size_bytes": 2444290 }, + "data/input/gb/cardiff/raw_maps/center.bin": { + "checksum": "ac7294cbbf603b989668d41204eb98fc", + "uncompressed_size_bytes": 29055486, + "compressed_size_bytes": 9095700 + }, "data/input/gb/castlemead/raw_maps/center.bin": { "checksum": "c709f9f08ac1a518fdee2a173ea36d41", "uncompressed_size_bytes": 3144552, @@ -645,6 +650,11 @@ "uncompressed_size_bytes": 15585569, "compressed_size_bytes": 4582465 }, + "data/input/gb/london/raw_maps/highgate.bin": { + "checksum": "5a78215f2e3b5aa78f46ac0b505e41b2", + "uncompressed_size_bytes": 5756013, + "compressed_size_bytes": 1594632 + }, "data/input/gb/london/raw_maps/hillingdon.bin": { "checksum": "753015655a3138fc95ef43fb41b0b7c7", "uncompressed_size_bytes": 17842369, @@ -710,6 +720,11 @@ "uncompressed_size_bytes": 9714486, "compressed_size_bytes": 2911744 }, + "data/input/gb/london/raw_maps/regents_park.bin": { + "checksum": "2351bc5386fa28750f5aa147ecd3ac4c", + "uncompressed_size_bytes": 17925251, + "compressed_size_bytes": 4454515 + }, "data/input/gb/london/raw_maps/richmond_upon_thames.bin": { "checksum": "2e8db377a421b4bca7549d3b47d57e7c", "uncompressed_size_bytes": 23258282, @@ -1360,6 +1375,11 @@ "uncompressed_size_bytes": 238095072, "compressed_size_bytes": 237887274 }, + "data/input/shared/geofabrik/europe/great-britain/wales-latest.osm.pbf": { + "checksum": "1da41a826e5551539d9ed0f85c6bff47", + "uncompressed_size_bytes": 109189752, + "compressed_size_bytes": 109081588 + }, "data/input/shared/geofabrik/europe/netherlands-latest.osm.pbf": { "checksum": "529b1e1757b5dae777948e674052bdf8", "uncompressed_size_bytes": 1215229642, @@ -2360,6 +2380,16 @@ "uncompressed_size_bytes": 6057508, "compressed_size_bytes": 1469381 }, + "data/system/gb/cardiff/maps/center.bin": { + "checksum": "b5ffd9a847ad5e95f2a6ac7976e4f3ef", + "uncompressed_size_bytes": 88451386, + "compressed_size_bytes": 35586511 + }, + "data/system/gb/cardiff/scenarios/center/background.bin": { + "checksum": "34d8723142d4451901debce46a6cb52b", + "uncompressed_size_bytes": 15262590, + "compressed_size_bytes": 3956216 + }, "data/system/gb/castlemead/maps/center.bin": { "checksum": "35ca65f47811b3956b42caa5435f0d39", "uncompressed_size_bytes": 13446085, @@ -3040,6 +3070,11 @@ "uncompressed_size_bytes": 47954188, "compressed_size_bytes": 18949109 }, + "data/system/gb/london/maps/highgate.bin": { + "checksum": "aff1e4dd26e51cb1a5326618e678bdb2", + "uncompressed_size_bytes": 13588118, + "compressed_size_bytes": 5150304 + }, "data/system/gb/london/maps/hillingdon.bin": { "checksum": "c982032813b5f39f7c61646cb7f4a505", "uncompressed_size_bytes": 60061881, @@ -3105,6 +3140,11 @@ "uncompressed_size_bytes": 34161572, "compressed_size_bytes": 13463196 }, + "data/system/gb/london/maps/regents_park.bin": { + "checksum": "78012a51c27ec1f8be84e793c59359a6", + "uncompressed_size_bytes": 34764594, + "compressed_size_bytes": 13071873 + }, "data/system/gb/london/maps/richmond_upon_thames.bin": { "checksum": "fe8fa14c175fc15e97ee51f4be4b7237", "uncompressed_size_bytes": 52014679, @@ -3220,6 +3260,11 @@ "uncompressed_size_bytes": 18094627, "compressed_size_bytes": 4543954 }, + "data/system/gb/london/scenarios/highgate/background.bin": { + "checksum": "2a302450c8a1ba493108fa636f158762", + "uncompressed_size_bytes": 18414235, + "compressed_size_bytes": 4705163 + }, "data/system/gb/london/scenarios/hillingdon/background.bin": { "checksum": "11925e95b8f116942eb5a2c4a47f0f81", "uncompressed_size_bytes": 26176047, @@ -3285,6 +3330,11 @@ "uncompressed_size_bytes": 19405421, "compressed_size_bytes": 5055218 }, + "data/system/gb/london/scenarios/regents_park/background.bin": { + "checksum": "e01e965cd4557f020aa77fd1f6ebf0c1", + "uncompressed_size_bytes": 51602480, + "compressed_size_bytes": 14037197 + }, "data/system/gb/london/scenarios/richmond_upon_thames/background.bin": { "checksum": "8cb9c5c6dc0b5e7fd424085567529c14", "uncompressed_size_bytes": 20557111, diff --git a/importer/config/gb/cardiff/center.geojson b/importer/config/gb/cardiff/center.geojson new file mode 100644 index 0000000000..07290a4a99 --- /dev/null +++ b/importer/config/gb/cardiff/center.geojson @@ -0,0 +1,134 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [[ + [ + -3.1112709974766233, + 51.542984807123446 + ], + [ + -3.125500662458194, + 51.540848594133536 + ], + [ + -3.155432026727425, + 51.54634151064684 + ], + [ + -3.1841366957391415, + 51.54679922375996 + ], + [ + -3.20302780269634, + 51.54466318983836 + ], + [ + -3.2133320428540912, + 51.53901747461268 + ], + [ + -3.2192201800873192, + 51.53428674150388 + ], + [ + -3.233449845067696, + 51.53092914874088 + ], + [ + -3.2714773980330847, + 51.522534083341725 + ], + [ + -3.312449019615684, + 51.50619743009864 + ], + [ + -3.2965019812745027, + 51.4984087390703 + ], + [ + -3.2942939298127953, + 51.494437521521576 + ], + [ + -3.282026977243106, + 51.4817578578853 + ], + [ + -3.2790829086258952, + 51.473048094694434 + ], + [ + -3.270741380878775, + 51.4660179502726 + ], + [ + -3.252095612973818, + 51.46448951466439 + ], + [ + -3.245716797637357, + 51.4658651090154 + ], + [ + -3.242772729021368, + 51.469991643264876 + ], + [ + -3.2216735706012685, + 51.47534029888831 + ], + [ + -3.215049416213759, + 51.47427061793107 + ], + [ + -3.20253712459305, + 51.46296102786113 + ], + [ + -3.200329073131371, + 51.45638795122355 + ], + [ + -3.1868354253041105, + 51.44736753805714 + ], + [ + -3.1642642325766417, + 51.44492101710935 + ], + [ + -3.131388799691365, + 51.46724066189873 + ], + [ + -3.104401504038094, + 51.49229903029982 + ], + [ + -3.061221830993759, + 51.50711365917411 + ], + [ + -3.0823209894138586, + 51.53169225975128 + ], + [ + -3.111213512129666, + 51.54298643647206 + ], + [ + -3.1112709974766233, + 51.542984807123446 + ] + ]], + "type": "Polygon" + } + } + ] +} diff --git a/importer/config/gb/london/highgate.geojson b/importer/config/gb/london/highgate.geojson new file mode 100644 index 0000000000..c2b5500b15 --- /dev/null +++ b/importer/config/gb/london/highgate.geojson @@ -0,0 +1 @@ +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"coordinates":[[[-0.16497358838319087,51.577700615376784],[-0.16497358838319087,51.548034858372404],[-0.12366324227289738,51.548034858372404],[-0.12366324227289738,51.577700615376784],[-0.16497358838319087,51.577700615376784]]],"type":"Polygon"}}]} diff --git a/importer/config/gb/london/regents_park.geojson b/importer/config/gb/london/regents_park.geojson new file mode 100644 index 0000000000..6db756d910 --- /dev/null +++ b/importer/config/gb/london/regents_park.geojson @@ -0,0 +1,36 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + -0.19718718999854445, + 51.54970425003464 + ], + [ + -0.19718718999854445, + 51.516185213662 + ], + [ + -0.12965421349036887, + 51.516185213662 + ], + [ + -0.12965421349036887, + 51.54970425003464 + ], + [ + -0.19718718999854445, + 51.54970425003464 + ] + ] + ], + "type": "Polygon" + } + } + ] +} diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index 2e0a7adb24..ff64c994e0 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -175,6 +175,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("bristol", "south") => "South Bristol", ("burnley", "center") => "Burnley", ("cambridge", "north") => "North Cambridge", + ("cardiff", "north") => "Cardiff", ("castlemead", "center") => "Castlemead", ("chapelford", "center") => "Chapelford (Cheshire)", ("chapeltown_cohousing", "center") => "Chapeltown Cohousing",