Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Apr 30, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5a85df
Refurbished spring icon (fix #325 using @imagico first tests)
Penegal Apr 23, 2018
68ec487
Use @imagico code to display springs below waterways
Penegal Apr 24, 2018
4609121
Removed useless SVG code
Penegal Apr 29, 2018
a2e2fe5
Remove St_Centroid(way) performance regression
kocio-pl Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] {
Expand Down
18 changes: 18 additions & 0 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 21 additions & 7 deletions symbols/spring.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions water-features.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,11 @@
}
}
}

#springs {
[natural = 'spring'][zoom >= 14] {
marker-file: url('symbols/spring.svg');
marker-placement: interior;
marker-clip: false;
}
}