Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Showing natural areas on z5+ #3458

Merged
merged 7 commits into from
Nov 17, 2018
Merged

Showing natural areas on z5+ #3458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e14f7bb
Showing natural areas on z5+
kocio-pl Oct 17, 2018
65657a3
More wetland backgrounds
kocio-pl Oct 18, 2018
09f8e62
Revert way_area filtering
kocio-pl Oct 18, 2018
1d1ef85
Adding vineyard and orchard to the low zoom
kocio-pl Oct 18, 2018
ca3458c
Rendering scrub from z5
kocio-pl Oct 19, 2018
09cab87
fix military
kocio-pl Nov 17, 2018
86e4883
more fixing military
kocio-pl Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
::first {
[feature = 'wetland_mud'],
[feature = 'wetland_tidalflat'] {
[zoom >= 9] {
[zoom >= 5] {
polygon-fill: @mud;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand Down Expand Up @@ -142,7 +142,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; }
Expand All @@ -156,7 +156,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; }
Expand Down Expand Up @@ -306,7 +306,7 @@

[feature = 'landuse_forest'],
[feature = 'natural_wood'] {
[zoom >= 8] {
[zoom >= 5] {
polygon-fill: @forest;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand All @@ -328,7 +328,7 @@

[feature = 'landuse_farmland'],
[feature = 'landuse_greenhouse_horticulture'] {
[zoom >= 8] {
[zoom >= 5] {
polygon-fill: @farmland;
[zoom >= 16] {
line-width: .5;
Expand All @@ -339,8 +339,8 @@
}
}

[feature = 'natural_grassland'][zoom >= 8],
[feature = 'landuse_meadow'][zoom >= 8],
[feature = 'natural_grassland'][zoom >= 5],
[feature = 'landuse_meadow'][zoom >= 5],
[feature = 'landuse_grass'][zoom >= 10],
[feature = 'landuse_village_green'][zoom >= 10],
[feature = 'leisure_common'][zoom >= 10] {
Expand Down Expand Up @@ -482,7 +482,7 @@
}
}

[feature = 'natural_bare_rock'][zoom >= 8] {
[feature = 'natural_bare_rock'][zoom >= 5] {
polygon-fill: @bare_ground;
polygon-pattern-file: url('symbols/rock_overlay.png');
[way_pixels >= 4] {
Expand All @@ -497,7 +497,7 @@

[feature = 'natural_scree'],
[feature = 'natural_shingle'] {
[zoom >= 9] {
[zoom >= 5] {
polygon-fill: @bare_ground;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand All @@ -509,33 +509,33 @@
}
}

[feature = 'natural_sand'][zoom >= 8] {
[feature = 'natural_sand'][zoom >= 5] {
polygon-fill: @sand;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'natural_heath'][zoom >= 8] {
[feature = 'natural_heath'][zoom >= 5] {
polygon-fill: @heath;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'natural_scrub'][zoom >= 10] {
[feature = 'natural_scrub'][zoom >= 5] {
polygon-fill: @scrub;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'wetland_swamp'][zoom >= 8] {
[feature = 'wetland_swamp'][zoom >= 5] {
polygon-fill: @forest;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'wetland_bog'],
[feature = 'wetland_string_bog'] {
[zoom >= 10] {
[zoom >= 5] {
polygon-fill: @heath;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand All @@ -545,7 +545,7 @@
[feature = 'wetland_wet_meadow'],
[feature = 'wetland_fen'],
[feature = 'wetland_marsh'] {
[zoom >= 10] {
[zoom >= 5] {
polygon-fill: @grass;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand Down Expand Up @@ -700,11 +700,11 @@
}

#landcover-area-symbols {
[natural = 'sand'][zoom >= 8] {
[natural = 'sand'][zoom >= 5] {
polygon-pattern-file: url('symbols/beach.png');
polygon-pattern-alignment: global;
}
[int_wetland != null][zoom >= 10] {
[int_wetland != null][zoom >= 5] {
polygon-pattern-file: url('symbols/wetland.png');
polygon-pattern-alignment: global;
}
Expand Down
21 changes: 11 additions & 10 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,22 @@ Layer:
COALESCE(wetland, landuse, "natural") AS feature
FROM (SELECT
way, COALESCE(name, '') AS name, religion,
('landuse_' || (CASE WHEN landuse IN ('forest', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow') 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",
('landuse_' || (CASE WHEN landuse IN ('forest', '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', 'scrub') 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,
way_area
FROM planet_osm_polygon
WHERE (landuse IN ('forest', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow')
OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland'))
AND way_area > 1*!pixel_width!::real*!pixel_height!::real
WHERE (landuse IN ('forest', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow', 'vineyard', 'orchard')
OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland', 'scrub'))
AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
AND building IS NULL
) AS features
ORDER BY way_area DESC, feature
) AS landcover_low_zoom
properties:
minzoom: 7
minzoom: 5
maxzoom: 9
- id: landcover
geometry: polygon
Expand Down Expand Up @@ -214,7 +215,7 @@ Layer:
file: data/antarctica-icesheet-polygons-3857/icesheet_polygons.shp
type: shape
properties:
minzoom: 8
minzoom: 5
- id: water-areas
geometry: polygon
<<: *extents
Expand Down Expand Up @@ -270,15 +271,15 @@ Layer:
ORDER BY COALESCE(layer,0), way_area DESC
) AS landcover_area_symbols
properties:
minzoom: 8
minzoom: 5
- id: icesheet-outlines
geometry: linestring
<<: *extents
Datasource:
file: data/antarctica-icesheet-outlines-3857/icesheet_outlines.shp
type: shape
properties:
minzoom: 8
minzoom: 5
- id: springs
geometry: point
<<: *extents
Expand Down Expand Up @@ -547,7 +548,7 @@ Layer:
AND building IS NULL
) AS landuse_overlay
properties:
minzoom: 7
minzoom: 8
- id: tourism-boundary
geometry: polygon
<<: *extents
Expand Down
4 changes: 2 additions & 2 deletions shapefiles.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
}

#icesheet-poly {
[zoom >= 8] {
[zoom >= 5] {
polygon-fill: @glacier;
}
}

#icesheet-outlines {
[zoom >= 8] {
[zoom >= 5] {
[ice_edge = 'ice_ocean'],
[ice_edge = 'ice_land'] {
line-width: 0.375;
Expand Down
2 changes: 1 addition & 1 deletion water.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#water-areas {
[natural = 'glacier']::natural {
[zoom >= 8] {
[zoom >= 5] {
line-width: 1.0;
line-color: @glacier-line;
polygon-fill: @glacier;
Expand Down