Skip to content

Commit a40828e

Browse files
jeisenbeimagico
authored andcommitted
Add retail color fill for shop=mall areas (gravitystorm#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
1 parent 952d13d commit a40828e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

amenity-points.mss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,7 @@
23692369
[feature = 'landuse_farmyard'],
23702370
[feature = 'landuse_farmland'],
23712371
[feature = 'landuse_greenhouse_horticulture'],
2372-
[feature = 'shop'][shop = 'mall'],
2372+
[feature = 'shop'][shop = 'mall'][location != 'underground'],
23732373
[feature = 'landuse_retail'],
23742374
[feature = 'landuse_industrial'],
23752375
[feature = 'landuse_railway'],

landcover.mss

+1
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@
355355
}
356356

357357
[feature = 'landuse_retail'],
358+
[feature = 'shop_mall'],
358359
[feature = 'amenity_marketplace'] {
359360
[zoom >= 8] {
360361
polygon-fill: @built-up-lowzoom;

project.mml

+3-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Layer:
9191
table: |-
9292
(SELECT
9393
way, name, religion, way_pixels, is_building,
94-
COALESCE(aeroway, amenity, wetland, power, landuse, leisure, man_made, "natural", tourism, highway, railway) AS feature
94+
COALESCE(aeroway, amenity, wetland, power, landuse, leisure, man_made, "natural", shop, tourism, highway, railway) AS feature
9595
FROM (SELECT
9696
way, COALESCE(name, '') AS name,
9797
('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
@@ -104,6 +104,7 @@ Layer:
104104
'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
105105
'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial',
106106
'brownfield', 'landfill', 'construction', 'plant_nursery', 'religious') THEN landuse ELSE NULL END)) AS landuse,
107+
('shop_' || (CASE WHEN shop IN ('mall') AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL) THEN shop ELSE NULL END)) AS shop,
107108
('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'garden',
108109
'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink',
109110
'track', 'dog_park', 'fitness_station') THEN leisure ELSE NULL END)) AS leisure,
@@ -128,6 +129,7 @@ Layer:
128129
OR man_made IN ('works', 'wastewater_plant','water_works')
129130
OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
130131
OR power IN ('station', 'sub_station', 'substation', 'generator')
132+
OR shop IN ('mall')
131133
OR tourism IN ('camp_site', 'caravan_site', 'picnic_site')
132134
OR highway IN ('services', 'rest_area')
133135
OR railway = 'station')

0 commit comments

Comments
 (0)