This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[core] fix collisions with icon-text-fit and variable placement #15828
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
pozdnyakov
reviewed
Oct 17, 2019
src/mbgl/text/placement.cpp
Outdated
| const auto placeFeatureForVariableAnchors = [&] (const CollisionFeature& collisionFeature, style::TextWritingModeType orientation) { | ||
| const bool doVariableIconPlacement = hasIconTextFit && !iconAllowOverlap && symbolInstance.placedIconIndex; | ||
|
|
||
| const auto placeFeatureForVariableAnchors = [&] (const CollisionFeature& collisionFeature, style::TextWritingModeType orientation, const CollisionFeature& iconCollisionFeature) { |
There was a problem hiding this comment.
nit: s/collisionFeature/textCollisionFeature ?
src/mbgl/text/placement.cpp
Outdated
| @@ -329,6 +331,15 @@ void Placement::placeBucket( | |||
| allowOverlap, | |||
| pitchWithMap, | |||
| params.showCollisionBoxes, avoidEdges, collisionGroup.second, textBoxes); | |||
|
|
|||
| if (doVariableIconPlacement) { | |||
| auto placedIconFeature = collisionIndex.placeFeature(iconCollisionFeature, shift, | |||
There was a problem hiding this comment.
do we still need to call placedFeature = collisionIndex.placeFeature(.. above? wouldn't just one placeFeature() call suffice?
There was a problem hiding this comment.
In the case there is negative icon padding (or an icon offset?) the text box might be larger than the icon box. Placing both is the clearest way to handle the possible differences
alexshalamov
approved these changes
Oct 18, 2019
ansis
force-pushed
the
icon-text-fit-variable-placement
branch
from
70c3e0e
to
a85187a
Compare
port 61a61a1982cb8c637d467f91da5b0817a61a9de6
ansis
force-pushed
the
icon-text-fit-variable-placement
branch
from
a85187a
to
0fe6136
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
port https://github.com/mapbox/mapbox-gl-js/pull/8803/files
When deciding the placement position it was only checking whether there were text collisions. If there was an icon collision then it would hide the icon (and by default, the text with it) instead of trying a different position.
If icon-text-fit is used it now checks whether the icon fits before accepting a placement position.