diff --git a/.gitignore b/.gitignore index db9bd9c757..9b48636973 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ data/system/fr/brest data/system/fr/charleville_mezieres data/system/fr/lyon data/system/fr/paris +data/system/fr/strasbourg data/system/gb/allerton_bywater data/system/gb/ashton_park data/system/gb/aylesbury diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 97b3280200..5c4ec93e8c 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -305,6 +305,21 @@ "uncompressed_size_bytes": 22684375, "compressed_size_bytes": 6568887 }, + "data/input/fr/strasbourg/raw_maps/center.bin": { + "checksum": "0d53bdd84b88e588d84c5ce8bd2db8f8", + "uncompressed_size_bytes": 56197234, + "compressed_size_bytes": 14211279 + }, + "data/input/fr/strasbourg/raw_maps/north.bin": { + "checksum": "96a92dd16ac28b9d136c0c919af8915b", + "uncompressed_size_bytes": 17956038, + "compressed_size_bytes": 4394297 + }, + "data/input/fr/strasbourg/raw_maps/south.bin": { + "checksum": "bb2fadfd93a39a2e2d0ead77694f6976", + "uncompressed_size_bytes": 29441864, + "compressed_size_bytes": 7455806 + }, "data/input/gb/allerton_bywater/raw_maps/center.bin": { "checksum": "7816a14514e6369383f4c75371e73256", "uncompressed_size_bytes": 25610589, @@ -1225,6 +1240,11 @@ "uncompressed_size_bytes": 819497925, "compressed_size_bytes": 818472077 }, + "data/input/shared/geofabrik/europe/france/alsace-latest.osm.pbf": { + "checksum": "a0e24d3d6239f4bb451f549ae52ad062", + "uncompressed_size_bytes": 119446116, + "compressed_size_bytes": 119351725 + }, "data/input/shared/geofabrik/europe/france/bretagne-latest.osm.pbf": { "checksum": "d2e2c80143b67c8bd0298fcfdc8ec3c0", "uncompressed_size_bytes": 292941195, @@ -2115,6 +2135,21 @@ "uncompressed_size_bytes": 43508731, "compressed_size_bytes": 17033282 }, + "data/system/fr/strasbourg/maps/center.bin": { + "checksum": "e21a34b259118fe160f5699ab22d86e4", + "uncompressed_size_bytes": 119521441, + "compressed_size_bytes": 45958947 + }, + "data/system/fr/strasbourg/maps/north.bin": { + "checksum": "52bb8ccb84685c075f2a5b1477fafb6e", + "uncompressed_size_bytes": 34747151, + "compressed_size_bytes": 13831540 + }, + "data/system/fr/strasbourg/maps/south.bin": { + "checksum": "f1df06275e9a35d288802c039bb966ce", + "uncompressed_size_bytes": 64469025, + "compressed_size_bytes": 25381835 + }, "data/system/gb/allerton_bywater/maps/center.bin": { "checksum": "12139d2a5f131670311e176a151b44c3", "uncompressed_size_bytes": 79895097, diff --git a/importer/config/fr/strasbourg/center.geojson b/importer/config/fr/strasbourg/center.geojson new file mode 100644 index 0000000000..e7b8e9afac --- /dev/null +++ b/importer/config/fr/strasbourg/center.geojson @@ -0,0 +1,56 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 7.5507178315902195, + 48.597023710514634 + ], + [ + 7.593719546957033, + 48.579519620444614 + ], + [ + 7.730167297642055, + 48.557083643830964 + ], + [ + 7.804795965864827, + 48.553507728021714 + ], + [ + 7.8001728155661, + 48.57688493664125 + ], + [ + 7.798215117565206, + 48.593350712557196 + ], + [ + 7.8332396602529855, + 48.63294562188304 + ], + [ + 7.616047360705778, + 48.67517103574204 + ], + [ + 7.54575609520117, + 48.652231230009875 + ], + [ + 7.5507178315902195, + 48.597023710514634 + ] + ] + ], + "type": "Polygon" + } + } + ] +} diff --git a/importer/config/fr/strasbourg/north.geojson b/importer/config/fr/strasbourg/north.geojson new file mode 100644 index 0000000000..495f5b1a76 --- /dev/null +++ b/importer/config/fr/strasbourg/north.geojson @@ -0,0 +1,52 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 7.605642753550313, + 48.66769928634784 + ], + [ + 7.766072230112769, + 48.64038476066338 + ], + [ + 7.828189167518673, + 48.63709174025186 + ], + [ + 7.9197166888758375, + 48.69249135037748 + ], + [ + 7.842152188070372, + 48.711371749763174 + ], + [ + 7.7553218012708385, + 48.72719366433461 + ], + [ + 7.676760975119805, + 48.74464655338463 + ], + [ + 7.625489699104548, + 48.70918902615435 + ], + [ + 7.605642753550313, + 48.66769928634784 + ] + ] + ], + "type": "Polygon" + } + } + ] +} diff --git a/importer/config/fr/strasbourg/south.geojson b/importer/config/fr/strasbourg/south.geojson new file mode 100644 index 0000000000..91997c82e2 --- /dev/null +++ b/importer/config/fr/strasbourg/south.geojson @@ -0,0 +1,64 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": {}, + "geometry": { + "coordinates": [ + [ + [ + 7.6672356373696005, + 48.47603352227091 + ], + [ + 7.74332368438408, + 48.4283755643913 + ], + [ + 7.763953564931683, + 48.489171714886226 + ], + [ + 7.783800174718493, + 48.49961432723808 + ], + [ + 7.802859186279079, + 48.55959695971441 + ], + [ + 7.728247669563473, + 48.560770676301786 + ], + [ + 7.6003192149635765, + 48.582475322286086 + ], + [ + 7.562268700262024, + 48.60286919480771 + ], + [ + 7.52487422891744, + 48.6007000251673 + ], + [ + 7.525530272273585, + 48.56294156016335 + ], + [ + 7.602287345033773, + 48.503425640938445 + ], + [ + 7.6672356373696005, + 48.47603352227091 + ] + ] + ], + "type": "Polygon" + } + } + ] +} diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index 3d46570a69..ee41c99d0c 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -156,6 +156,9 @@ pub fn nice_map_name(name: &MapName) -> &str { ("paris", "south") => "Paris (south)", ("paris", "east") => "Paris (east)", ("paris", "west") => "Paris (west)", + ("strasbourg", "center") => "Strasbourg (center)", + ("strasbourg", "north") => "Strasbourg (north)", + ("strasbourg", "south") => "Strasbourg (south)", _ => &name.map, }, "gb" => match (name.city.city.as_ref(), name.map.as_ref()) {