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

Jump to bottom

Add icons for memorial subtags #3356

Merged
merged 21 commits into from Nov 7, 2018
Merged

Add icons for memorial subtags #3356

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c3864c8
add icons for memorial subtags
jragusa Aug 21, 2018
2c1f2f4
restore monument icon
jragusa Sep 7, 2018
7809e2b
remove war_memorial tag
jragusa Sep 7, 2018
cd95225
change folder path
jragusa Sep 7, 2018
3a6699f
change folder path
jragusa Sep 7, 2018
d36e33e
Merge branch 'master' into memorial
jragusa Sep 7, 2018
1404814
remove memorial_bench icon
jragusa Oct 19, 2018
aee4e02
Merge branch 'memorial' of https://github.com/jragusa/openstreetmap-c…
jragusa Oct 19, 2018
1c3b1d7
render differently artwork_type=statue and change artwork icon
jragusa Oct 19, 2018
408f9f7
remove unnecessary white spaces
jragusa Oct 19, 2018
38519d2
fix pixel-aligned icon of stone
jragusa Oct 19, 2018
a3845c9
remove stolperstein
jragusa Oct 21, 2018
ad2c48f
change zoom level
jragusa Oct 24, 2018
0b58262
fix memorial_stele
jragusa Oct 24, 2018
e096de1
change zoom level of memorial=stone to z18
jragusa Oct 24, 2018
60301c9
fix generic memorial zoom level
jragusa Oct 24, 2018
a70e5eb
fix zoom level of text
jragusa Oct 24, 2018
f3e38e8
move statue to z17
jragusa Oct 24, 2018
99e06e9
code cleaned
jragusa Oct 29, 2018
f1a320a
fix filtering of non-usual memorial tags
jragusa Nov 6, 2018
65eb88a
remove exclusion of statue and add missing comma
jragusa Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 38 additions & 9 deletions amenity-points.mss
View file
Open in desktop
Expand Up @@ -156,10 +156,14 @@
}

[feature = 'tourism_artwork'][zoom >= 17] {
marker-file: url('symbols/tourism/artwork.svg');
[artwork_type != 'statue'] {
marker-file: url('symbols/tourism/artwork.svg');
}
[artwork_type = 'statue'] {
marker-file: url('symbols/historic/statue.svg');
}
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'tourism_camp_site'][zoom >= 16] {
Expand Down Expand Up @@ -765,21 +769,40 @@
marker-clip: false;
}

[feature = 'historic_memorial'][zoom >= 17] {
[feature = 'historic_memorial'][memorial = null][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19],
[feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19],
[feature = 'historic_memorial'][zoom >= 19] {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The last issue: I think this should be z17+, since we have no idea what can it be, so it's kind of generic.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are your sure for memorial=blue_plaque ? They seem to be not so large. Take a look at some examples from the Guardian.

I would put the same zoom level than stolperstein.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant all the memorial values different than what we have on z18+ and z19+. Look at the similar case here:

openstreetmap-carto/amenity-points.mss

Line 474 in 9d16b99

[feature = 'man_made_tower']["tower:type" != 'cooling']["tower:type" != 'lighting']["tower:type" != 'bell_tower']["tower:type" != 'watchtower'] {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the fix satisfy you ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, it looks promising and I will test it soon. I just think that excluding statue is not necessary, because it will be rendered on z17+ anyway (that's why I told only about excluding z18+ and z19+ objects). It adds a bit more of clarity, so it's not an error, but I think this line is long enough.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have found the problem - this war memorial is not showing any icon at all (instead of a standard one), while the label is still visible from z17:

https://www.openstreetmap.org/node/3183626423#map=19/52.26992/20.99322

Copy link
Contributor Author

@jragusa jragusa Nov 7, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I resolved both problems. The second one was related to a missing comma.

marker-file: url('symbols/historic/memorial.svg');
[memorial = 'bust']{
marker-file: url('symbols/historic/bust.svg');
}
[memorial = 'blue_plaque'],
[memorial = 'plaque'] {
marker-file: url('symbols/historic/plaque.svg');
}
[memorial = 'statue'] {
marker-file: url('symbols/historic/statue.svg');
}
[memorial = 'stone'] {
marker-file: url('symbols/historic/stone.svg');
}
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'historic_memorial_plaque'][zoom >= 19] {
marker-file: url('symbols/historic/plaque.svg');
[feature = 'man_made_obelisk'][zoom >= 17] {
marker-file: url('symbols/historic/obelisk.svg');
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_monument'][zoom >= 16] {
marker-file: url('symbols/historic/monument.svg');
marker-fill: @memorials;
Expand Down Expand Up @@ -1827,9 +1850,15 @@
}

[feature = 'tourism_artwork'][zoom >= 17],
[feature = 'historic_memorial'][zoom >= 17],
[feature = 'historic_memorial_plaque'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_memorial'][memorial = null][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19],
[feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19],
[feature = 'historic_memorial'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 17],
[feature = 'historic_monument'][zoom >= 16],
[feature = 'historic_fort'][zoom >= 16],
[feature = 'historic_castle'][zoom >= 16],
Expand Down
25 changes: 13 additions & 12 deletions project.mml
View file
Open in desktop
Expand Up @@ -1629,8 +1629,7 @@ Layer:
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
Expand All @@ -1657,6 +1656,8 @@ Layer:
tags->'tower:type' as "tower:type",
tags->'castle_type' as castle_type,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer',
'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
Expand Down Expand Up @@ -1684,7 +1685,6 @@ Layer:
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('spring')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR military IN ('bunker')
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind'))
Expand Down Expand Up @@ -1749,8 +1749,7 @@ Layer:
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
'waterway_' || CASE WHEN "waterway" IN ('waterfall') THEN waterway ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway
WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END,
Expand Down Expand Up @@ -1795,6 +1794,8 @@ Layer:
tags->'tower:type' as "tower:type",
tags->'castle_type' as castle_type,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer',
'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
Expand Down Expand Up @@ -1825,7 +1826,6 @@ Layer:
OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance')
OR waterway IN ('waterfall')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR military IN ('bunker')
OR tags @> 'emergency=>phone'
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
Expand Down Expand Up @@ -2228,8 +2228,7 @@ Layer:
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'dock') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -2260,6 +2259,8 @@ Layer:
tags->'recycling_type' as recycling_type,
tags->'castle_type' as castle_type,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
ref,
way_area,
CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
Expand All @@ -2280,7 +2281,6 @@ Layer:
OR place IN ('island', 'islet')
OR military IN ('danger_area', 'bunker')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR highway IN ('services', 'rest_area', 'bus_stop', 'elevator')
OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation')
OR boundary IN ('national_park')
Expand Down Expand Up @@ -2349,6 +2349,7 @@ Layer:
recycling_type,
castle_type,
information,
memorial,
ref,
way_area,
is_building
Expand Down Expand Up @@ -2400,8 +2401,7 @@ Layer:
'barrier_' || CASE WHEN barrier IN ('toll_booth') THEN barrier ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'weir', 'dock') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -2438,6 +2438,8 @@ Layer:
tags->'recycling_type' as recycling_type,
tags->'castle_type' as castle_type,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
ref,
NULL AS way_area,
CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
Expand All @@ -2462,7 +2464,6 @@ Layer:
OR barrier IN ('toll_booth')
OR military IN ('danger_area', 'bunker')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR highway IN ('bus_stop', 'services', 'rest_area', 'elevator')
OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation')
OR boundary IN ('national_park')
Expand Down
31 changes: 31 additions & 0 deletions symbols/historic/bust.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions symbols/historic/obelisk.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions symbols/historic/statue.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions symbols/historic/stone.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 19 additions & 18 deletions symbols/tourism/artwork.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.