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

best effort include multipolygons that have some pieces unused. gets a few more cases working.

Browse Source
This commit is contained in:
Dustin Carlino 2019-10-25 14:09:35 -07:00
parent e03e3393dd
commit 27ddb21bc9
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
convert_osm/src/osm_reader.rs
View File

@ -192,11 +192,7 @@ pub fn extract_osm(
} }
} }
if ok { if ok {
let polygons = glue_multipolygon(pts_per_way, &boundary); for polygon in glue_multipolygon(rel.id, pts_per_way, &boundary) {
if polygons.is_empty() {
println!("Relation {} failed to glue multipolygon", rel.id);
} else {
for polygon in polygons {
map.areas.push(RawArea { map.areas.push(RawArea {
area_type: at, area_type: at,
osm_id: rel.id, osm_id: rel.id,
@ -206,7 +202,6 @@ pub fn extract_osm(
} }
} }
} }
}
} else if tags.get("type") == Some(&"restriction".to_string()) { } else if tags.get("type") == Some(&"restriction".to_string()) {
let mut from_way_id: Option<i64> = None; let mut from_way_id: Option<i64> = None;
let mut via_node_id: Option<i64> = None; let mut via_node_id: Option<i64> = None;
@ -324,7 +319,11 @@ fn get_area_type(tags: &BTreeMap<String, String>) -> Option<AreaType> {
} }
// The result could be more than one disjoint polygon. // The result could be more than one disjoint polygon.
fn glue_multipolygon(mut pts_per_way: Vec<Vec<Pt2D>>, boundary: &Ring) -> Vec<Polygon> { fn glue_multipolygon(
rel_id: i64,
mut pts_per_way: Vec<Vec<Pt2D>>,
boundary: &Ring,
) -> Vec<Polygon> {
// First deal with all of the closed loops. // First deal with all of the closed loops.
let mut polygons: Vec<Polygon> = Vec::new(); let mut polygons: Vec<Polygon> = Vec::new();
pts_per_way.retain(|pts| { pts_per_way.retain(|pts| {
@ -356,8 +355,14 @@ fn glue_multipolygon(mut pts_per_way: Vec<Vec<Pt2D>>, boundary: &Ring) -> Vec<Po
result.extend(append); result.extend(append);
} else { } else {
if reversed { if reversed {
// Totally filter the thing out, since something clearly broke. // TODO Investigate what's going on here. At the very least, take what we have so
return Vec::new(); // far and try to glue it up.
println!(
"Throwing away {} chunks from relation {}",
rel_id,
pts_per_way.len()
);
break;
} else { } else {
reversed = true; reversed = true;
result.reverse(); result.reverse();