Merge pull request cyclosm#537 from cyclosm/render-malls

Render landuse=retail and shop=mall names
waterced · Mar 23, 2021 · 4fed093 · 4fed093
2 parents f7dd847 + 03fba8a
commit 4fed093
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 * Fix names not rendered in some alphabts. Fix #489.
+* Render `landuse=retail` and `shop=mall` names. Fix #526.
 * Fix missing POIs: swimming pools, `shop=doityourself` and schools. Fix #64.
 * Render train stations when tagged on buildings (polygons). Fix #527.
 

diff --git a/base.mss b/base.mss
@@ -35,7 +35,7 @@
 
  [type='landuse_retail'],
  [type='landuse_commercial'] {
- polygon-fill: @industrial;
+ polygon-fill: @commercial;
  }
 
  [type='leisure_garden'],

diff --git a/labels.mss b/labels.mss
@@ -74,6 +74,10 @@
  text-fill: @military * 0.6;
  text-face-name: @sans_italic;
  }
+ [type='retail'] {
+ text-fill: @shop-text;
+ text-face-name: @sans_italic;
+ }
 
  // text size adjustement regarding area size:
  [zoom=15][area>1600000],

diff --git a/palette.mss b/palette.mss
@@ -60,7 +60,7 @@
 @bicycle-leisure-track-fill: #bbaeb8;
 
 @residential: @land * 1.05;
-@commercial: @land * 0.97;
+@commercial: #ded8dd;
 @industrial: @land * 0.96;
 @parking: #EEE;
 

diff --git a/project.mml b/project.mml
@@ -2091,17 +2091,19 @@ Layer:
  COALESCE(
  landuse,
  leisure,
+ CASE WHEN shop IN ('mall') THEN 'retail' ELSE NULL END,
  boundary,
  "natural",
  amenity,
  CASE WHEN man_made IN ('works', 'wastewater_plant', 'water_works') THEN 'industrial' ELSE NULL END
  ) AS type,
  name,
  way_area AS area,
- way
+ ST_PointOnSurface(way) AS way
  FROM planet_osm_polygon
  WHERE name IS NOT NULL AND
- (landuse IN ('basin', 'cemetery', 'commercial', 'farmyard', 'forest', 'grass', 'industrial', 'military')
+ (landuse IN ('basin', 'cemetery', 'commercial', 'farmyard', 'forest', 'grass', 'industrial', 'military', 'retail')
+ OR shop IN ('mall')
  OR (leisure IS NOT NULL AND (leisure != 'sport_centre' OR sport != 'swimming'))
  OR "natural" IS NOT NULL
  OR amenity IN ('embassy', 'library', 'school', 'townhall', 'university')