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

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 12 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
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,34 @@
marker-clip: false;
}

[feature = 'historic_memorial'][zoom >= 17] {
[feature = 'historic_memorial'][zoom >= 17],
Copy link
Collaborator

Choose a reason for hiding this comment

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

You need to exclude here all defined memorials which are to be shown on z18 or z19, because now they first look like a generic memorial.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What would be displayed at z17 ? If I exclude all the features listed below, we will highlight from z17 historic=memorial without memorial subtags which are not the most important ones.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It seems that I should be more accurate:

  • I was thinking about z17 for generic memorials and statue
  • plaque should stay at z19

This way we have all three zoom levels used, which helps keep the map clean and distinct.

Generic memorials can be very different and have different size, for me generic memorial on z17 makes sense after generic monument at z16.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I made corrections, I have tested on memorial=stele and memorial=bust and will check the rest tomorrow

[feature = 'historic_memorial_stele'][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.

Do we have historic_memorial_stele defined in the project.mml? I guess no and we use simple memorial check now.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I also think this should be rather z18+.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

both fixed

marker-file: url('symbols/historic/memorial.svg');
[memorial = 'bust'][zoom >= 19] {
marker-file: url('symbols/historic/bust.svg');
}
[memorial = 'blue_plaque'][zoom >= 19],
[memorial = 'plaque'][zoom >= 19] {
marker-file: url('symbols/historic/plaque.svg');
}
[memorial = 'statue'][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.

I think this should be still z17+.

Copy link
Contributor Author

@jragusa jragusa Oct 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

fixed, I left blue_plaque to z19

marker-file: url('symbols/historic/statue.svg');
}
[memorial = 'stone'][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.

I think this should be z18+.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

stone also to z18 ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, I think so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

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 @@ -1829,7 +1846,7 @@
[feature = 'tourism_artwork'][zoom >= 17],
[feature = 'historic_memorial'][zoom >= 17],
[feature = 'historic_memorial_plaque'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 16],
[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
Original file line number Diff line number Diff line change
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
Loading
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
Loading
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
Loading
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
Loading
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.