From 699e51fbe47d20182aba5ebc48764bded0136082 Mon Sep 17 00:00:00 2001
From: imagico <git@imagico.de>
Date: Wed, 23 Sep 2015 11:35:14 +0200
Subject: [PATCH] change spring icon to a simple outlined dit and move to
 separate layer

---
 amenity-points.mss       |  5 +++--
 project.mml              | 25 +++++++++++++++++++++++++
 project.yaml             | 20 ++++++++++++++++++++
 symbols/spring.svg       | 26 ++++++++++++++++++++------
 symbols/spring_small.svg | 21 +++++++++++++++++++++
 water-features.mss       | 12 ++++++++++++
 6 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 symbols/spring_small.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index 8badd046d8..e142b4abed 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -929,13 +929,14 @@
     point-file: url('symbols/poi_cave.p.16.png');
     point-placement: interior;
   }
-
+/*
   [feature = 'natural_spring'][zoom >= 14] {
     marker-file: url('symbols/spring.svg');
     marker-placement: interior;
     marker-clip: false;
+    marker-fill: @water-color;
   }
-
+*/
   [feature = 'power_generator']['generator:source' = 'wind'],
   [feature = 'power_generator'][power_source = 'wind'] {
     [zoom >= 15] {
diff --git a/project.mml b/project.mml
index f32e1c6fcf..71d950f342 100644
--- a/project.mml
+++ b/project.mml
@@ -318,6 +318,31 @@
       },
       "advanced": {}
     },
+    {
+      "name": "springs",
+      "srs-name": "900913",
+      "geometry": "point",
+      "id": "springs",
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
+      "Datasource": {
+        "extent": "-20037508,-20037508,20037508,20037508",
+        "table": "(SELECT\n     St_Centroid(way) AS way, \"natural\"\n   FROM planet_osm_polygon\n   WHERE \"natural\" IN ('spring')\n UNION ALL\n SELECT\n     way, \"natural\"\n   FROM planet_osm_point\n   WHERE \"natural\" IN ('spring')\n) AS springs",
+        "geometry_field": "way",
+        "type": "postgis",
+        "key_field": "",
+        "dbname": "gis"
+      },
+      "extent": [
+        -180,
+        -85.05112877980659,
+        180,
+        85.05112877980659
+      ],
+      "properties": {
+        "minzoom": 14
+      },
+      "advanced": {}
+    },
     {
       "name": "water-lines",
       "srs-name": "900913",
diff --git a/project.yaml b/project.yaml
index 64bb9e8f25..1b477183d9 100644
--- a/project.yaml
+++ b/project.yaml
@@ -301,6 +301,26 @@ Layer:
     properties:
       minzoom: 4
     advanced: {}
+  - 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"
     name: "water-lines"
     class: "water-lines"
diff --git a/symbols/spring.svg b/symbols/spring.svg
index bab09a9254..c73ce08da7 100644
--- a/symbols/spring.svg
+++ b/symbols/spring.svg
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg>
 
-<svg xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="5"
-   height="7">
-	<rect width="5" height="7" fill="white" />
-	<path d="M 4,1 1,1 1,4 3,4 3,5 1,5 1,6 4,6 4,3 2,3 2,2 4,2 4,1 z" fill="#588499" />
+  <g
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       transform="matrix(1.1666667,0,0,1.1666667,0,1033.6955)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4333"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;stroke-width:0.6;stroke-miterlimit:4;stroke-dasharray:none" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="path4325"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       transform="matrix(1.1666667,0,0,1.1666667,0,1033.6955)" />
+    <path
+       transform="matrix(1.125,0,0,1.1250023,0.125,1034.2372)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4327"
+       style="fill:none;stroke:#021010;stroke-width:0.22222202;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
+  </g>
 </svg>
diff --git a/symbols/spring_small.svg b/symbols/spring_small.svg
new file mode 100644
index 0000000000..f69b36a45f
--- /dev/null
+++ b/symbols/spring_small.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg>
+  <g
+     transform="translate(0,-1036.3622)">
+    <path
+       transform="translate(0,1036.3622)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4331"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1;stroke-width:0.6;stroke-miterlimit:0;stroke-dasharray:none" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="path4325"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       transform="translate(0,1036.3622)" />
+    <path
+       transform="matrix(0.95833333,0,0,0.95833392,0.125,1036.9039)"
+       d="m 6,13 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+       id="path4327"
+       style="fill:none;stroke:#021010;stroke-width:0.2608695;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/water-features.mss b/water-features.mss
index 2230fa7d49..a98a747eb0 100644
--- a/water-features.mss
+++ b/water-features.mss
@@ -162,3 +162,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;
+  }
+}