Refurbished spring icon (fix #325 using @imagico first tests) (#3189)

* Refurbished spring icon (fix #325 using @imagico first tests) * Use @imagico code to display springs below waterways * Removed useless SVG code * Remove St_Centroid(way) performance regression
gravitystorm · Apr 30, 2018 · 5e8292b · 5e8292b
1 parent 32a1193
commit 5e8292b
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 deletions.
diff --git a/amenity-points.mss b/amenity-points.mss
@@ -1201,12 +1201,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] {

diff --git a/project.mml b/project.mml
@@ -278,6 +278,24 @@ Layer:
       type: shape
     properties:
       minzoom: 8
+  - id: springs
+    geometry: point
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+             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
   - id: water-lines
     class: water-lines
     geometry: linestring

diff --git a/symbols/spring.svg b/symbols/spring.svg
diff --git a/water-features.mss b/water-features.mss
@@ -163,3 +163,11 @@
     }
   }
 }
+
+#springs {
+  [natural = 'spring'][zoom >= 14] {
+    marker-file: url('symbols/spring.svg');
+    marker-placement: interior;
+    marker-clip: false;
+  }
+}