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

Regularly import Salzburg. #366

Browse Source
This commit is contained in:
Dustin Carlino 2020-12-15 06:02:06 -08:00
parent 375e0caeb8
commit 5aecff3b9e
11 changed files with 182 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,6 +14,7 @@ data/system/leeds
data/system/london
data/system/nyc
data/system/paris
data/system/salzburg
data/system/seattle
data/system/tel_aviv
data/system/xian

2
book/src/howto/new_city.md
View File

@ -79,6 +79,8 @@ use it as well.
7. Update `.gitignore` and `data/regen.sh`, following `tel_aviv` as an example.
8. Fill out `nice_map_name` in `map_gui/src/tools/mod.rs`.
Send a PR with your changes! I'll generate everything and make it work with
`updater`, so most people don't have to build everything from scratch.

64
data/MANIFEST.json
View File

@ -196,6 +196,50 @@
"checksum": "611fd252dc503d8ff7f4c62182821c85",
"size_bytes": 241244
},
"data/input/salzburg/footways.bin": {
"checksum": "44083ff1b9ebe01c84d2545e427d8ae2",
"size_bytes": 501316
},
"data/input/salzburg/osm/austria-latest.osm.pbf": {
"checksum": "53a70dc6134b6370502218b9f2f5ecf2",
"size_bytes": 631097048
},
"data/input/salzburg/osm/east.osm": {
"checksum": "39da899991664fdf28007c9891f07ef7",
"size_bytes": 11994259
},
"data/input/salzburg/osm/north.osm": {
"checksum": "d3ebaeff3f7b3628cde1a1f5719224a5",
"size_bytes": 23422428
},
"data/input/salzburg/osm/south.osm": {
"checksum": "6bc842dad1a5646ca6c319dcc58ec2cf",
"size_bytes": 19330391
},
"data/input/salzburg/osm/west.osm": {
"checksum": "7bfabc548c0401bfa84f8740922e8d9a",
"size_bytes": 50703065
},
"data/input/salzburg/raw_maps/east.bin": {
"checksum": "1815584eee168e1a01944f856e85af26",
"size_bytes": 1534755
},
"data/input/salzburg/raw_maps/north.bin": {
"checksum": "8e81e256be865d5478a35c12e781bacd",
"size_bytes": 3551913
},
"data/input/salzburg/raw_maps/south.bin": {
"checksum": "4651361faee759ceee5bdbcc45e7be89",
"size_bytes": 3478945
},
"data/input/salzburg/raw_maps/west.bin": {
"checksum": "c50ba43c1e73d7c4206428ae7385a4cd",
"size_bytes": 8498059
},
"data/input/salzburg/service_roads.bin": {
"checksum": "6d2bdc62eb7ae9cc8ce57714b086ae09",
"size_bytes": 527270
},
"data/input/seattle/N47W122.hgt": {
"checksum": "0db4e23e51f7680538b0bbbc72208e07",
"size_bytes": 25934402
@ -520,6 +564,26 @@
"checksum": "ad68b60eb16e0ac74a5755713a517160",
"size_bytes": 44754109
},
"data/system/salzburg/city.bin": {
"checksum": "b6391bf5249fdaa7d506f7209561684c",
"size_bytes": 823575
},
"data/system/salzburg/maps/east.bin": {
"checksum": "4fe372a0ef0b924fa73ff56327e77f8c",
"size_bytes": 3566200
},
"data/system/salzburg/maps/north.bin": {
"checksum": "0e510d49c50b5c26644cc715a0355ab8",
"size_bytes": 8499366
},
"data/system/salzburg/maps/south.bin": {
"checksum": "c0293ea1ee18e5d7530133fe3ff9ea25",
"size_bytes": 7611348
},
"data/system/salzburg/maps/west.bin": {
"checksum": "5dbdfe932d2ee212157e1001ec6a088a",
"size_bytes": 20770984
},
"data/system/seattle/city.bin": {
"checksum": "87545752f96e85f82b6bdeef0891e128",
"size_bytes": 1366385

1
data/regen.sh
View File

@ -11,6 +11,7 @@ rm -fv data/system/seattle/maps/huge_seattle.bin data/input/raw_maps/huge_seattl
./import.sh --raw --map --city=london
./import.sh --raw --map --city_overview --city=nyc
./import.sh --raw --map --city_overview --city=paris
./import.sh --raw --map --city_overview --city=salzburg
./import.sh --raw --map --city=tel_aviv
./import.sh --raw --map --city=xian

16
geom/src/polygon.rs
View File

@ -506,7 +506,21 @@ impl From<Polygon> for geo::Polygon<f64> {
}
fn from_multi(multi: geo::MultiPolygon<f64>) -> Vec<Polygon> {
multi.into_iter().map(Polygon::from).collect()
// TODO This should just call Polygon::from, but while importing maps, it seems like
// intersection() is hitting non-Ring cases that crash. So keep using buggy_new for now.
multi
.into_iter()
.map(|p| {
let pts = p
.into_inner()
.0
.into_points()
.into_iter()
.map(|pt| Pt2D::new(pt.x(), pt.y()))
.collect();
Polygon::buggy_new(pts)
})
.collect()
}
fn downsize(input: Vec<usize>) -> Vec<u16> {

15
importer/config/salzburg/cfg.json Normal file
View File

@ -0,0 +1,15 @@
{
"osm_url": "http://download.geofabrik.de/europe/austria-latest.osm.pbf",
"map_config": {
"driving_side": "Right",
"bikes_can_use_bus_lanes": true,
"inferred_sidewalks": true
},
"onstreet_parking": "JustOSM",
"public_offstreet_parking": "None",
"private_offstreet_parking": {
"FixedPerBldg": 10
},
"elevation": null,
"include_railroads": true
}

13
importer/config/salzburg/east.poly Normal file
View File

@ -0,0 +1,13 @@
boundary
1
13.045148849487305 47.800702862566204
13.053388595581056 47.79839667295524
13.061628341674805 47.79424527367989
13.07046890258789 47.79666696356607
13.08171272277832 47.80052990189636
13.08222770690918 47.81482604021226
13.068580627441406 47.8142496591576
13.042402267456056 47.80179826676978
13.045148849487305 47.800702862566204
END
END

16
importer/config/salzburg/north.poly Normal file
View File

@ -0,0 +1,16 @@
boundary
1
13.02952766418457 47.82923348731677
13.035364151000977 47.81891816173151
13.036651611328123 47.81050302635426
13.036479949951172 47.80779375424168
13.038883209228514 47.80358545562179
13.043603897094728 47.80099112906964
13.0642032623291 47.80779375424168
13.07192802429199 47.81672805230014
13.072786331176758 47.819148694192286
13.059568405151367 47.83211449691779
13.038454055786133 47.830904492365704
13.02952766418457 47.82923348731677
END
END

19
importer/config/salzburg/south.poly Normal file
View File

@ -0,0 +1,19 @@
boundary
1
13.036994934082031 47.80289364787613
13.029356002807615 47.80127939397355
13.020172119140623 47.77475232696755
13.041114807128906 47.77261803978678
13.044204711914063 47.77411781830723
13.060083389282228 47.775732916031856
13.075790405273438 47.77752100142527
13.075962066650389 47.78219280527603
13.07476043701172 47.785364778461314
13.067636489868164 47.79084318534558
13.056328296661375 47.79705615319922
13.05272340774536 47.798771435733016
13.043968677520752 47.801019955632015
13.040385246276855 47.80257656624696
13.036994934082031 47.80289364787613
END
END

32
importer/config/salzburg/west.poly Normal file
View File

@ -0,0 +1,32 @@
boundary
1
13.002233505249023 47.85360178173402
13.001375198364258 47.84156308579322
12.989187240600584 47.83355494174212
12.983779907226563 47.82871488860325
12.972965240478516 47.8116558652381
12.96180725097656 47.79839667295524
12.95107841491699 47.791592817160414
12.948246002197264 47.78709486407255
12.943696975708008 47.78697952682338
12.93837547302246 47.784269027789286
12.93966293334961 47.78075093529741
12.938804626464844 47.77809779004784
12.934856414794922 47.77665580649395
12.92987823486328 47.77382940272034
12.926273345947266 47.76725309331018
12.928504943847656 47.76529157687734
12.967815399169922 47.76736847432615
12.990045547485352 47.775444509403115
13.020343780517576 47.77342561821119
13.022918701171877 47.776482765780024
13.03105115890503 47.800601968912105
13.04051399230957 47.80207211421171
13.037552833557127 47.805559939554506
13.036072254180908 47.808629608585626
13.03675889968872 47.81426406876196
13.035686016082764 47.81888934510192
13.029892444610596 47.829060621654705
13.002233505249023 47.85360178173402
END
END

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

@ -76,6 +76,10 @@ pub fn nice_map_name(name: &MapName) -> &str {
("paris", "south") => "Paris (south)",
("paris", "east") => "Paris (east)",
("paris", "west") => "Paris (west)",
("salzburg", "north") => "Salzburg (north)",
("salzburg", "south") => "Salzburg (south)",
("salzburg", "east") => "Salzburg (east)",
("salzburg", "west") => "Salzburg (west)",
("tel_aviv", "center") => "Tel Aviv (city center)",
("xian", "center") => "Xi'an (city center)",
_ => &name.map,