From 1ec24703ca250e7d112e0e1aa8b4457dbbe29d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ko=C4=87?= Date: Wed, 2 Aug 2017 00:58:51 +0200 Subject: [PATCH] Rendering farmland earlier on midzoom --- landcover.mss | 2 +- project.mml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/landcover.mss b/landcover.mss index 379425d41f..5a16627801 100644 --- a/landcover.mss +++ b/landcover.mss @@ -313,7 +313,7 @@ [feature = 'landuse_farmland'], [feature = 'landuse_greenhouse_horticulture'] { - [zoom >= 10] { + [zoom >= 8] { polygon-fill: @farmland; [zoom >= 16] { line-width: .5; diff --git a/project.mml b/project.mml index ad3305274b..6881b50c15 100644 --- a/project.mml +++ b/project.mml @@ -101,12 +101,12 @@ Layer: COALESCE(wetland, landuse, "natural") AS feature FROM (SELECT way, COALESCE(name, '') AS name, religion, - ('landuse_' || (CASE WHEN landuse IN ('forest', 'military') THEN landuse ELSE NULL END)) AS landuse, + ('landuse_' || (CASE WHEN landuse IN ('forest', 'military', 'farmland') 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') + WHERE (landuse IN ('forest', 'military', 'farmland') 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 @@ -1966,7 +1966,7 @@ Layer: way, way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels, COALESCE( - 'landuse_' || CASE WHEN landuse IN ('forest', 'military') THEN landuse ELSE NULL END, + 'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock') THEN "natural" ELSE NULL END, 'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL END, 'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END, @@ -1975,7 +1975,7 @@ Layer: name, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building -- always no with the where conditions FROM planet_osm_polygon - WHERE (landuse IN ('forest', 'military') + WHERE (landuse IN ('forest', 'military', 'farmland') OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock') OR "place" IN ('island') OR boundary IN ('national_park')