diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2020-05-03 20:06:33 +0200 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2020-05-03 20:21:08 +0200 |
| commit | 7b12d69ce0763c5deba46bba9d164135edaeba25 (patch) | |
| tree | 42bf51413984ebbce31fb681f6d670c073bb6f45 | |
| parent | 396d4274c946099795d7e61b32136254d749f63d (diff) | |
| download | navit-7b12d69ce0763c5deba46bba9d164135edaeba25.tar.gz | |
add:map:deal with sports_track being poly or not
OSM is unsure on leisure=track. It's either line style
or area. the latter only if area=yes is given, or it's a multipolygon.
This commit fixes that problem.
| -rw-r--r-- | navit/item_def.h | 1 | ||||
| -rw-r--r-- | navit/maptool/osm.c | 5 | ||||
| -rw-r--r-- | navit/navit_layout_car_shipped.xml | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/navit/item_def.h b/navit/item_def.h index 718c1ef40..57bdb9a03 100644 --- a/navit/item_def.h +++ b/navit/item_def.h @@ -527,6 +527,7 @@ ITEM(forest_way_4) ITEM(former_itinerary) ITEM(former_itinerary_part) ITEM(cliff) +ITEM(sports_track) /* Area */ ITEM2(0xc0000000,area) ITEM2(0xc0000001,area_unspecified) diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c index 76b79feae..659c68706 100644 --- a/navit/maptool/osm.c +++ b/navit/maptool/osm.c @@ -722,7 +722,10 @@ static char *attrmap= { "w leisure=playground poly_playground\n" "w leisure=sports_centre poly_sport\n" "w leisure=stadium poly_sports_stadium\n" - "w leisure=track poly_sports_track\n" + "w leisure=track,area=1 poly_sports_track\n" + "w leisure=track,area=0 sports_track\n" + "w leisure=track,type=multipolygon poly_sports_track\n" + "w leisure=track sports_track\n" "w leisure=water_park poly_water_park\n" "w military=airfield poly_airfield\n" "w military=barracks poly_barracks\n" diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml index ad9fff5f2..e7c784ba4 100644 --- a/navit/navit_layout_car_shipped.xml +++ b/navit/navit_layout_car_shipped.xml @@ -447,6 +447,10 @@ <polygon color="#b6554e"/> <text text_size="5"/> </itemgra> + <itemgra item_types="sports_track" order="10-"> + <polyline color="#b6554e"/> + <text text_size="5"/> + </itemgra> <itemgra item_types="poly_garages" order="10-"> <polygon color="#deddcc"/> <text text_size="5"/> |