Import Nottingham

.gitignore

@@ -62,6 +62,7 @@ data/system/gb/newborough_road
 data/system/gb/newcastle_great_park
 data/system/gb/newcastle_upon_tyne
 data/system/gb/northwick_park
+data/system/gb/nottingham
 data/system/gb/poundbury
 data/system/gb/priors_hall
 data/system/gb/st_albans

data/MANIFEST.json

@@ -1520,6 +1520,31 @@
  "uncompressed_size_bytes": 4603466,
  "compressed_size_bytes": 1055155
  },
+ "data/input/gb/nottingham/osm/center.osm": {
+ "checksum": "97c5898289345058f0c551c2cf358e8c",
+ "uncompressed_size_bytes": 42346328,
+ "compressed_size_bytes": 4466574
+ },
+ "data/input/gb/nottingham/osm/huge.osm": {
+ "checksum": "d74d7981e99b6918079c61320f020aa3",
+ "uncompressed_size_bytes": 266630292,
+ "compressed_size_bytes": 24999997
+ },
+ "data/input/gb/nottingham/osm/nottinghamshire-latest.osm.pbf": {
+ "checksum": "f747f9e1dd803a78acd692b72128af5d",
+ "uncompressed_size_bytes": 27167662,
+ "compressed_size_bytes": 27146742
+ },
+ "data/input/gb/nottingham/raw_maps/center.bin": {
+ "checksum": "512b407e9e2ced3b1d15ac80a39e0a12",
+ "uncompressed_size_bytes": 12330518,
+ "compressed_size_bytes": 2323132
+ },
+ "data/input/gb/nottingham/raw_maps/huge.bin": {
+ "checksum": "883e01ff15d9ca67fbf289ce378fa1b0",
+ "uncompressed_size_bytes": 82613279,
+ "compressed_size_bytes": 14864453
+ },
  "data/input/gb/poundbury/osm/center.osm": {
  "checksum": "6427a7065d2c4c355337e593682c9932",
  "uncompressed_size_bytes": 8989647,
@@ -4380,6 +4405,26 @@
  "uncompressed_size_bytes": 12261173,
  "compressed_size_bytes": 3219229
  },
+ "data/system/gb/nottingham/maps/center.bin": {
+ "checksum": "436b5e51be5cce49a05501ede4eb8b62",
+ "uncompressed_size_bytes": 23651877,
+ "compressed_size_bytes": 8903407
+ },
+ "data/system/gb/nottingham/maps/huge.bin": {
+ "checksum": "fa48b53660cc89de47245406838dd428",
+ "uncompressed_size_bytes": 151993400,
+ "compressed_size_bytes": 58672348
+ },
+ "data/system/gb/nottingham/scenarios/center/background.bin": {
+ "checksum": "a41af635068a5bed629b9d4da098f0b4",
+ "uncompressed_size_bytes": 10120575,
+ "compressed_size_bytes": 2720642
+ },
+ "data/system/gb/nottingham/scenarios/huge/background.bin": {
+ "checksum": "4b7d29404d0cac70ac850c8592993a13",
+ "uncompressed_size_bytes": 20805706,
+ "compressed_size_bytes": 5768590
+ },
  "data/system/gb/poundbury/maps/center.bin": {
  "checksum": "386049d8671a8aadb9dff8d576087182",
  "uncompressed_size_bytes": 8356958,

importer/config/gb/nottingham/center.poly

@@ -0,0 +1,10 @@
+boundary
+1
+ -1.197509765625 52.965390502423425
+ -1.1968231201171875 52.9536023000285
+ -1.1865234375 52.93218918956182
+ -1.1235237121582031 52.94491419958012
+ -1.1367416381835935 52.97262727982499
+ -1.197509765625 52.965390502423425
+END
+END

importer/config/gb/nottingham/huge.poly

@@ -0,0 +1,21 @@
+boundary
+1
+ -1.171417236328125 53.04946903057477
+ -1.1954498291015625 53.05648537866338
+ -1.2297821044921875 53.042864365225824
+ -1.2284088134765625 53.016848656816386
+ -1.22772216796875 52.996190098204366
+ -1.2380218505859375 52.98130981344024
+ -1.259307861328125 52.95897977344026
+ -1.2709808349609373 52.93870734509865
+ -1.2709808349609373 52.912214760778674
+ -1.2696075439453125 52.89606289177976
+ -1.253814697265625 52.86498467901085
+ -1.12335205078125 52.88073375719345
+ -1.0883331298828125 52.921323415263046
+ -1.0361480712890625 52.956497945727484
+ -1.050567626953125 52.98999060254369
+ -1.121978759765625 53.01891396891348
+ -1.171417236328125 53.04946903057477
+END
+END

map_gui/src/tools/mod.rs

@@ -195,6 +195,8 @@ pub fn nice_map_name(name: &MapName) -> &str {
  ("newborough_road", "center") => "Newborough Road",
  ("newcastle_great_park", "center") => "Newcastle Great Park",
  ("newcastle_upon_tyne", "center") => "Newcastle upon Tyne",
+ ("nottingham", "center") => "Nottingham (city center)",
+ ("nottingham", "huge") => "Nottingham (entire area)",
  ("northwick_park", "center") => "Northwick Park",
  ("poundbury", "center") => "Poundbury",
  ("priors_hall", "center") => "Priors Hall",