Add poly_swimming_pool

This allows to differ between poly_sports and poly_swimming_pool in
order to color swimming pools blue on map. Looks better.

7 files changed, 24 insertions, 3 deletions

diff --git a/navit/item_def.h b/navit/item_def.h
index 57bdb9a03..b82d1907d 100644
--- a/navit/item_def.h
+++ b/navit/item_def.h
@@ -640,4 +640,5 @@ ITEM(poly_plantnursery)
 ITEM(poly_port)
 ITEM(poly_saltpond)
 ITEM(poly_dam)
+ITEM(poly_swimming_pool)
 ITEM2(0xffffffff,last)
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 659c68706..c5206942b 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -727,6 +727,7 @@ static char *attrmap= {
     "w	leisure=track,type=multipolygon		poly_sports_track\n"
     "w	leisure=track		sports_track\n"
     "w	leisure=water_park	poly_water_park\n"
+    "w	leisure=swimming_pool	poly_swimming_pool\n"
     "w	military=airfield	poly_airfield\n"
     "w	military=barracks	poly_barracks\n"
     "w	military=danger_area	poly_danger_area\n"
diff --git a/navit/navit_layout_bike_shipped.xml b/navit/navit_layout_bike_shipped.xml
index ae30093dd..ee6f4a850 100644
--- a/navit/navit_layout_bike_shipped.xml
+++ b/navit/navit_layout_bike_shipped.xml
@@ -35,11 +35,15 @@
 			<polygon color="#7cc334"/>
 			<text text_size="5"/>
 		</itemgra>
-		<itemgra item_types="poly_water" order="0-">
+		<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
 			<polygon color="#82c8ea"/>
 			<polyline color="#5096b8"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_swimming_pool" order="10-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+		</itemgra>
 		<itemgra item_types="poly_land" order="0-">
 			<polygon color="#ffefb7"/>
 			<polyline color="#ffefb7"/>
diff --git a/navit/navit_layout_car_android_shipped.xml b/navit/navit_layout_car_android_shipped.xml
index 256ab3db2..706c79b60 100644
--- a/navit/navit_layout_car_android_shipped.xml
+++ b/navit/navit_layout_car_android_shipped.xml
@@ -57,11 +57,15 @@
 		<itemgra item_types="poly_water_tiled">
 			<polygon color="#82c8ea"/>
 		</itemgra>
-		<itemgra item_types="poly_water" order="10-">
+		<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="10-">
 			<polygon color="#82c8ea"/>
 			<polyline color="#5096b8"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_swimming_pool" order="10-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+		</itemgra>
 		<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="14-">
 			<polygon color="#a0a0a0"/>
 			<text text_size="5"/>
diff --git a/navit/navit_layout_car_dark_shipped.xml b/navit/navit_layout_car_dark_shipped.xml
index 6113d85cb..49f0e6517 100644
--- a/navit/navit_layout_car_dark_shipped.xml
+++ b/navit/navit_layout_car_dark_shipped.xml
@@ -378,6 +378,9 @@
 			<polygon color="#010321"/>
 			<text color="#55c4bd" background_color="#000000" text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_swimming_pool" order="10-">
+			<polygon color="#010321"/>
+		</itemgra>
 		<itemgra item_types="water_line" order="0-">
 			<polyline color="#010321" width="1"/>
 			<text color="#55c4bd" background_color="#000000" text_size="5"/>
diff --git a/navit/navit_layout_car_shipped.xml b/navit/navit_layout_car_shipped.xml
index 028714af8..54ab22ac1 100644
--- a/navit/navit_layout_car_shipped.xml
+++ b/navit/navit_layout_car_shipped.xml
@@ -376,6 +376,10 @@
 			<polyline color="#5096b8"/>
 			<text text_size="5"/>
 		</itemgra>
+		<itemgra item_types="poly_swimming_pool" order="10-">
+			<polygon color="#82c8ea"/>
+			<polyline color="#5096b8"/>
+		</itemgra>
 		<itemgra item_types="water_line" order="0-">
 			<polyline color="#5096b8" width="1"/>
 			<text text_size="5"/>
diff --git a/navit/navit_layout_th_shipped.xml b/navit/navit_layout_th_shipped.xml
index bf4ad6731..dda59cc54 100644
--- a/navit/navit_layout_th_shipped.xml
+++ b/navit/navit_layout_th_shipped.xml
@@ -34,11 +34,15 @@
 			<polygon color="#f2f2f2"/>
 		</itemgra>
 		<!-- natural=water -->
-		<itemgra item_types="poly_water" order="0-">
+		<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
 			<polygon color="#b5d6f1"/>
 			<polyline color="#b5d6f1"/>
 			<text text_size="8"/>
 		</itemgra>
+		<itemgra item_types="poly_swimming_pool" order="10-">
+			<polygon color="#b5d6f1"/>
+			<polyline color="#b5d6f1"/>
+		</itemgra>
 		<itemgra item_types="poly_water_tiled" order="0-">
 			<polygon color="#b5d6f1"/>
 		</itemgra>