diff --git a/.gitignore b/.gitignore index 7acebbf56f..5ee3e120ef 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ data/system/gb/didcot data/system/gb/dunton_hills data/system/gb/ebbsfleet data/system/gb/exeter_red_cow_village +data/system/gb/glenrothes data/system/gb/great_kneighton data/system/gb/halsnead data/system/gb/hampton diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 330af7020f..4d3cdf57b4 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -855,6 +855,21 @@ "uncompressed_size_bytes": 14563729, "compressed_size_bytes": 3062265 }, + "data/input/gb/glenrothes/osm/center.osm": { + "checksum": "60893b0f5a0dd7cafa9910b8ec1c4290", + "uncompressed_size_bytes": 81347229, + "compressed_size_bytes": 8171788 + }, + "data/input/gb/glenrothes/osm/scotland-latest.osm.pbf": { + "checksum": "0793202a2a7d6c5535da6104bac5ed12", + "uncompressed_size_bytes": 219183427, + "compressed_size_bytes": 218991119 + }, + "data/input/gb/glenrothes/raw_maps/center.bin": { + "checksum": "e35d2e2d94be465be2f32841af6ca22d", + "uncompressed_size_bytes": 20924174, + "compressed_size_bytes": 4472170 + }, "data/input/gb/great_kneighton/desire_lines_disag.geojson": { "checksum": "1cb0f5fc91626099dca6582c97f49c43", "uncompressed_size_bytes": 80600, @@ -2200,6 +2215,11 @@ "uncompressed_size_bytes": 3674917, "compressed_size_bytes": 3632843 }, + "data/input/shared/elevation/srtm/srtm.-3.56.tif": { + "checksum": "6d37353c7158407e10b86f3952341f4d", + "uncompressed_size_bytes": 1683424, + "compressed_size_bytes": 1655158 + }, "data/input/shared/elevation/srtm/srtm.-4.50.tif": { "checksum": "d0ca63bf4c0e39f6e060f14acb387c2b", "uncompressed_size_bytes": 2438784, @@ -2210,6 +2230,11 @@ "uncompressed_size_bytes": 3313212, "compressed_size_bytes": 3276824 }, + "data/input/shared/elevation/srtm/srtm.-4.56.tif": { + "checksum": "ccf14b1ebd2ba340f161b41a66f1a40c", + "uncompressed_size_bytes": 3462371, + "compressed_size_bytes": 3425880 + }, "data/input/shared/elevation/srtm/srtm.-47.-24.tif": { "checksum": "613389c88cdc1dd62ba708cdcdc69489", "uncompressed_size_bytes": 7567376, @@ -3755,6 +3780,16 @@ "uncompressed_size_bytes": 6573991, "compressed_size_bytes": 1729452 }, + "data/system/gb/glenrothes/maps/center.bin": { + "checksum": "9703170ee1eb36f9c01265cc690cca21", + "uncompressed_size_bytes": 68764627, + "compressed_size_bytes": 26932291 + }, + "data/system/gb/glenrothes/scenarios/center/background.bin": { + "checksum": "6a3d88fbe3d5d0888cecb3fd3549426b", + "uncompressed_size_bytes": 69, + "compressed_size_bytes": 66 + }, "data/system/gb/great_kneighton/maps/center.bin": { "checksum": "dd7f99c3bdf000cfbb725338853caafc", "uncompressed_size_bytes": 26225790, diff --git a/importer/config/gb/glenrothes/center.poly b/importer/config/gb/glenrothes/center.poly new file mode 100644 index 0000000000..a7122af605 --- /dev/null +++ b/importer/config/gb/glenrothes/center.poly @@ -0,0 +1,18 @@ +boundary +1 + -2.98828125 56.19715501399397 + -2.9937744140625 56.205558230204865 + -2.9999542236328125 56.2256039216028 + -3.0095672607421875 56.23457335899079 + -3.0040740966796875 56.32186778153616 + -3.2746124267578125 56.281866690270526 + -3.440093994140625 56.22770333984857 + -3.4229278564453125 56.186457348602 + -3.3707427978515625 56.13024565610334 + -3.3405303955078125 56.1072784653896 + -3.20526123046875 56.13828093407948 + -3.1688690185546875 56.10191748129532 + -3.1235504150390625 56.12450514373685 + -2.98828125 56.19715501399397 +END +END diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index cb6f9ce142..9141f16976 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -172,6 +172,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("dunton_hills", "center") => "Dunton Hills", ("ebbsfleet", "center") => "Ebbsfleet (Dartford)", ("exeter_red_cow_village", "center") => "Exeter Red Cow Village", + ("glenrothes", "center") => "Glenrothes (Scotland)", ("great_kneighton", "center") => "Great Kneighton (Cambridge)", ("halsnhead", "center") => "Halsnead", ("hampton", "center") => "Hampton",