From f5a85df512b39fc13b659d38ac18ebb46e92949d Mon Sep 17 00:00:00 2001 From: Penegal Date: Mon, 23 Apr 2018 17:02:27 +0200 Subject: [PATCH 1/4] Refurbished spring icon (fix #325 using @imagico first tests) --- symbols/spring.svg | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/symbols/spring.svg b/symbols/spring.svg index bab09a9254..03a73abb7a 100644 --- a/symbols/spring.svg +++ b/symbols/spring.svg @@ -1,9 +1,26 @@ - - - - + + + + + + From 68ec48742fc92d138294e12f99da0c8ba61700b8 Mon Sep 17 00:00:00 2001 From: Penegal Date: Tue, 24 Apr 2018 08:29:08 +0200 Subject: [PATCH 2/4] Use @imagico code to display springs below waterways --- amenity-points.mss | 6 ------ project.mml | 18 ++++++++++++++++++ water-features.mss | 8 ++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index cb970b73a9..3b8dd5720a 100644 --- 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 index 47bdc85931..1b73db6b45 100644 --- 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 + 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 - id: water-lines class: water-lines geometry: linestring diff --git a/water-features.mss b/water-features.mss index 43005c2d55..f097f81678 100644 --- 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; + } +} From 4609121403a3f31f259b098cd5658c53a7b37f2d Mon Sep 17 00:00:00 2001 From: Penegal Date: Sun, 29 Apr 2018 20:19:15 +0200 Subject: [PATCH 3/4] Removed useless SVG code --- symbols/spring.svg | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/symbols/spring.svg b/symbols/spring.svg index 03a73abb7a..47644c0c44 100644 --- a/symbols/spring.svg +++ b/symbols/spring.svg @@ -9,18 +9,15 @@ 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-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:connector-curvature="0" /> + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="display:inline;fill:none;stroke:#7abcec;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> From a2e2fe5536c7a388c2997f10de608c45b637be78 Mon Sep 17 00:00:00 2001 From: kocio-pl Date: Tue, 1 May 2018 01:36:33 +0200 Subject: [PATCH 4/4] Remove St_Centroid(way) performance regression --- project.mml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.mml b/project.mml index 1b73db6b45..d061b16414 100644 --- a/project.mml +++ b/project.mml @@ -285,7 +285,7 @@ Layer: <<: *osm2pgsql table: |- (SELECT - St_Centroid(way) AS way, "natural" + way, "natural" FROM planet_osm_polygon WHERE "natural" IN ('spring') UNION ALL