-
Notifications
You must be signed in to change notification settings - Fork 819
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
Adding advertising=column icon #3136
Conversation
I think you should skip using issue number in the names of PRs and commits - it's unnecessary technical detail which adds visual clutter and can be easy checked inside the PR ticket. |
Ok future commits and PR I will only put inside the PR body. |
I had forgotten that this was unfinished in January, thanks for progressing. |
im working on the renderings now, didnt have access to the docker vm |
36ccbef
to
95d8856
Compare
openstreetmap-carto.style
Outdated
@@ -11,6 +11,7 @@ node,way addr:housename text linear | |||
node,way addr:housenumber text linear | |||
way addr:interpolation text linear | |||
node,way admin_level text linear | |||
node,way advertising text polygon |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is not a good idea - it would mean database migration. We add keys from hstore like tags->'intermittent'.
amenity-points.mss
Outdated
@@ -969,6 +970,15 @@ | |||
marker-file: url('symbols/shop/variety_store.svg'); | |||
} | |||
} | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unwanted spaces.
amenity-points.mss
Outdated
@@ -969,6 +970,15 @@ | |||
marker-file: url('symbols/shop/variety_store.svg'); | |||
} | |||
} | |||
|
|||
[feature = 'advertising']{ | |||
[advertising = 'column'][zoom >= 19] { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently we use single features like [feature = 'advertising_column']
. It is a text concatenation in project.mml.
8f29c63
to
5d8af20
Compare
Fixed, tested, same result now; less the database migration requirement |
project.mml
Outdated
@@ -1488,6 +1489,7 @@ Layer: | |||
OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', | |||
'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') | |||
OR amenity IS NOT NULL -- skip checking a huge list and use a null check | |||
OR tags->'advertising' IS NOT NULL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the list is relatively short (like here - just 1 element) we don't skip checking, see for example:
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', 'fitness_station', 'firepit', 'sauna')
project.mml
Outdated
@@ -2031,6 +2036,7 @@ Layer: | |||
OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', | |||
'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') | |||
OR amenity IS NOT NULL -- skip checking a huge list and use a null check | |||
OR tags->'advertising' is NOT NULL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same comment about skipping list.
project.mml
Outdated
@@ -2179,6 +2186,7 @@ Layer: | |||
OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', | |||
'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') | |||
OR amenity IS NOT NULL -- skip checking a huge list and use a null check | |||
OR tags->'advertising' IS NOT NULL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same comment about skipping list.
5d8af20
to
b206228
Compare
Added checking for short list in project.mml |
Commit name should now skip the support for advertising key. |
b206228
to
ef6b92d
Compare
Renamed commit comment |
There's also some |
Done but is probably going to break when amenity=bbq is merged |
Thanks! Sometimes it's better to step back for a while - now I think this icon design is the best of what we were trying. BTW: it doesn't show up on ways without |
The Golden Litfass Column Award goes to everybody :-) Greetings from the Litfaßplatz in Berlin... |
Fixes #3002
From https://www.openstreetmap.org/#map=19/45.51028/-73.61213 (node):
Z19:
Z18:
From https://www.openstreetmap.org/#map=19/48.53969/2.65847 (way):