Merge pull request #3767 from jeisenbe/ridge-arete

Add line rendering plus name labels for ridges and aretes

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:

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;