-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Fix rendering for icon-text-fit + data-driven text-size #5632
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Binary file added
BIN
+1.04 KB
test/integration/render-tests/regressions/mapbox-gl-js#5631/expected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions
74
test/integration/render-tests/regressions/mapbox-gl-js#5631/style.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| { | ||
| "version": 8, | ||
| "metadata": { | ||
| "test": { | ||
| "width": 64, | ||
| "height": 64 | ||
| } | ||
| }, | ||
| "sources": { | ||
| "geojson": { | ||
| "type": "geojson", | ||
| "data": { | ||
| "type": "FeatureCollection", | ||
| "features": [ | ||
| { | ||
| "type": "Feature", | ||
| "properties": { | ||
| "name": "A", | ||
| "size": 12 | ||
| }, | ||
| "geometry": { | ||
| "type": "Point", | ||
| "coordinates": [ | ||
| -10, | ||
| 0 | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "Feature", | ||
| "properties": { | ||
| "name": "B", | ||
| "size": 24 | ||
| }, | ||
| "geometry": { | ||
| "type": "Point", | ||
| "coordinates": [ | ||
| 10, | ||
| 0 | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "sprite": "local://sprites/icon-text-fit", | ||
| "glyphs": "local://glyphs/{fontstack}/{range}.pbf", | ||
| "layers": [ | ||
| { | ||
| "id": "symbol", | ||
| "type": "symbol", | ||
| "source": "geojson", | ||
| "layout": { | ||
| "text-font": [ | ||
| "Open Sans Semibold", | ||
| "Arial Unicode MS Bold" | ||
| ], | ||
| "text-field": [ | ||
| "get", | ||
| "name" | ||
| ], | ||
| "text-size": [ | ||
| "get", | ||
| "size" | ||
| ], | ||
| "icon-image": "label", | ||
| "icon-text-fit": "both", | ||
| "icon-ignore-placement": true, | ||
| "icon-allow-overlap": true | ||
| } | ||
| } | ||
| ] | ||
| } |
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.
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.
Why isn't this using
{zoom: bucket.zoom + 1}like we do insymbol_layout#addFeature? That seems like the best match. @anandthakker understands that logic better than I do, though, I think.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.
Woah, good point @ChrisLoer. This raises an interesting issue. It's not just that we need to evaluate
text-sizewith{zoom: bucket.zoom + 1}during layout (though I think you're right about that) -- if text-size is zoom depentent, we also need to scale the icon at render time according to the current text-size value. And if text-size is a composite function, that's going to be problematic -- we could try to use the text-size attributes for the icon rendering pass in that case, but that would only help foricon-text-size: both.In any case, I think this goes well beyond the scope of this PR. I'll ticket it separately, 👍 for now!
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.
#5656