Fix rendering of water body labels #3919
Merged
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
|
I introduced 2/3rds of the bugs, so I will review this. :-) |
jeisenbe
approved these changes
Oct 4, 2019
| text-name: "[name]"; | ||
| text-size: 10; | ||
| text-wrap-width: 25; // 2.5 em | ||
| text-line-spacing: -1.5; // -0.15 em | ||
| [way_pixels > 12000] { | ||
| [way_pixels > 12000], | ||
| [zoom >= 15][feature = 'natural_strait'] { |
There was a problem hiding this comment.
Should 'natural_bay' also be rendered the same way at >= z15? (Doesn't need to be in this PR)
There was a problem hiding this comment.
I prefer making small and clear PRs if possible, please.
|
@sommerluk do you have time to merge this PR and your other approved PRs this week? |
|
@sommerluk do you have time to merge this PR and your other approved PRs this week?
|
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.
This is a bugfix PR for water body labels.
Changes proposed in this pull request:
natural_bayhas rendering rules both inamenity-points.mss(rendering a label in regular font) andwater.mss(rendering a label in italic font). Consider the Baie des sirènes: The label is rendered in a regular font up to z16, but starting from z17 with an italic font. This PR puts all the rendering rules fornatural_bayat the same place and unifies the font face (using italic).water.mssthere is almost duplicate code fornatural_strait. This PR unifies the code in one single block.The XML code that Carto produces decreases slightly with this PR.