From a40828e3956b45c743a2208500f92f31cdfc97ac Mon Sep 17 00:00:00 2001
From: jeisenbe <42757252+jeisenbe@users.noreply.github.com>
Date: Thu, 22 Aug 2019 20:06:41 +0900
Subject: [PATCH] Add retail color fill for shop=mall areas (#3790)

* Add retail color fill for shop=mall areas

Do not rendering shop=mall fill when underground=yes

* Do not render name text label for underground malls
---
 amenity-points.mss | 2 +-
 landcover.mss      | 1 +
 project.mml        | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/amenity-points.mss b/amenity-points.mss
index b074347f50..b10aee55d0 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -2369,7 +2369,7 @@
   [feature = 'landuse_farmyard'],
   [feature = 'landuse_farmland'],
   [feature = 'landuse_greenhouse_horticulture'],
-  [feature = 'shop'][shop = 'mall'],
+  [feature = 'shop'][shop = 'mall'][location != 'underground'],
   [feature = 'landuse_retail'],
   [feature = 'landuse_industrial'],
   [feature = 'landuse_railway'],
diff --git a/landcover.mss b/landcover.mss
index f3d4251704..cf4bc68e92 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -355,6 +355,7 @@
   }
 
   [feature = 'landuse_retail'],
+  [feature = 'shop_mall'],
   [feature = 'amenity_marketplace'] {
     [zoom >= 8] {
       polygon-fill: @built-up-lowzoom;
diff --git a/project.mml b/project.mml
index 8fc5183b2f..4c935c2ed6 100644
--- a/project.mml
+++ b/project.mml
@@ -91,7 +91,7 @@ Layer:
       table: |-
         (SELECT
             way, name, religion, way_pixels, is_building,
-            COALESCE(aeroway, amenity, wetland, power, landuse, leisure, man_made, "natural", tourism, highway, railway) AS feature
+            COALESCE(aeroway, amenity, wetland, power, landuse, leisure, man_made, "natural", shop, tourism, highway, railway) AS feature
           FROM (SELECT
               way, COALESCE(name, '') AS name,
               ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
@@ -104,6 +104,7 @@ Layer:
                                                     'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
                                                     'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial',
                                                     'brownfield', 'landfill', 'construction', 'plant_nursery', 'religious') THEN landuse ELSE NULL END)) AS landuse,
+              ('shop_' || (CASE WHEN shop IN ('mall') AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL) THEN shop ELSE NULL END)) AS shop,
               ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'garden',
                                                     'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink',
                                                     'track', 'dog_park', 'fitness_station') THEN leisure ELSE NULL END)) AS leisure,
@@ -128,6 +129,7 @@ Layer:
               OR man_made IN ('works', 'wastewater_plant','water_works')
               OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
               OR power IN ('station', 'sub_station', 'substation', 'generator')
+              OR shop IN ('mall')
               OR tourism IN ('camp_site', 'caravan_site', 'picnic_site')
               OR highway IN ('services', 'rest_area')
               OR railway = 'station')