astro/heliwatch
astro/heliwatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

location: fix relation polygons

Browse Source
This commit is contained in:
Astro 2021-10-28 17:43:12 +02:00
parent 7da29c1070
commit 0bd99acd00
2 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fetch_locations.sh → fetch_data.sh
View File

@ -10,4 +10,4 @@ for level in 7 8 9 10 11 ; do
Q=$Q'way["admin_level"="'$level'"]('$bbox'); relation["admin_level"="'$level'"]('$bbox');' Q=$Q'way["admin_level"="'$level'"]('$bbox'); relation["admin_level"="'$level'"]('$bbox');'
done done
echo overpass "($Q); out body; >; out skel;" \> locations.json overpass "($Q); out body; >; out skel;" > locations.json

103
src/location.rs
View File

@ -9,24 +9,22 @@ type Polygon = geo::Polygon<f64>;
struct Location { struct Location {
name: Arc<String>, name: Arc<String>,
polys: Vec<Arc<Polygon>>, poly: Arc<Polygon>,
area: f64, area: f64,
} }
impl Location { impl Location {
pub fn new(name: &str, polys: Vec<Arc<Polygon>>) -> Self { pub fn new(name: &str, poly: Arc<Polygon>) -> Self {
let area = polys.iter() let area = poly.unsigned_area();
.map(|poly| poly.unsigned_area())
.sum();
Location { Location {
name: Arc::new(name.to_owned()), name: Arc::new(name.to_owned()),
polys, poly,
area, area,
} }
} }
pub fn contains(&self, coord: &geo::Coordinate<f64>) -> bool { pub fn contains(&self, coord: &geo::Coordinate<f64>) -> bool {
self.polys.iter().any(|poly| poly.contains(coord)) self.poly.contains(coord)
} }
} }
@ -39,6 +37,7 @@ impl Locations {
println!("Loading {}...", file); println!("Loading {}...", file);
let json: serde_json::Value = serde_json::from_reader(File::open(file).unwrap()) let json: serde_json::Value = serde_json::from_reader(File::open(file).unwrap())
.unwrap(); .unwrap();
println!("parsed JSON");
let obj = json.as_object().expect("json obj"); let obj = json.as_object().expect("json obj");
let els = obj.get("elements").and_then(|v| v.as_array()).expect("els"); let els = obj.get("elements").and_then(|v| v.as_array()).expect("els");
println!("{} elements", els.len()); println!("{} elements", els.len());
@ -72,22 +71,20 @@ impl Locations {
let id = el.get("id").and_then(|v| v.as_u64()).expect("id"); let id = el.get("id").and_then(|v| v.as_u64()).expect("id");
let way_nodes = el.get("nodes").and_then(|v| v.as_array()).expect("nodes") let way_nodes = el.get("nodes").and_then(|v| v.as_array()).expect("nodes")
.iter() .iter()
.map(|way_node| { .map(|way_node| way_node.as_u64().expect("way_node"))
let way_node = way_node.as_u64()
.expect("way_node");
nodes.get(&way_node).expect("way_node node")
})
.cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let poly = Arc::new(Polygon::new( ways.insert(id, way_nodes.clone());
geo::LineString(way_nodes),
vec![]
));
ways.insert(id, poly.clone());
if let Some(tags) = el.get("tags").and_then(|v| v.as_object()) { if let Some(tags) = el.get("tags").and_then(|v| v.as_object()) {
if let Some(name) = tags.get("name").and_then(|v| v.as_str()) { if let Some(name) = tags.get("name").and_then(|v| v.as_str()) {
locations.push(Location::new(name, vec![poly])); let poly = Arc::new(Polygon::new(
geo::LineString(way_nodes.iter()
.map(|node| nodes.get(node).expect("node"))
.cloned()
.collect()),
vec![]
));
locations.push(Location::new(name, poly));
} }
} }
} }
@ -101,23 +98,61 @@ impl Locations {
match el.get("type").and_then(|v| v.as_str()) { match el.get("type").and_then(|v| v.as_str()) {
Some("relation") => { Some("relation") => {
let polys = el.get("members").and_then(|v| v.as_array()).expect("members") if let Some(name) = el.get("tags")
.iter() .and_then(|v| v.as_object())
.filter_map(|member| { .and_then(|tags| tags.get("name"))
let member = member.as_object().unwrap(); .and_then(|v| v.as_str())
let member_type = member.get("type").and_then(|v| v.as_str()).unwrap(); {
if member_type == "way" { let mut outers = el.get("members").and_then(|v| v.as_array()).expect("members")
let member_ref = member.get("ref").and_then(|v| v.as_u64()).unwrap(); .iter()
let way = ways.get(&member_ref).expect("member way"); .filter_map(|member| {
Some(way.clone()) let member = member.as_object().unwrap();
let member_type = member.get("type").and_then(|v| v.as_str()).unwrap();
let member_role = member.get("role").and_then(|v| v.as_str()).unwrap();
if member_type == "way" && member_role == "outer" {
let member_ref = member.get("ref").and_then(|v| v.as_u64()).unwrap();
let way = ways.get(&member_ref).expect("member way");
Some(way.clone())
} else {
None
}
})
.collect::<Vec<_>>();
let mut rel_nodes = vec![];
while outers.len() > 0 {
if rel_nodes.len() == 0 {
rel_nodes = outers.pop().unwrap();
} else if let Some(next) = outers.iter().position(|outer| outer[0] == rel_nodes[rel_nodes.len() - 1]) {
rel_nodes.append(&mut outers.remove(next));
} else if let Some(next) = outers.iter().position(|outer| outer[outer.len() - 1] == rel_nodes[0]) {
let mut new = outers.remove(next);
new.append(&mut rel_nodes);
rel_nodes = new;
} else if let Some(next) = outers.iter().position(|outer| outer[outer.len() - 1] == rel_nodes[rel_nodes.len() - 1]) {
let mut new = outers.remove(next);
new.reverse();
rel_nodes.append(&mut new);
} else { } else {
None println!("inconclusive polygon for relation {}", el.get("id").unwrap().as_u64().unwrap());
println!("rel_nodes: {:?}", rel_nodes);
println!("remain: {:?}", outers);
rel_nodes = vec![];
break;
} }
})
.collect::<Vec<_>>(); if rel_nodes[0] == rel_nodes[rel_nodes.len() - 1] {
if let Some(tags) = el.get("tags").and_then(|v| v.as_object()) { let poly = Arc::new(Polygon::new(
if let Some(name) = tags.get("name").and_then(|v| v.as_str()) { geo::LineString(rel_nodes.drain(..)
locations.push(Location::new(name, polys)); .map(|node| nodes.get(&node).expect("node"))
.cloned()
.collect()),
vec![]
));
locations.push(Location::new(name, poly));
}
}
if rel_nodes.len() > 0 {
println!("unclosed polygon for relation {}", el.get("id").unwrap().as_u64().unwrap());
} }
} }
} }