Skip to content

Commit 1b4b5c2

Browse files
dabreegsterdabreegster
committed
Import Cardiff and a few custom areas in London [rebuild] [release]
1 parent dd5a48d commit 1b4b5c2

File tree

6 files changed

+224
-1
lines changed

6 files changed

+224
-1
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ data/system/gb/brighton
4141
data/system/gb/bristol
4242
data/system/gb/burnley
4343
data/system/gb/cambridge
44+
data/system/gb/cardiff
4445
data/system/gb/castlemead
4546
data/system/gb/chapelford
4647
data/system/gb/chapeltown_cohousing
@@ -123,4 +124,4 @@ data/system/us/providence
123124
data/system/us/san_francisco
124125
data/system/us/seattle
125126
data/system/us/tucson
126-
data/system/zz/oneshot
127+
data/system/zz/oneshot

‎data/MANIFEST.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,11 @@
390390
"uncompressed_size_bytes": 10235498,
391391
"compressed_size_bytes": 2444290
392392
},
393+
"data/input/gb/cardiff/raw_maps/center.bin": {
394+
"checksum": "ac7294cbbf603b989668d41204eb98fc",
395+
"uncompressed_size_bytes": 29055486,
396+
"compressed_size_bytes": 9095700
397+
},
393398
"data/input/gb/castlemead/raw_maps/center.bin": {
394399
"checksum": "c709f9f08ac1a518fdee2a173ea36d41",
395400
"uncompressed_size_bytes": 3144552,
@@ -645,6 +650,11 @@
645650
"uncompressed_size_bytes": 15585569,
646651
"compressed_size_bytes": 4582465
647652
},
653+
"data/input/gb/london/raw_maps/highgate.bin": {
654+
"checksum": "5a78215f2e3b5aa78f46ac0b505e41b2",
655+
"uncompressed_size_bytes": 5756013,
656+
"compressed_size_bytes": 1594632
657+
},
648658
"data/input/gb/london/raw_maps/hillingdon.bin": {
649659
"checksum": "753015655a3138fc95ef43fb41b0b7c7",
650660
"uncompressed_size_bytes": 17842369,
@@ -710,6 +720,11 @@
710720
"uncompressed_size_bytes": 9714486,
711721
"compressed_size_bytes": 2911744
712722
},
723+
"data/input/gb/london/raw_maps/regents_park.bin": {
724+
"checksum": "2351bc5386fa28750f5aa147ecd3ac4c",
725+
"uncompressed_size_bytes": 17925251,
726+
"compressed_size_bytes": 4454515
727+
},
713728
"data/input/gb/london/raw_maps/richmond_upon_thames.bin": {
714729
"checksum": "2e8db377a421b4bca7549d3b47d57e7c",
715730
"uncompressed_size_bytes": 23258282,
@@ -1360,6 +1375,11 @@
13601375
"uncompressed_size_bytes": 238095072,
13611376
"compressed_size_bytes": 237887274
13621377
},
1378+
"data/input/shared/geofabrik/europe/great-britain/wales-latest.osm.pbf": {
1379+
"checksum": "1da41a826e5551539d9ed0f85c6bff47",
1380+
"uncompressed_size_bytes": 109189752,
1381+
"compressed_size_bytes": 109081588
1382+
},
13631383
"data/input/shared/geofabrik/europe/netherlands-latest.osm.pbf": {
13641384
"checksum": "529b1e1757b5dae777948e674052bdf8",
13651385
"uncompressed_size_bytes": 1215229642,
@@ -2360,6 +2380,16 @@
23602380
"uncompressed_size_bytes": 6057508,
23612381
"compressed_size_bytes": 1469381
23622382
},
2383+
"data/system/gb/cardiff/maps/center.bin": {
2384+
"checksum": "b5ffd9a847ad5e95f2a6ac7976e4f3ef",
2385+
"uncompressed_size_bytes": 88451386,
2386+
"compressed_size_bytes": 35586511
2387+
},
2388+
"data/system/gb/cardiff/scenarios/center/background.bin": {
2389+
"checksum": "34d8723142d4451901debce46a6cb52b",
2390+
"uncompressed_size_bytes": 15262590,
2391+
"compressed_size_bytes": 3956216
2392+
},
23632393
"data/system/gb/castlemead/maps/center.bin": {
23642394
"checksum": "35ca65f47811b3956b42caa5435f0d39",
23652395
"uncompressed_size_bytes": 13446085,
@@ -3040,6 +3070,11 @@
30403070
"uncompressed_size_bytes": 47954188,
30413071
"compressed_size_bytes": 18949109
30423072
},
3073+
"data/system/gb/london/maps/highgate.bin": {
3074+
"checksum": "aff1e4dd26e51cb1a5326618e678bdb2",
3075+
"uncompressed_size_bytes": 13588118,
3076+
"compressed_size_bytes": 5150304
3077+
},
30433078
"data/system/gb/london/maps/hillingdon.bin": {
30443079
"checksum": "c982032813b5f39f7c61646cb7f4a505",
30453080
"uncompressed_size_bytes": 60061881,
@@ -3105,6 +3140,11 @@
31053140
"uncompressed_size_bytes": 34161572,
31063141
"compressed_size_bytes": 13463196
31073142
},
3143+
"data/system/gb/london/maps/regents_park.bin": {
3144+
"checksum": "78012a51c27ec1f8be84e793c59359a6",
3145+
"uncompressed_size_bytes": 34764594,
3146+
"compressed_size_bytes": 13071873
3147+
},
31083148
"data/system/gb/london/maps/richmond_upon_thames.bin": {
31093149
"checksum": "fe8fa14c175fc15e97ee51f4be4b7237",
31103150
"uncompressed_size_bytes": 52014679,
@@ -3220,6 +3260,11 @@
32203260
"uncompressed_size_bytes": 18094627,
32213261
"compressed_size_bytes": 4543954
32223262
},
3263+
"data/system/gb/london/scenarios/highgate/background.bin": {
3264+
"checksum": "2a302450c8a1ba493108fa636f158762",
3265+
"uncompressed_size_bytes": 18414235,
3266+
"compressed_size_bytes": 4705163
3267+
},
32233268
"data/system/gb/london/scenarios/hillingdon/background.bin": {
32243269
"checksum": "11925e95b8f116942eb5a2c4a47f0f81",
32253270
"uncompressed_size_bytes": 26176047,
@@ -3285,6 +3330,11 @@
32853330
"uncompressed_size_bytes": 19405421,
32863331
"compressed_size_bytes": 5055218
32873332
},
3333+
"data/system/gb/london/scenarios/regents_park/background.bin": {
3334+
"checksum": "e01e965cd4557f020aa77fd1f6ebf0c1",
3335+
"uncompressed_size_bytes": 51602480,
3336+
"compressed_size_bytes": 14037197
3337+
},
32883338
"data/system/gb/london/scenarios/richmond_upon_thames/background.bin": {
32893339
"checksum": "8cb9c5c6dc0b5e7fd424085567529c14",
32903340
"uncompressed_size_bytes": 20557111,

‎importer/config/gb/cardiff/center.geojson‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
{
2+
"type": "FeatureCollection",
3+
"features": [
4+
{
5+
"type": "Feature",
6+
"properties": {},
7+
"geometry": {
8+
"coordinates": [[
9+
[
10+
-3.1112709974766233,
11+
51.542984807123446
12+
],
13+
[
14+
-3.125500662458194,
15+
51.540848594133536
16+
],
17+
[
18+
-3.155432026727425,
19+
51.54634151064684
20+
],
21+
[
22+
-3.1841366957391415,
23+
51.54679922375996
24+
],
25+
[
26+
-3.20302780269634,
27+
51.54466318983836
28+
],
29+
[
30+
-3.2133320428540912,
31+
51.53901747461268
32+
],
33+
[
34+
-3.2192201800873192,
35+
51.53428674150388
36+
],
37+
[
38+
-3.233449845067696,
39+
51.53092914874088
40+
],
41+
[
42+
-3.2714773980330847,
43+
51.522534083341725
44+
],
45+
[
46+
-3.312449019615684,
47+
51.50619743009864
48+
],
49+
[
50+
-3.2965019812745027,
51+
51.4984087390703
52+
],
53+
[
54+
-3.2942939298127953,
55+
51.494437521521576
56+
],
57+
[
58+
-3.282026977243106,
59+
51.4817578578853
60+
],
61+
[
62+
-3.2790829086258952,
63+
51.473048094694434
64+
],
65+
[
66+
-3.270741380878775,
67+
51.4660179502726
68+
],
69+
[
70+
-3.252095612973818,
71+
51.46448951466439
72+
],
73+
[
74+
-3.245716797637357,
75+
51.4658651090154
76+
],
77+
[
78+
-3.242772729021368,
79+
51.469991643264876
80+
],
81+
[
82+
-3.2216735706012685,
83+
51.47534029888831
84+
],
85+
[
86+
-3.215049416213759,
87+
51.47427061793107
88+
],
89+
[
90+
-3.20253712459305,
91+
51.46296102786113
92+
],
93+
[
94+
-3.200329073131371,
95+
51.45638795122355
96+
],
97+
[
98+
-3.1868354253041105,
99+
51.44736753805714
100+
],
101+
[
102+
-3.1642642325766417,
103+
51.44492101710935
104+
],
105+
[
106+
-3.131388799691365,
107+
51.46724066189873
108+
],
109+
[
110+
-3.104401504038094,
111+
51.49229903029982
112+
],
113+
[
114+
-3.061221830993759,
115+
51.50711365917411
116+
],
117+
[
118+
-3.0823209894138586,
119+
51.53169225975128
120+
],
121+
[
122+
-3.111213512129666,
123+
51.54298643647206
124+
],
125+
[
126+
-3.1112709974766233,
127+
51.542984807123446
128+
]
129+
]],
130+
"type": "Polygon"
131+
}
132+
}
133+
]
134+
}

‎importer/config/gb/london/highgate.geojson‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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"}}]}

‎importer/config/gb/london/regents_park.geojson‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"type": "FeatureCollection",
3+
"features": [
4+
{
5+
"type": "Feature",
6+
"properties": {},
7+
"geometry": {
8+
"coordinates": [
9+
[
10+
[
11+
-0.19718718999854445,
12+
51.54970425003464
13+
],
14+
[
15+
-0.19718718999854445,
16+
51.516185213662
17+
],
18+
[
19+
-0.12965421349036887,
20+
51.516185213662
21+
],
22+
[
23+
-0.12965421349036887,
24+
51.54970425003464
25+
],
26+
[
27+
-0.19718718999854445,
28+
51.54970425003464
29+
]
30+
]
31+
],
32+
"type": "Polygon"
33+
}
34+
}
35+
]
36+
}

‎map_gui/src/tools/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ pub fn nice_map_name(name: &MapName) -> &str {
175175
("bristol", "south") => "South Bristol",
176176
("burnley", "center") => "Burnley",
177177
("cambridge", "north") => "North Cambridge",
178+
("cardiff", "north") => "Cardiff",
178179
("castlemead", "center") => "Castlemead",
179180
("chapelford", "center") => "Chapelford (Cheshire)",
180181
("chapeltown_cohousing", "center") => "Chapeltown Cohousing",

0 commit comments

Comments
 (0)