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

import railway=rail as light rail track. nothing should really use it, but it helps visually recognize areas with lots of notable railways. railways under construction not included yet, so some of the lines in krakow just sort of end.

Browse Source 
not regenerating maps yet
This commit is contained in:
Dustin Carlino 2020-07-22 11:35:04 -07:00
parent d2e8dc95d1
commit 404b6e589b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
convert_osm/src/osm_reader.rs
View File

@ -417,9 +417,11 @@ fn tags_to_map(raw_tags: &[osm_xml::Tag]) -> Tags {
}
fn is_road(tags: &mut Tags) -> bool {
if tags.is("railway", "light_rail") {
if tags.is_any("railway", vec!["light_rail", "rail"]) {
return true;
}
// TODO Because trams overlap with roads, they're harder:
// https://github.com/dabreegster/abstreet/issues/141
if tags.is("railway", "tram") {
return false;
}

2
map_model/src/make/initial/lane_specs.rs
View File

@ -18,7 +18,7 @@ pub fn get_lane_types(osm_tags: &BTreeMap<String, String>) -> (Vec<LaneType>, Ve
}
// Easy special cases first.
if tags.is("railway", "light_rail") {
if tags.is_any("railway", vec!["light_rail", "rail"]) {
return (vec![LaneType::LightRail], Vec::new());
}
if tags.is(osm::HIGHWAY, "footway") {

7
map_model/src/raw.rs
View File

@ -344,8 +344,13 @@ impl RawRoad {
self.osm_tags.get(osm::SYNTHETIC) == Some(&"true".to_string())
}
// TODO For the moment, treating all rail things as light rail
pub fn is_light_rail(&self) -> bool {
self.osm_tags.get("railway") == Some(&"light_rail".to_string())
if let Some(v) = self.osm_tags.get("railway") {
vec!["light_rail", "rail"].contains(&v.as_ref())
} else {
false
}
}
pub fn is_footway(&self) -> bool {