From e17c875954efc264d5fe30328738f9cd36b6035b Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Sun, 20 Feb 2022 22:04:54 +0000 Subject: [PATCH] Import Derby (and cheat to squeeze it into the 0.3.12 release that just happened) --- .gitignore | 1 + data/MANIFEST.json | 25 +++++++++++++++++++++++++ importer/config/gb/derby/center.poly | 10 ++++++++++ map_gui/src/tools/mod.rs | 1 + 4 files changed, 37 insertions(+) create mode 100644 importer/config/gb/derby/center.poly diff --git a/.gitignore b/.gitignore index 7328cd06ea..408d6fc798 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ data/system/gb/chorlton data/system/gb/clackers_brook data/system/gb/cricklewood data/system/gb/culm +data/system/gb/derby data/system/gb/dickens_heath data/system/gb/didcot data/system/gb/dunton_hills diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 200dd1446f..18236ef6de 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -745,6 +745,21 @@ "uncompressed_size_bytes": 22706561, "compressed_size_bytes": 5133061 }, + "data/input/gb/derby/osm/center.osm": { + "checksum": "23b27036176c8ce84d87a117c34a7926", + "uncompressed_size_bytes": 50877509, + "compressed_size_bytes": 5235593 + }, + "data/input/gb/derby/osm/derbyshire-latest.osm.pbf": { + "checksum": "09b70ef7ab0832172df86cd4eed54053", + "uncompressed_size_bytes": 33351902, + "compressed_size_bytes": 33329235 + }, + "data/input/gb/derby/raw_maps/center.bin": { + "checksum": "4816a9895a5b6b11392ea422794402d3", + "uncompressed_size_bytes": 13487129, + "compressed_size_bytes": 2973962 + }, "data/input/gb/dickens_heath/osm/center.osm": { "checksum": "ee0f02fd05bae34e7fe8c56494cc002e", "uncompressed_size_bytes": 67026672, @@ -3510,6 +3525,16 @@ "uncompressed_size_bytes": 7596973, "compressed_size_bytes": 2036902 }, + "data/system/gb/derby/maps/center.bin": { + "checksum": "3f6cd494f06b2091efe0810857c31b89", + "uncompressed_size_bytes": 33804643, + "compressed_size_bytes": 13232622 + }, + "data/system/gb/derby/scenarios/center/background.bin": { + "checksum": "3bbe867cd1a9bef177f9b6bb6447decb", + "uncompressed_size_bytes": 9040030, + "compressed_size_bytes": 2368126 + }, "data/system/gb/dickens_heath/maps/center.bin": { "checksum": "8931d73b42a42cb6d2e6d4527fb90ded", "uncompressed_size_bytes": 40276878, diff --git a/importer/config/gb/derby/center.poly b/importer/config/gb/derby/center.poly new file mode 100644 index 0000000000..06f18885b4 --- /dev/null +++ b/importer/config/gb/derby/center.poly @@ -0,0 +1,10 @@ +boundary +1 + -1.5579986572265625 52.910558435943194 + -1.4100265502929688 52.90538201259785 + -1.4031600952148435 52.94677608229801 + -1.4532852172851563 52.948637884883205 + -1.5226364135742188 52.94905160790896 + -1.5579986572265625 52.910558435943194 +END +END diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index 6ef62e93d2..33c5901a74 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -166,6 +166,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("clackers_brook", "center") => "Clackers Brook", ("cricklewood", "center") => "Cricklewood", ("culm", "center") => "Culm", + ("derby", "center") => "Derby", ("dickens_heath", "center") => "Dickens Heath", ("didcot", "center") => "Didcot (Harwell)", ("dunton_hills", "center") => "Dunton Hills",