-
Notifications
You must be signed in to change notification settings - Fork 826
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
Resolve bugs related to COALESCE problems #1349
Merged
pnorman
merged 2 commits into
gravitystorm:master
from
matthijsmelissen:coalesce-problems
Mar 13, 2015
Merged
Resolve bugs related to COALESCE problems #1349
pnorman
merged 2 commits into
gravitystorm:master
from
matthijsmelissen:coalesce-problems
Mar 13, 2015
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthijsmelissen
force-pushed
the
coalesce-problems
branch
2 times, most recently
from
March 4, 2015 13:23
4a3dfaf
to
4933cdb
Compare
Mismatch between icon (post office) and text (shop) |
* Make sure conditions are checked in both WHERE and COALESCE Checking the condition in the WHERE class is necessary for performance. Checking the condition in the COALESCE is necessary to prevent unrendered tags blocking rendering of tags further down in the COALESCE. See also the discussion [here](gravitystorm#1038 (comment)). This is an improvement of gravitystorm#1038. This resolves gravitystorm#985, resolves gravitystorm#1029, resolves gravitystorm#1336. * Give amenity priority over shop. This resolves gravitystorm#963. * Give tourism priority over amenity, shop, leisure, landuse, man_made, natural, and place. This resolves gravitystorm#1269, resolves first issue of gravitystorm#1232.
matthijsmelissen
force-pushed
the
coalesce-problems
branch
from
March 9, 2015 21:09
4933cdb
to
f93b782
Compare
Include values that are rendered as icon without label to prevent mismatch beween icons and labels.
matthijsmelissen
force-pushed
the
coalesce-problems
branch
from
March 9, 2015 21:35
5cb7e11
to
759f4e2
Compare
Fixed. We should probably additionally add labels for post offices. |
pnorman
added a commit
that referenced
this pull request
Mar 13, 2015
Resolve bugs related to COALESCE problems
There is a typo in comments - 'beween' -> 'between' |
OK, I will make a separate PR. |
This was referenced Mar 14, 2015
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure conditions are checked in both WHERE and COALESCE
Checking the condition in the WHERE class is necessary for performance.
Checking the condition in the COALESCE is necessary to prevent unrendered tags blocking rendering of tags further down in the COALESCE.
See also the discussion here.
This is an improvement of Rewrite SQL queries so the COALESCE part works correctly #1038.
This resolves shop=no shouldn't get rendered #985, resolves tourism=attraction not rendered when object also has unrendered amenity tag #1029, and resolves Unrendered man_made overrules natural #1336.
Give amenity priority over shop.
This resolves amenity=fuel with shop=kiosk is rendered as unknown shop in purple instead of fuel icon #963.
Give tourism priority over amenity, shop, leisure, landuse, man_made, natural,
and place.
This resolves alpine_hut should have precedence over restaurant #1269, and resolves item of Hostel icon not rendered on recreation_ground #1232.