diff --git a/project.mml b/project.mml index 7fb3d47227..2a685232c8 100644 --- a/project.mml +++ b/project.mml @@ -1483,7 +1483,8 @@ Layer: WHEN (tags ? 'ele') AND tags->'ele' ~ '^-?\d{1,4}(\.\d+)?$' AND ("natural" IN ('peak', 'volcano', 'saddle') OR tourism = 'alpine_hut' OR (tourism = 'information' AND tags->'information' = 'guidepost') - OR amenity = 'shelter') + OR amenity = 'shelter' + OR tags->'mountain_pass' = 'yes') THEN CONCAT(REPLACE(ROUND((tags->'ele')::NUMERIC)::TEXT, '-', U&'\2212'), U&'\00A0', 'm') END, CASE WHEN (tags ? 'height') AND tags->'height' ~ '^\d{1,3}(\.\d+)?$' @@ -1529,6 +1530,7 @@ Layer: 'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait', 'cape') THEN "natural" END, + 'mountain_pass' || CASE WHEN tags->'mountain_pass' IN ('yes') THEN '' END, -- after natural=saddle to give priority to that tag on the same node 'waterway_' || CASE WHEN "waterway" IN ('waterfall') AND way_area IS NULL THEN waterway END, 'place_' || CASE WHEN place IN ('island', 'islet', 'square') THEN place END, 'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') @@ -1557,7 +1559,8 @@ Layer: ) AS feature, access, CASE - WHEN "natural" IN ('peak', 'volcano', 'saddle') THEN + WHEN "natural" IN ('peak', 'volcano', 'saddle') + OR tags->'mountain_pass' = 'yes' THEN CASE WHEN tags->'ele' ~ '^-?\d{1,4}(\.\d+)?$' THEN (tags->'ele')::NUMERIC END diff --git a/style/amenity-points.mss b/style/amenity-points.mss index 2d0df59b2b..a985fc81c3 100644 --- a/style/amenity-points.mss +++ b/style/amenity-points.mss @@ -1382,6 +1382,12 @@ marker-clip: false; } + [feature = 'mountain_pass'][zoom >= 15] { + marker-file: url('symbols/natural/saddle.svg'); + marker-fill: @transportation-icon; + marker-clip: false; + } + [feature = 'natural_spring'][zoom >= 14] { marker-file: url('symbols/natural/spring.svg'); marker-fill: #7abcec; @@ -1833,6 +1839,7 @@ [feature = 'natural_peak'][zoom >= 13], [feature = 'natural_volcano'][zoom >= 13], [feature = 'natural_saddle'][zoom >= 15], + [feature = 'mountain_pass'][zoom >= 15], [feature = 'tourism_viewpoint'][zoom >= 16] { text-name: "[name]"; text-size: @standard-font-size; @@ -1840,6 +1847,7 @@ text-line-spacing: @standard-line-spacing-size; text-fill: darken(@landform-color, 30%); [feature = 'natural_volcano'] { text-fill: #d40000; } + [feature = 'mountain_pass'] { text-fill: @transportation-text; } text-dy: 7; [feature = 'tourism_viewpoint'] { text-dy: 11; } text-face-name: @standard-font;