From bb6c8ec5691a02b7cda76179e96df56c416061ee Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Mon, 15 Apr 2019 12:53:19 +0900
Subject: [PATCH 1/2] Change leisure=water_park rendering to match
 tourism=theme_park

---
 amenity-points.mss | 4 ++--
 landcover.mss      | 7 +++----
 project.mml        | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/amenity-points.mss b/amenity-points.mss
index 62b5dfe14b..4900f23647 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1336,7 +1336,6 @@
     marker-fill: @office;
   }
 
-  [feature = 'leisure_water_park'][zoom >= 17],
   [feature = 'leisure_sports_centre'][sport = 'swimming'][zoom >= 17],
   [feature = 'leisure_swimming_area'][zoom >= 17] {
     marker-file: url('symbols/leisure/water_park.svg');
@@ -2163,7 +2162,6 @@
     text-dy: 13;
   }
 
-  [feature = 'leisure_water_park'],
   [feature = 'leisure_sports_centre'][sport = 'swimming'],
   [feature = 'leisure_swimming_area'] {
     [way_area >= 150000][zoom >= 14],
@@ -2362,6 +2360,7 @@
   [feature = 'landuse_construction'],
   [feature = 'tourism_theme_park'],
   [feature = 'tourism_zoo'],
+  [feature = 'leisure_water_park'],
   [feature = 'amenity_kindergarten'],
   [feature = 'amenity_school'],
   [feature = 'amenity_college'],
@@ -2471,6 +2470,7 @@
         text-dy: 15;
       }
       [feature = 'tourism_theme_park'],
+      [feature = 'leisure_water_park'],
       [feature = 'tourism_zoo'] {
         text-fill: @tourism;
         text-face-name: @bold-fonts; /*rendered bold to improve visibility since theme parks tend to have crowded backgrounds*/
diff --git a/landcover.mss b/landcover.mss
index f87140b9a8..ebb60c2a00 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -861,11 +861,10 @@
   }
 }
 
+/* tourism_zoo tourism_theme_park & leisure_water_park */
 #tourism-boundary {
-  [tourism = 'zoo'][zoom >= 10][way_pixels >= 750],
-  [tourism = 'zoo'][zoom >= 17],
-  [tourism = 'theme_park'][zoom >= 10][way_pixels >= 750],
-  [tourism = 'theme_park'][zoom >= 17] {
+  [zoom >= 10][way_pixels >= 750],
+  [zoom >= 17] {
     a/line-width: 1;
     a/line-offset: -0.5;
     a/line-color: @tourism;
diff --git a/project.mml b/project.mml
index ab1f7c2497..49e9e1e1a4 100644
--- a/project.mml
+++ b/project.mml
@@ -571,10 +571,11 @@ Layer:
             way,
             way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
             name,
+            leisure,
             tourism
           FROM planet_osm_polygon
-          WHERE tourism = 'theme_park'
-            OR tourism = 'zoo'
+          WHERE tourism IN ('theme_park', 'zoo')
+            OR leisure = 'water_park'
         ) AS tourism_boundary
     properties:
       minzoom: 10

From ea63d351fa5607c94fe2c8566d2d3be062af0c28 Mon Sep 17 00:00:00 2001
From: jeisenbe <joseph.eisenberg@gmail.com>
Date: Mon, 15 Apr 2019 23:17:17 +0900
Subject: [PATCH 2/2] Rename leisure/water_park.svg to leisure/swiming_area.svg

---
 amenity-points.mss                                    | 2 +-
 symbols/leisure/{water_park.svg => swimming_area.svg} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename symbols/leisure/{water_park.svg => swimming_area.svg} (100%)

diff --git a/amenity-points.mss b/amenity-points.mss
index 4900f23647..a63797a2a9 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1338,7 +1338,7 @@
 
   [feature = 'leisure_sports_centre'][sport = 'swimming'][zoom >= 17],
   [feature = 'leisure_swimming_area'][zoom >= 17] {
-    marker-file: url('symbols/leisure/water_park.svg');
+    marker-file: url('symbols/leisure/swimming_area.svg');
     marker-placement: interior;
     marker-fill: @leisure-green;
     marker-clip: false;
diff --git a/symbols/leisure/water_park.svg b/symbols/leisure/swimming_area.svg
similarity index 100%
rename from symbols/leisure/water_park.svg
rename to symbols/leisure/swimming_area.svg