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

Add rendering for natural=cape #3452

Merged
merged 4 commits into from
Nov 25, 2018
Merged

Add rendering for natural=cape #3452

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf6fd0c
add rendering for natural=cape
Adamant36 Oct 16, 2018
4129aa5
updated master
Adamant36 Nov 11, 2018
ffd8c75
Merge remote-tracking branch 'upstream/master' into cape
Adamant36 Nov 19, 2018
95d1055
Add render for cape on both nodes and ways
Adamant36 Nov 19, 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
3 changes: 2 additions & 1 deletion amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,6 +1620,7 @@
/* Note that .text is also used in water.mss */
.text-low-zoom[zoom < 10],
.text[zoom >= 10] {
[feature = 'natural_cape'],
Adamant36 marked this conversation as resolved.
Show resolved Hide resolved
[feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
[feature = 'place_island'][zoom >= 16][way_pixels < 800000],
[feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels < 800000],
Expand Down Expand Up @@ -2350,7 +2351,7 @@
}
}
}

Adamant36 marked this conversation as resolved.
Show resolved Hide resolved
[feature = 'natural_bay'][zoom >= 14],
[feature = 'natural_spring'][zoom >= 16] {
text-name: "[name]";
Expand Down
10 changes: 7 additions & 3 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,7 +2019,7 @@ Layer:
'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area') THEN military ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock',
'water', 'bay', 'strait') THEN "natural" ELSE NULL END,
'water', 'bay', 'strait', 'cape') 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,
'leisure_' || CASE WHEN leisure IN ('nature_reserve') THEN leisure ELSE NULL END
Expand All @@ -2028,8 +2028,12 @@ Layer:
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', 'farmland')
<<<<<<< HEAD
OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait', 'cape')
=======
OR military IN ('danger_area')
OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait')
>>>>>>> upstream/master
Adamant36 marked this conversation as resolved.
Show resolved Hide resolved
OR "place" IN ('island')
OR boundary IN ('national_park')
OR leisure IN ('nature_reserve'))
Expand Down Expand Up @@ -2091,7 +2095,7 @@ Layer:
'communications_tower', 'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait') THEN "natural" ELSE NULL END,
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait', 'cape') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down Expand Up @@ -2275,7 +2279,7 @@ Layer:
'telescope', 'chimney', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring',
'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait')
'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait', 'cape')
Adamant36 marked this conversation as resolved.
Show resolved Hide resolved
THEN "natural" ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('waterfall') THEN waterway ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
Expand Down