Replace VMAP0-data by OSM-data

Currently, we use VMAP0-data instead of OSM-data to indicate built-up areas on zoom levels 8 and 9. This PR replaces the VMAP0-data with the OSM landcover data. Resolves #256.
gravitystorm · Dec 6, 2017 · e280ffe · e280ffe
1 parent a75953a
commit e280ffe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/landcover.mss b/landcover.mss
@@ -216,7 +216,7 @@
     line-opacity: 0.329;
   }
 
-  [feature = 'landuse_residential'][zoom >= 10] {
+  [feature = 'landuse_residential'][zoom >= 8] {
     polygon-fill: @built-up-lower-lowzoom;
     [zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
     [zoom >= 13] { polygon-fill: @residential; }
@@ -345,7 +345,7 @@
 
   [feature = 'landuse_retail'],
   [feature = 'amenity_marketplace'] {
-    [zoom >= 10] {
+    [zoom >= 8] {
       polygon-fill: @built-up-lower-lowzoom;
       [zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
       [zoom >= 13] { polygon-fill: @retail; }
@@ -361,7 +361,7 @@
     }
   }
 
-  [feature = 'landuse_industrial'][zoom >= 10] {
+  [feature = 'landuse_industrial'][zoom >= 8] {
     polygon-fill: @built-up-lower-lowzoom;
     [zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
     [zoom >= 13] { polygon-fill: @industrial; }
@@ -413,7 +413,7 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'landuse_commercial'][zoom >= 10] {
+  [feature = 'landuse_commercial'][zoom >= 8] {
     polygon-fill: @built-up-lower-lowzoom;
     [zoom >= 11] { polygon-fill: @built-up-upper-lowzoom; }
     [zoom >= 13] { polygon-fill: @commercial; }

diff --git a/project.mml b/project.mml
@@ -101,12 +101,13 @@ Layer:
             COALESCE(wetland, landuse, "natural") AS feature
           FROM (SELECT
               way, COALESCE(name, '') AS name, religion,
-              ('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END)) AS landuse,
+              ('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial') THEN landuse ELSE NULL END)) AS landuse,
               ('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'scree', 'shingle', 'bare_rock') THEN "natural" ELSE NULL END)) AS "natural",
               ('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN (CASE WHEN "natural" IN ('mud') THEN "natural" ELSE tags->'wetland' END) ELSE NULL END)) AS wetland,
+
               way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
             FROM planet_osm_polygon
-            WHERE (landuse IN ('forest', 'military', 'farmland')
+            WHERE (landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial')
               OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock'))
               AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
               AND building IS NULL

diff --git a/scripts/get-shapefiles.py b/scripts/get-shapefiles.py
@@ -41,7 +41,6 @@
         'type': 'tgz',
         'shp_basename': [
             'world_bnd_m',
-            'builtup_area',
             'places',
             'world_boundaries_m'],
         'long_opt': '--world-boundaries'

diff --git a/shapefiles.mss b/shapefiles.mss
@@ -45,9 +45,3 @@
     }
   }
 }
-
-#builtup {
-  [zoom >= 8][zoom < 10] {
-    polygon-fill: #ddd;
-  }
-}