a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-09-19 06:37:15 +03:00
Code Issues Projects Releases Wiki Activity

Bring in osm2streets intersection merging fixes.

Browse Source 
Also remove old hacks that modify OSM data in Seattle. Making the
traffic simulation work is no longer important, so these root problems
should be solved differently.
This commit is contained in:
Dustin Carlino 2022-11-28 17:30:06 +00:00
parent 70d55c6409
commit f2fedba6b1
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -2952,7 +2952,7 @@ dependencies = [
[[package]]
name = "osm2streets"
version = "0.1.0"
source = "git+https://github.com/a-b-street/osm2streets#575b5af7969875c13a40df680fbba38c81e97847"
source = "git+https://github.com/a-b-street/osm2streets#733b878f53db85ddcf3f39c4470ed5be475c5617"
dependencies = [
"aabb-quadtree",
"abstutil",
@ -3976,7 +3976,7 @@ checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
[[package]]
name = "streets_reader"
version = "0.1.0"
source = "git+https://github.com/a-b-street/osm2streets#575b5af7969875c13a40df680fbba38c81e97847"
source = "git+https://github.com/a-b-street/osm2streets#733b878f53db85ddcf3f39c4470ed5be475c5617"
dependencies = [
"abstutil",
"anyhow",

19
convert_osm/src/extract.rs
View File

@ -24,25 +24,6 @@ pub fn extract_osm(
let mut doc =
streets_reader::osm_reader::read(&osm_xml, &map.streets.gps_bounds, timer).unwrap();
// TODO Hacks to override OSM data. There's no problem upstream, but we want to accomplish
// various things for A/B Street.
for id in [380902156, 380902155, 568612970] {
if let Some(way) = doc.ways.get_mut(&WayID(id)) {
// https://www.openstreetmap.org/way/380902156 and friends look like a separate
// cycleway smushed into the Lake Washington / Madison junction
way.tags.remove("bicycle");
}
}
if let Some(way) = doc.ways.get_mut(&WayID(332355467)) {
way.tags.insert("junction", "intersection");
}
if let Some(way) = doc.ways.get_mut(&WayID(332060260)) {
way.tags.insert("sidewalk", "right");
}
if let Some(way) = doc.ways.get_mut(&WayID(332060236)) {
way.tags.insert("sidewalk", "right");
}
if clip_path.is_none() {
// Use the boundary from .osm.
map.streets.gps_bounds = doc.gps_bounds.clone();