a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-01 02:33:54 +03:00
Code Issues Projects Releases Wiki Activity

Update Chapelford boundary, and add LCID. https://github.com/cyipt/actdev/issues/65

Browse Source
This commit is contained in:
Dustin Carlino 2021-02-09 15:41:42 -08:00
parent bbdd23dada
commit 1241cea22e
5 changed files with 280 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
data/MANIFEST.json
View File

@ -91,9 +91,9 @@
"compressed_size_bytes": 1295537 "compressed_size_bytes": 1295537
}, },
"data/input/cheshire/raw_maps/chapelford.bin": { "data/input/cheshire/raw_maps/chapelford.bin": {
"checksum": "1a689b7ceae191d402cdf073c812e299", "checksum": "f276b2c239b10a883ea8f5cfd0146bff",
"uncompressed_size_bytes": 12026716, "uncompressed_size_bytes": 8404864,
"compressed_size_bytes": 2826267 "compressed_size_bytes": 2003345
}, },
"data/input/dartford/osm/ebbsfleet.osm": { "data/input/dartford/osm/ebbsfleet.osm": {
"checksum": "0c56c9cde936177364d9ccfa601fe7b8", "checksum": "0c56c9cde936177364d9ccfa601fe7b8",
@ -195,6 +195,11 @@
"uncompressed_size_bytes": 130969890, "uncompressed_size_bytes": 130969890,
"compressed_size_bytes": 12269621 "compressed_size_bytes": 12269621
}, },
"data/input/leeds/osm/lcid.osm": {
"checksum": "cabdd4a350493e3be5ba6d22906a219a",
"uncompressed_size_bytes": 49133308,
"compressed_size_bytes": 4821193
},
"data/input/leeds/osm/north.osm": { "data/input/leeds/osm/north.osm": {
"checksum": "a5551114b5d8fc3b0bb1478f8b0fa565", "checksum": "a5551114b5d8fc3b0bb1478f8b0fa565",
"uncompressed_size_bytes": 58094888, "uncompressed_size_bytes": 58094888,
@ -220,6 +225,11 @@
"uncompressed_size_bytes": 42154885, "uncompressed_size_bytes": 42154885,
"compressed_size_bytes": 10022020 "compressed_size_bytes": 10022020
}, },
"data/input/leeds/raw_maps/lcid.bin": {
"checksum": "cfaea751caf2c8ab1432d1ff2924244a",
"uncompressed_size_bytes": 16633776,
"compressed_size_bytes": 3688476
},
"data/input/leeds/raw_maps/north.bin": { "data/input/leeds/raw_maps/north.bin": {
"checksum": "04056b64cdccf44ea09365cb9d803bb4", "checksum": "04056b64cdccf44ea09365cb9d803bb4",
"uncompressed_size_bytes": 18219958, "uncompressed_size_bytes": 18219958,
@ -821,9 +831,9 @@
"compressed_size_bytes": 19234 "compressed_size_bytes": 19234
}, },
"data/system/cheshire/maps/chapelford.bin": { "data/system/cheshire/maps/chapelford.bin": {
"checksum": "1ea548d695deaad1fa045d9050e89329", "checksum": "470681e01da999f2c2c37f0d97106666",
"uncompressed_size_bytes": 55232315, "uncompressed_size_bytes": 35681334,
"compressed_size_bytes": 18838545 "compressed_size_bytes": 12133314
}, },
"data/system/dartford/maps/ebbsfleet.bin": { "data/system/dartford/maps/ebbsfleet.bin": {
"checksum": "5fa9a96203935b146ac4808a31ae2e29", "checksum": "5fa9a96203935b146ac4808a31ae2e29",
@ -851,9 +861,9 @@
"compressed_size_bytes": 7582705 "compressed_size_bytes": 7582705
}, },
"data/system/leeds/city.bin": { "data/system/leeds/city.bin": {
"checksum": "8bf1c59a25c84771714fc01c40aed907", "checksum": "2ef31d106d879203c124ee84ed659e8d",
"uncompressed_size_bytes": 1571764, "uncompressed_size_bytes": 1574516,
"compressed_size_bytes": 794704 "compressed_size_bytes": 796125
}, },
"data/system/leeds/maps/central.bin": { "data/system/leeds/maps/central.bin": {
"checksum": "5d6db225bdc7eee535b99f9d8e9b0f2b", "checksum": "5d6db225bdc7eee535b99f9d8e9b0f2b",
@ -865,6 +875,11 @@
"uncompressed_size_bytes": 119926264, "uncompressed_size_bytes": 119926264,
"compressed_size_bytes": 41216621 "compressed_size_bytes": 41216621
}, },
"data/system/leeds/maps/lcid.bin": {
"checksum": "4b582a028d6630f0a1470e971f1a7473",
"uncompressed_size_bytes": 52882912,
"compressed_size_bytes": 17819168
},
"data/system/leeds/maps/north.bin": { "data/system/leeds/maps/north.bin": {
"checksum": "a91dbfa2a170575f0987f6409b3f3cf1", "checksum": "a91dbfa2a170575f0987f6409b3f3cf1",
"uncompressed_size_bytes": 52270428, "uncompressed_size_bytes": 52270428,

249
importer/config/cheshire/chapelford.poly
View File

@ -1,128 +1,129 @@
boundary boundary
1 1
-2.580435223727831 53.37308513458976 -2.571987 53.391752
-2.581641116124175 53.37246279520882 -2.571555 53.390848
-2.582900421742357 53.371879530905495 -2.571204 53.389931
-2.58420960362429 53.371336978902086 -2.570933 53.389004
-2.585564985240413 53.37083666208176 -2.570744 53.388071
-2.586962760797713 53.370379984727265 -2.570637 53.387132
-2.588399005904646 53.36996822859196 -2.570612 53.386192
-2.589869688563626 53.36960254931413 -2.570669 53.385252
-2.591370680460334 53.36928397318458 -2.570809 53.384315
-2.592897768518742 53.36901339427633 -2.57103 53.383384
-2.594446666689767 53.368791571944215 -2.571333 53.382461
-2.59601302794105 53.36861912870162 -2.571715 53.381548
-2.597592456414745 53.3684965484797 -2.572178 53.380649
-2.599180519719773 53.3684241752745 -2.572718 53.379766
-2.600772761324703 53.36840221218501 -2.573334 53.378901
-2.602364713017088 53.36843072084553 -2.574026 53.378056
-2.60395190739496 53.3685096212532 -2.57479 53.377234
-2.605529890356101 53.36863869199177 -2.575626 53.376437
-2.607094233550692 53.368817570850574 -2.57653 53.375667
-2.608640546763055 53.36904575583727 -2.5775 53.374927
-2.610164490188382 53.36932260658132 -2.578533 53.374218
-2.61166178657061 53.36964734612468 -2.579627 53.373542
-2.613128233167966 53.3700190630943 -2.580778 53.372901
-2.614559713513153 53.37043671425096 -2.581984 53.372298
-2.651753244312872 53.38201876036014 -2.583241 53.371732
-2.653145705620077 53.38248045124755 -2.584546 53.371207
-2.65449535179648 53.382985568757206 -2.585895 53.370724
-2.655798397598424 53.38353269680875 -2.587285 53.370283
-2.657051188014061 53.38412030149052 -2.588711 53.369886
-2.658250208499468 53.38474673534667 -2.590169 53.369535
-2.659392094826865 53.38541024198254 -2.591657 53.36923
-2.660473642517662 53.386108960975214 -2.593169 53.368971
-2.661491815833633 53.38684093307607 -2.594701 53.36876
-2.662443756301487 53.387604105690464 -2.59625 53.368598
-2.663326790746295 53.38839633861994 -2.597811 53.368484
-2.669724090332958 53.39447784536788 -2.59938 53.368419
-2.670533794436149 53.395294531902174 -2.600953 53.368403
-2.671270244901038 53.396135632246136 -2.602524 53.368437
-2.671931383347946 53.39699880052611 -2.604091 53.368519
-2.672515361101312 53.397881629176865 -2.605648 53.368651
-2.673020544389419 53.39878165564615 -2.607191 53.368831
-2.673445518949125 53.399696369254286 -2.608717 53.369059
-2.673789094022299 53.40062321818946 -2.610221 53.369334
-2.674050305732223 53.40155961661939 -2.611698 53.369656
-2.674228419829958 53.40250295189976 -2.613146 53.370024
-2.674322933802377 53.40345059185918 -2.614559 53.370437
-2.674333578335337 53.40439989214061 -2.651753 53.382019
-2.674260318127196 53.40534820357859 -2.653145 53.38248
-2.674103352049761 53.40629287959204 -2.654495 53.382986
-2.673863112655491 53.40723128357154 -2.655798 53.383533
-2.673540265031634 53.408160796241006 -2.657051 53.38412
-2.673135705003824 53.40907882297266 -2.65825 53.384747
-2.672650556693496 53.40998280103515 -2.659392 53.38541
-2.672086169435247 53.41087020675443 -2.660474 53.386109
-2.671444114062215 53.41173856256723 -2.661492 53.386841
-2.670726178569172 53.41258544394746 -2.662444 53.387604
-2.669934363165027 53.4134084861859 -2.663327 53.388397
-2.669070874727935 53.41420539100433 -2.669724 53.394478
-2.66813812067824 53.41497393298526 -2.670524 53.395285
-2.667138702285779 53.41571196579921 -2.671253 53.396115
-2.666075407430188 53.41641742821211 -2.671908 53.396966
-2.664951202833964 53.4170883498556 -2.672488 53.397837
-2.663769225789937 53.41772285674421 -2.672991 53.398725
-2.662532775406207 53.41831917652348 -2.673416 53.399627
-2.661245303392695 53.418875643434575 -2.673762 53.400542
-2.659910404415577 53.419390702980984 -2.674028 53.401465
-2.658531806046166 53.4198629162842 -2.674212 53.402396
-2.657113358332816 53.42029096411616 -2.674315 53.403332
-2.65565902302514 53.42067365059676 -2.674337 53.404269
-2.654172862480975 53.42100990654606 -2.674277 53.405206
-2.652659028287438 53.42129879248188 -2.674134 53.406139
-2.541011881977083 53.44061689553963 -2.673911 53.407067
-2.539478786196949 53.440855401651746 -2.673607 53.407987
-2.537926780102493 53.44104538940798 -2.673223 53.408895
-2.536360169191724 53.44118633173156 -2.672761 53.409791
-2.534783299632032 53.441277837606435 -2.672221 53.410671
-2.53320054615863 53.44131965316619 -2.671604 53.411533
-2.531616299892416 53.44131166240096 -2.670914 53.412375
-2.530034956111406 53.44125388748047 -2.67015 53.413194
-2.528460902010478 53.44114648869223 -2.669317 53.413988
-2.526898504483953 53.440989763995304 -2.668415 53.414755
-2.525352097965525 53.44078414819049 -2.667447 53.415493
-2.52382597236 53.44053021170957 -2.666416 53.416199
-2.52232436110081 53.44022865902698 -2.665325 53.416873
-2.52085142936704 53.43988032669841 -2.664177 53.417512
-2.519411262493348 53.43948618103175 -2.662974 53.418114
-2.518007854605202 53.43904731539702 -2.66172 53.418678
-2.516645097511528 53.43856494718312 -2.660419 53.419201
-2.515326769886133 53.43804041440944 -2.659074 53.419684
-2.51405652676798 53.43747517200248 -2.657689 53.420124
-2.512837889409969 53.43687078774758 -2.656267 53.420521
-2.51167423550454 53.43622893792736 -2.654812 53.420872
-2.510568789813314 53.43555140265896 -2.653329 53.421178
-2.509524615227004 53.434840060943486 -2.65182 53.421437
-2.508544604280186 53.434096885441306 -2.650292 53.421648
-2.507631471144724 53.433323936987954 -2.648747 53.421812
-2.506787744123661 53.43252335886621 -2.647189 53.421927
-2.506015758666339 53.43169737085018 -2.645624 53.421994
-2.505317650923972 53.430848263038115 -2.644055 53.422012
-2.504695351862979 53.42997838949144 -2.642487 53.421981
-2.50415058195227 53.42909016169756 -2.640923 53.421901
-2.503684846438599 53.428186041874824 -2.639369 53.421772
-2.503299431222761 53.42726853613825 -2.603158 53.418195
-2.502995399347441 53.426340187545314 -2.601608 53.418016
-2.502773588105867 53.42540356904084 -2.600075 53.41779
-2.50263460677874 53.42446127632091 -2.598565 53.417515
-2.502578835005094 53.42351592063555 -2.59708 53.417193
-2.502606421790789 53.42257012155014 -2.595626 53.416825
-2.502717285156943 53.4216264996857 -2.594207 53.416413
-2.50291111242844 53.420687669458225 -2.592825 53.415956
-2.503187361161034 53.419756231837006 -2.591486 53.415456
-2.50354526070392 53.41883476714222 -2.590192 53.414916
-2.503983814392675 53.417925827901435 -2.588948 53.414335
-2.504501802365928 53.41703193178501 -2.587757 53.413716
-2.505097784997261 53.41615555463962 -2.586621 53.413061
-2.505770106932362 53.41529912363936 -2.585545 53.412371
-2.506516901719653 53.41446501057306 -2.58453 53.411648
-2.507336097021082 53.41365552528634 -2.583581 53.410894
-2.508225420388206 53.41287290929658 -2.582699 53.410112
-2.509182405587232 53.412119329598035 -2.581887 53.409303
-2.510204399455109 53.41139687267426 -2.581148 53.40847
-2.511288569267484 53.41070753873442 -2.580482 53.407614
-2.512431910597873 53.4100532361887 -2.579893 53.406739
-2.580435223727831 53.37308513458976 -2.579381 53.405847
-2.571987 53.391752
END END
END END

128
importer/config/leeds/lcid.poly Normal file
View File

@ -0,0 +1,128 @@
boundary
1
-1.501279 53.776203
-1.501809 53.775308
-1.502417 53.774431
-1.503103 53.773574
-1.503865 53.77274
-1.504699 53.77193
-1.505604 53.771148
-1.506578 53.770395
-1.507618 53.769674
-1.50872 53.768986
-1.509882 53.768334
-1.5111 53.767718
-1.512371 53.767142
-1.513692 53.766606
-1.515059 53.766113
-1.516467 53.765662
-1.517914 53.765257
-1.519395 53.764897
-1.520906 53.764583
-1.522443 53.764318
-1.524001 53.764101
-1.525576 53.763933
-1.527164 53.763814
-1.528761 53.763745
-1.530361 53.763726
-1.531961 53.763757
-1.533555 53.763838
-1.535141 53.763969
-1.536712 53.764149
-1.538266 53.764378
-1.539796 53.764655
-1.5413 53.76498
-1.542773 53.765351
-1.544211 53.765768
-1.54561 53.766229
-1.546966 53.766733
-1.548275 53.767279
-1.549534 53.767865
-1.550739 53.768489
-1.551886 53.76915
-1.552973 53.769847
-1.585166 53.791569
-1.586187 53.792295
-1.587141 53.793052
-1.588028 53.793837
-1.588843 53.794649
-1.589586 53.795485
-1.590253 53.796342
-1.590843 53.79722
-1.591355 53.798114
-1.591786 53.799024
-1.592137 53.799945
-1.592405 53.800876
-1.59259 53.801814
-1.592691 53.802757
-1.592709 53.803701
-1.592643 53.804644
-1.592493 53.805585
-1.59226 53.806519
-1.591944 53.807445
-1.591546 53.808359
-1.591068 53.80926
-1.590511 53.810145
-1.589876 53.811012
-1.589164 53.811857
-1.588379 53.812679
-1.587521 53.813476
-1.586594 53.814245
-1.585601 53.814983
-1.584542 53.81569
-1.583423 53.816364
-1.582245 53.817001
-1.581012 53.817601
-1.579728 53.818161
-1.578395 53.818681
-1.577019 53.819159
-1.575601 53.819593
-1.574147 53.819983
-1.572661 53.820327
-1.571146 53.820624
-1.569606 53.820873
-1.568047 53.821075
-1.566472 53.821227
-1.564885 53.821331
-1.563292 53.821385
-1.525125 53.822075
-1.52353 53.822079
-1.521936 53.822033
-1.520348 53.821938
-1.518771 53.821793
-1.517209 53.8216
-1.515666 53.821358
-1.514147 53.821069
-1.512656 53.820732
-1.511197 53.82035
-1.509773 53.819923
-1.50839 53.819453
-1.50705 53.81894
-1.505758 53.818386
-1.504517 53.817793
-1.50333 53.817161
-1.502201 53.816494
-1.501132 53.815793
-1.500128 53.815059
-1.49919 53.814296
-1.498321 53.813504
-1.497523 53.812686
-1.4968 53.811844
-1.496152 53.810982
-1.495581 53.8101
-1.49509 53.809202
-1.494679 53.808289
-1.494349 53.807365
-1.494102 53.806432
-1.493938 53.805493
-1.493858 53.80455
-1.493862 53.803606
-1.493949 53.802663
-1.496042 53.787404
-1.496233 53.786377
-1.496523 53.785359
-1.496911 53.784353
-1.497397 53.783361
-1.501279 53.776203
END
END

2
importer/src/main.rs
View File

@ -126,7 +126,7 @@ fn regenerate_everything(config: ImporterConfiguration) {
if city == "seattle" || city == "cambridge" { if city == "seattle" || city == "cambridge" {
job.scenario = true; job.scenario = true;
} }
if city == "nyc" || city == "paris" || city == "salzburg" { if city == "leeds" || city == "nyc" || city == "paris" || city == "salzburg" {
job.city_overview = true; job.city_overview = true;
} }

3
map_gui/src/tools/mod.rs
View File

@ -80,10 +80,11 @@ pub fn nice_map_name(name: &MapName) -> &str {
("harwell", "didcot") => "Didcot (Harwell)", ("harwell", "didcot") => "Didcot (Harwell)",
("krakow", "center") => "Kraków (city center)", ("krakow", "center") => "Kraków (city center)",
("lancaster", "bailrigg") => "Bailrigg (Lancaster)", ("lancaster", "bailrigg") => "Bailrigg (Lancaster)",
("leeds", "central") => "Leeds (city center)",
("leeds", "huge") => "Leeds (entire area inside motorways)", ("leeds", "huge") => "Leeds (entire area inside motorways)",
("leeds", "lcid") => "Leeds Climate Innovation District",
("leeds", "north") => "North Leeds", ("leeds", "north") => "North Leeds",
("leeds", "west") => "West Leeds", ("leeds", "west") => "West Leeds",
("leeds", "central") => "Leeds (city center)",
("london", "southbank") => "London (Southbank)", ("london", "southbank") => "London (Southbank)",
("montreal", "plateau") => "Montréal (Plateau)", ("montreal", "plateau") => "Montréal (Plateau)",
("nyc", "lower_manhattan") => "Lower Manhattan", ("nyc", "lower_manhattan") => "Lower Manhattan",