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

Adding advertising=column icon #3136

Merged
merged 2 commits into from
Mar 22, 2018

Conversation

james2432
Copy link
Contributor

@james2432 james2432 commented Mar 20, 2018

@kocio-pl
Copy link
Collaborator

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.

@james2432
Copy link
Contributor Author

Ok future commits and PR I will only put inside the PR body.

@james2432 james2432 changed the title [WIP] Issue #3002 Adding advertising column icon and support for advertising key [WIP] Adding advertising column icon and support for advertising key Mar 20, 2018
@polarbearing
Copy link
Contributor

I had forgotten that this was unfinished in January, thanks for progressing.
As there is some new code involved we probably need to see that rendered. The two links in the first post are map areas only, not objects?

@james2432
Copy link
Contributor Author

im working on the renderings now, didnt have access to the docker vm

@james2432 james2432 changed the title [WIP] Adding advertising column icon and support for advertising key Adding advertising column icon and support for advertising key Mar 20, 2018
@@ -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
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 is not a good idea - it would mean database migration. We add keys from hstore like tags->'intermittent'.

@@ -969,6 +970,15 @@
marker-file: url('symbols/shop/variety_store.svg');
}
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

Unwanted spaces.

@@ -969,6 +970,15 @@
marker-file: url('symbols/shop/variety_store.svg');
}
}

[feature = 'advertising']{
[advertising = 'column'][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.

Currently we use single features like [feature = 'advertising_column']. It is a text concatenation in project.mml.

@james2432 james2432 force-pushed the avertising_column branch 2 times, most recently from 8f29c63 to 5d8af20 Compare March 21, 2018 01:15
@james2432
Copy link
Contributor Author

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
Copy link
Collaborator

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
Copy link
Collaborator

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
Copy link
Collaborator

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.

@james2432
Copy link
Contributor Author

Added checking for short list in project.mml

@kocio-pl kocio-pl changed the title Adding advertising column icon and support for advertising key Adding advertising=column icon Mar 21, 2018
@kocio-pl
Copy link
Collaborator

Commit name should now skip the support for advertising key.

@james2432
Copy link
Contributor Author

Renamed commit comment

@kocio-pl
Copy link
Collaborator

There's also some project.mml conflict to resolve now.

@james2432
Copy link
Contributor Author

james2432 commented Mar 22, 2018

Done but is probably going to break when amenity=bbq is merged

@kocio-pl kocio-pl merged commit 35e96bc into gravitystorm:master Mar 22, 2018
@kocio-pl
Copy link
Collaborator

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 building=* tag (like here), so it's probably the same more general problem as with #3005 (comment).

@james2432 james2432 deleted the avertising_column branch March 22, 2018 15:26
@polarbearing
Copy link
Contributor

The Golden Litfass Column Award goes to everybody :-)

img_20180321_litfassplatz

Greetings from the Litfaßplatz in Berlin...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants