diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2020-06-15 11:57:57 +0200 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2020-06-15 11:57:57 +0200 |
| commit | ca6ea4ba6e46f1112dc4ff98eee0d1908bfe5ceb (patch) | |
| tree | 07c37dfc00392780f743bea99ddc778f4c676af0 | |
| parent | b6e75bdac1ef6912a80776cbec3e367ec17a1b4d (diff) | |
| download | navit-ca6ea4ba6e46f1112dc4ff98eee0d1908bfe5ceb.tar.gz | |
fix:maptool:better map aerodroms and military areas
This commit uses more complex rule set to map aerodromes and military
landuses depending on tag combination avoiding duplication of the area
in binfile.
For example military airports are quite often tagged:
landuse=military
military=airfield
aeroway=aerodrome
which caused the airport to be tripled in map. This is now resolved.
| -rw-r--r-- | navit/maptool/osm.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index de3b51064..1f76adbec 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -581,6 +581,9 @@ static char *attrmap= { "w aerialway=chair_lift lift_chair\n" "w aerialway=drag_lift lift_drag\n" "w aeroway=aerodrome poly_airport\n" + /* airport wins over military landuse and specifier if given */ + "w aeroway=aerodrome,landuse=military poly_airfield\n" + "w aeroway=aerodrome,landuse=military,military=* poly_airfield\n" "w aeroway=apron poly_apron\n" "w aeroway=runway aeroway_runway\n" "w aeroway=taxiway aeroway_taxiway\n" @@ -692,7 +695,15 @@ static char *attrmap= { "w landuse=greenfield poly_greenfield\n" "w landuse=industrial poly_industry\n" "w landuse=landfill poly_landfill\n" + /* landuse=military plus military tag */ "w landuse=military poly_military\n" + "w landuse=military,military=* poly_military\n" + "w landuse=military,military=airfield poly_airfield\n" + "w landuse=military,military=barracks poly_barracks\n" + "w landuse=military,military=danger_area poly_danger_area\n" + "w landuse=military,military=naval_base poly_naval_base\n" + "w landuse=military,military=range poly_range\n" + "w landuse=military,military=training_area poly_military_zone\n" "w landuse=meadow poly_meadow\n" "w landuse=plaza poly_plaza\n" "w landuse=quarry poly_quarry\n" @@ -729,11 +740,13 @@ static char *attrmap= { "w leisure=track sports_track\n" "w leisure=water_park poly_water_park\n" "w leisure=swimming_pool poly_swimming_pool\n" + /* military tag without further info */ "w military=airfield poly_airfield\n" "w military=barracks poly_barracks\n" "w military=danger_area poly_danger_area\n" "w military=naval_base poly_naval_base\n" "w military=range poly_range\n" + "w military=training_area poly_military_zone\n" "w natural=beach poly_beach\n" "w natural=coastline water_line\n" "w natural=fell poly_fell\n" |