diff --git a/project.mml b/project.mml index 5a6acd6e73..725e2e1d07 100644 --- a/project.mml +++ b/project.mml @@ -611,7 +611,7 @@ Layer: (SELECT way, "natural", man_made FROM planet_osm_line - WHERE "natural" = 'cliff' OR man_made = 'embankment' + WHERE "natural" IN ('arete', 'cliff', 'ridge') OR man_made = 'embankment' ) AS cliffs properties: cache-features: true @@ -1981,7 +1981,7 @@ Layer: FROM planet_osm_line WHERE (man_made IN ('pier', 'breakwater', 'groyne', 'embankment') OR waterway IN ('dam', 'weir') - OR "natural" IN ('cliff')) + OR "natural" IN ('arete', 'cliff', 'ridge')) AND name IS NOT NULL ) AS text_line properties: diff --git a/style/landcover.mss b/style/landcover.mss index 8b43f500e5..8b2ec3664c 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -822,6 +822,18 @@ line-pattern-file: url('symbols/cliff2.svg'); } } + [natural = 'ridge'][zoom >= 14] { + line-pattern-file: url('symbols/ridge-mid.svg'); + [zoom >= 15] { + line-pattern-file: url('symbols/ridge2.svg'); + } + } + [natural = 'arete'][zoom >= 14] { + line-pattern-file: url('symbols/arete-mid.svg'); + [zoom >= 15] { + line-pattern-file: url('symbols/arete2.svg'); + } + } [man_made = 'embankment'][zoom >= 15]::man_made { line-pattern-file: url('symbols/embankment.svg'); } @@ -904,7 +916,9 @@ } #text-line { + [feature = 'natural_arete'][zoom >= 15], [feature = 'natural_cliff'][zoom >= 15], + [feature = 'natural_ridge'][zoom >= 15], [feature = 'man_made_embankment'][zoom >= 15] { text-name: "[name]"; text-halo-radius: @standard-halo-radius; diff --git a/symbols/arete-mid.svg b/symbols/arete-mid.svg new file mode 100644 index 0000000000..a23d320fbd --- /dev/null +++ b/symbols/arete-mid.svg @@ -0,0 +1,26 @@ + + + + + + diff --git a/symbols/arete2.svg b/symbols/arete2.svg new file mode 100644 index 0000000000..6b95f600bf --- /dev/null +++ b/symbols/arete2.svg @@ -0,0 +1,36 @@ + + + + + + Created with Snap + + diff --git a/symbols/ridge-mid.svg b/symbols/ridge-mid.svg new file mode 100644 index 0000000000..7d94f14a4e --- /dev/null +++ b/symbols/ridge-mid.svg @@ -0,0 +1,65 @@ + + + + + + + image/svg+xml + + + + + + + + + Created with Snap + diff --git a/symbols/ridge2.svg b/symbols/ridge2.svg new file mode 100644 index 0000000000..417a61d1c1 --- /dev/null +++ b/symbols/ridge2.svg @@ -0,0 +1,39 @@ + + + + + + image/svg+xml + + + + + + + + + Created with Snap +