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.

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

Cemeteries rework in SVG #2714

Merged
merged 1 commit into from
Aug 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions landcover.mss
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,12 @@
}
[zoom >= 14] {
[religion = 'jewish'] { polygon-pattern-file: url('symbols/grave_yard_jewish.png'); }
[religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.png'); }
[religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.png'); }
[religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.svg'); }
[religion = 'muslim'] { polygon-pattern-file: url('symbols/grave_yard_muslim.svg'); }
[religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.svg'); }
[religion = 'jewish'],
[religion = 'christian'],
[religion = 'muslim'],
[religion = 'INT-generic'] {
[way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
[way_pixels >= 64] { polygon-pattern-gamma: 0.3; }
Expand Down
2 changes: 1 addition & 1 deletion project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Layer:
('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site') THEN tourism ELSE NULL END)) AS tourism,
('highway_' || (CASE WHEN highway IN ('services', 'rest_area') THEN highway ELSE NULL END)) AS highway,
('railway_' || (CASE WHEN railway = 'station' THEN railway ELSE NULL END)) AS railway,
CASE WHEN religion IN ('christian', 'jewish') THEN religion ELSE 'INT-generic'::text END AS religion,
CASE WHEN religion IN ('christian', 'jewish', 'muslim') THEN religion ELSE 'INT-generic'::text END AS religion,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
FROM planet_osm_polygon
WHERE (landuse IS NOT NULL
Expand Down
Binary file removed symbols/grave_yard_christian.png
Binary file not shown.
38 changes: 38 additions & 0 deletions symbols/grave_yard_christian.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed symbols/grave_yard_generic.png
Binary file not shown.
38 changes: 38 additions & 0 deletions symbols/grave_yard_generic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified symbols/grave_yard_jewish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions symbols/grave_yard_muslim.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.