Merge branch 'spring-icon' of https://github.com/imagico/openstreetma…

…p-carto into spring_icon

amenity-points.mss

@@ -1025,12 +1025,6 @@
     marker-clip: false;
   }  
 
-  [feature = 'natural_spring'][zoom >= 14] {
-    marker-file: url('symbols/spring.svg');
-    marker-placement: interior;
-    marker-clip: false;
-  }
-
   [feature = 'power_generator']['generator:source' = 'wind'],
   [feature = 'power_generator'][power_source = 'wind'] {
     [zoom >= 15] {

project.mml

@@ -275,6 +275,26 @@ Layer:
       type: shape
     properties:
       minzoom: 8
+  - id: "springs"
+    name: "springs"
+    geometry: "point"
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+             St_Centroid(way) AS way, "natural"
+           FROM planet_osm_polygon
+           WHERE "natural" IN ('spring')
+         UNION ALL
+         SELECT
+             way, "natural"
+           FROM planet_osm_point
+           WHERE "natural" IN ('spring')
+        ) AS springs
+    properties:
+      minzoom: 14
+    advanced: {}
   - id: water-lines
     class: water-lines
     geometry: linestring

water-features.mss

@@ -163,3 +163,15 @@
     }
   }
 }
+
+#springs {
+  [natural = 'spring'][zoom >= 14] {
+    marker-file: url('symbols/spring_small.svg');
+    [zoom >= 15] {
+      marker-file: url('symbols/spring.svg');
+    }
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @water-color;
+  }
+}