From 1d4a5518329bee9a73bb7cfeb5bb0f457521a5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ko=C4=87?= Date: Thu, 18 Oct 2018 07:11:27 +0200 Subject: [PATCH] Adding vineyard and orchard to the low zoom --- landcover.mss | 4 ++-- project.mml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/landcover.mss b/landcover.mss index aa0268c5d1..7a19984522 100644 --- a/landcover.mss +++ b/landcover.mss @@ -134,7 +134,7 @@ } [feature = 'landuse_vineyard'] { - [zoom >= 10] { + [zoom >= 5] { polygon-fill: @orchard; [way_pixels >= 4] { polygon-gamma: 0.75; } [way_pixels >= 64] { polygon-gamma: 0.3; } @@ -148,7 +148,7 @@ } [feature = 'landuse_orchard'] { - [zoom >= 10] { + [zoom >= 5] { polygon-fill: @orchard; [way_pixels >= 4] { polygon-gamma: 0.75; } [way_pixels >= 64] { polygon-gamma: 0.3; } diff --git a/project.mml b/project.mml index 26af103009..a0b3af92ac 100644 --- a/project.mml +++ b/project.mml @@ -90,12 +90,13 @@ Layer: COALESCE(wetland, landuse, "natural") AS feature FROM (SELECT way, COALESCE(name, '') AS name, religion, - ('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow') THEN landuse ELSE NULL END)) AS landuse, + ('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial', + 'meadow', 'vineyard', 'orchard') THEN landuse ELSE NULL END)) AS landuse, ('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland') 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', 'residential', 'commercial', 'retail', 'industrial', 'meadow') + WHERE (landuse IN ('forest', 'military', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow', 'vineyard', 'orchard') OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland')) AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real AND building IS NULL