From 6cf08b8c16be0ffaab0ed8f7c0a9ba09542cc4b2 Mon Sep 17 00:00:00 2001
From: Stefan Wildemann <metalstrolch@users.noreply.github.com>
Date: Fri, 29 May 2020 00:17:09 +0200
Subject: add:maptool:enhance leisure=track handling and add
 poi_archeaological_site (#1005)

* add:map:add poi_archeaological_site.

historic=archeaological_site is quite often used on nodes only. Add
poi to show them.

* 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.

* fix:layout:add line width for sports_track
---
 navit/icons/archaeological_site.svg | 14 ++++++++++++++
 navit/item_def.h                    |  2 ++
 navit/maptool/osm.c                 |  6 +++++-
 navit/navit_layout_car_shipped.xml  |  9 ++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 navit/icons/archaeological_site.svg

diff --git a/navit/icons/archaeological_site.svg b/navit/icons/archaeological_site.svg
new file mode 100644
index 000000000..19fc27283
--- /dev/null
+++ b/navit/icons/archaeological_site.svg
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 3,0 3,1 4,1 C 4.5988688,1 4.8411383,2.0430706 4.9375,2.90625 3.9652283,2.1499026 3.0249855,1.8795933 2.21875,2.03125 1.1884439,2.2250555 0.5,3.1743045 0.5,4.25 c 0,0.8419164 0.31211643,1.5788561 0.84375,2.34375 0.464621,0.6684787 1.1198438,1.4400576 1.9375,2.375 C 3.6476993,10.327756 4.3223039,11.572304 5,12.25 L 5,13 4,13.5 4,14 10,14 10,13.5 9,13 9,12.25 c 0.6776961,-0.677696 1.352301,-1.922244 1.71875,-3.28125 0.817656,-0.9349424 1.472879,-1.7065213 1.9375,-2.375 C 13.187884,5.8288561 13.5,5.0919164 13.5,4.25 13.5,3.1743045 12.811556,2.2250555 11.78125,2.03125 10.975015,1.8795933 10.034772,2.1499026 9.0625,2.90625 9.1588617,2.0430706 9.4011312,1 10,1 L 11,1 11,0 3,0 z M 2.375,3.03125 c 0.5098367,-0.095903 1.3604039,0.1012462 2.34375,1 C 3.603741,4.1696287 3,5.1495633 3,7 3,7.0311958 2.9995172,7.0624382 3,7.09375 2.6594765,6.6981019 2.3761871,6.3476871 2.15625,6.03125 1.6878836,5.3573824 1.5,4.8627724 1.5,4.25 1.5,3.5496757 1.8109254,3.1373551 2.375,3.03125 z m 8.75,0 c 0.188111,-0.027114 0.358981,-0.026526 0.5,0 C 12.189075,3.1373551 12.5,3.5496757 12.5,4.25 12.5,4.8627724 12.312116,5.3573824 11.84375,6.03125 11.623813,6.3476871 11.340524,6.6981019 11,7.09375 11.000483,7.0624382 11,7.0311958 11,7 11,5.1495633 10.396259,4.1696287 9.28125,4.03125 c 0.7113567,-0.6501623 1.351767,-0.9290858 1.84375,-1 z" id="archaeological-site" style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/navit/item_def.h b/navit/item_def.h
index d5627bf5c..57bdb9a03 100644
--- a/navit/item_def.h
+++ b/navit/item_def.h
@@ -366,6 +366,7 @@ ITEM(nav_exit_right)
 ITEM(nav_keep_left)
 ITEM(nav_keep_right)
 ITEM(poi_cave)
+ITEM(poi_archaeological_site)
 ITEM2(0x7fffffe0,poi_customg)
 ITEM(poi_customh)
 ITEM(poi_customi)
@@ -526,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 ceff3d0b3..659c68706 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -491,6 +491,7 @@ static char *attrmap= {
     "?	historic=memorial	poi_memorial\n"
     "?	historic=monument	poi_monument\n"
     "?	historic=ruins		poi_ruins\n"
+    "n	historic=archaeological_site	poi_archaeological_site\n"
 //	"?	historic=*		poi_ruins\n"
     "?	landuse=cemetery	poi_cemetery\n"
     "?	leisure=fishing		poi_fish\n"
@@ -721,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 fafc909e3..028714af8 100644
--- a/navit/navit_layout_car_shipped.xml
+++ b/navit/navit_layout_car_shipped.xml
@@ -448,6 +448,10 @@
 			<polygon color="#b6554e"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="sports_track" order="10-">
+			<polyline color="#b6554e" width="1"/>
+			<text text_size="5"/>
+		</itemgra>
 		<itemgra item_types="poly_garages" order="10-">
 			<polygon color="#deddcc"/>
 			<text text_size="5"/>
@@ -2035,6 +2039,9 @@
 		<itemgra item_types="poi_monument" order="12-">
 			<icon src="memorial.png"/>
 		</itemgra>
+		<itemgra item_types="poi_archaeological_site" order="12-">
+			<icon src="archaeological_site.png"/>
+		</itemgra>
 		<itemgra item_types="poi_shelter" order="11-">
 			<icon src="shelter.png"/>
 		</itemgra>
@@ -2064,7 +2071,7 @@
 		</itemgra>
 	</layer>
 	<layer name="POI Labels">
-		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_cave,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_bicycle,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+		<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_cave,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_bicycle,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_archaeological_site,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
 			<circle color="#606060" radius="0" width="0" text_size="10"/>
 		</itemgra>
 		<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
-- 
cgit v1.2.1