Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[core] fix collisions with icon-text-fit and variable placement (#15828)
Browse files Browse the repository at this point in the history 
port 61a61a1982cb8c637d467f91da5b0817a61a9de6
  • Loading branch information
@ansis
ansis authored Oct 23, 2019
1 parent b1d0482 commit 99feb9b
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mapbox-gl-js
Submodule mapbox-gl-js updated 27 files
+36 −0 debug/rtl.html
+2 −3 package.json
+6 −6 src/css/mapbox-gl.css
+4 −0 src/css/svg/mapboxgl-ctrl-geolocate-disabled.svg
+66 −50 src/data/array_types.js
+4 −0 src/data/bucket/symbol_attributes.js
+36 −7 src/data/bucket/symbol_bucket.js
+12 −1 src/index.js
+0 −25 src/render/draw_symbol.js
+17 −7 src/source/rtl_text_plugin.js
+7 −0 src/style/style.js
+88 −34 src/symbol/placement.js
+43 −3 src/symbol/symbol_layout.js
+72 −31 src/ui/control/geolocate_control.js
+8 −2 src/ui/handler/drag_rotate.js
+40 −6 src/ui/hash.js
+7 −3 src/ui/map.js
+1 −0 src/util/actor.js
+5 −0 src/util/throttled_invoker.js
+8 −3 src/util/web_worker_transfer.js
+0 −2 test/ignores.json
+ − test/integration/render-tests/icon-text-fit/text-variable-anchor/expected.png
+ − test/integration/render-tests/text-variable-anchor/all-anchors-icon-text-fit/expected.png
+46 −0 test/unit/ui/control/geolocate.test.js
+61 −3 test/unit/ui/handler/drag_rotate.test.js
+127 −2 test/unit/ui/hash.test.js
+8 −0 yarn.lock
59 changes: 49 additions & 10 deletions src/mbgl/text/placement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ void Placement::placeBucket(
if (horizontalTextIndex) {
const PlacedSymbol& placedSymbol = bucket.text.placedSymbols.at(*horizontalTextIndex);
const float fontSize = evaluateSizeForFeature(partiallyEvaluatedTextSize, placedSymbol);
const CollisionFeature& textCollisionFeature = symbolInstance.textCollisionFeature;

const auto updatePreviousOrientationIfNotPlaced = [&](bool isPlaced) {
if (bucket.allowVerticalPlacement && !isPlaced && getPrevPlacement()) {
Expand Down Expand Up @@ -282,7 +281,8 @@ void Placement::placeBucket(

placeText = placed.first;
offscreen &= placed.second;
} else if (!textCollisionFeature.alongLine && !textCollisionFeature.boxes.empty()) {
} else if (!symbolInstance.textCollisionFeature.alongLine &&
!symbolInstance.textCollisionFeature.boxes.empty()) {
// If this symbol was in the last placement, shift the previously used
// anchor to the front of the anchor list, only if the previous anchor
// is still in the anchor list.
Expand All @@ -305,8 +305,13 @@ void Placement::placeBucket(
}
}

const auto placeFeatureForVariableAnchors = [&] (const CollisionFeature& collisionFeature, style::TextWritingModeType orientation) {
const CollisionBox& textBox = collisionFeature.boxes[0];
const bool doVariableIconPlacement =
hasIconTextFit && !iconAllowOverlap && symbolInstance.placedIconIndex;

const auto placeFeatureForVariableAnchors = [&](const CollisionFeature& textCollisionFeature,
style::TextWritingModeType orientation,
const CollisionFeature& iconCollisionFeature) {
const CollisionBox& textBox = textCollisionFeature.boxes[0];
const float width = textBox.x2 - textBox.x1;
const float height = textBox.y2 - textBox.y1;
const float textBoxScale = symbolInstance.textBoxScale;
Expand All @@ -323,12 +328,40 @@ void Placement::placeBucket(
}

textBoxes.clear();
placedFeature = collisionIndex.placeFeature(collisionFeature, shift,
posMatrix, mat4(), pixelRatio,
placedSymbol, scale, fontSize,
placedFeature = collisionIndex.placeFeature(textCollisionFeature,
shift,
posMatrix,
mat4(),
pixelRatio,
placedSymbol,
scale,
fontSize,
allowOverlap,
pitchWithMap,
params.showCollisionBoxes, avoidEdges, collisionGroup.second, textBoxes);
params.showCollisionBoxes,
avoidEdges,
collisionGroup.second,
textBoxes);

if (doVariableIconPlacement) {
auto placedIconFeature = collisionIndex.placeFeature(iconCollisionFeature,
shift,
posMatrix,
iconLabelPlaneMatrix,
pixelRatio,
placedSymbol,
scale,
fontSize,
iconAllowOverlap,
pitchWithMap,
params.showCollisionBoxes,
avoidEdges,
collisionGroup.second,
iconBoxes);
iconBoxes.clear();
if (!placedIconFeature.first) continue;
}

if (placedFeature.first) {
assert(symbolInstance.crossTileID != 0u);
optional<style::TextVariableAnchorType> prevAnchor;
Expand Down Expand Up @@ -366,12 +399,18 @@ void Placement::placeBucket(
};

const auto placeHorizontal = [&] {
return placeFeatureForVariableAnchors(symbolInstance.textCollisionFeature, style::TextWritingModeType::Horizontal);
return placeFeatureForVariableAnchors(symbolInstance.textCollisionFeature,
style::TextWritingModeType::Horizontal,
symbolInstance.iconCollisionFeature);
};

const auto placeVertical = [&] {
if (bucket.allowVerticalPlacement && !placed.first && symbolInstance.verticalTextCollisionFeature) {
return placeFeatureForVariableAnchors(*symbolInstance.verticalTextCollisionFeature, style::TextWritingModeType::Vertical);
return placeFeatureForVariableAnchors(*symbolInstance.verticalTextCollisionFeature,
style::TextWritingModeType::Vertical,
symbolInstance.verticalIconCollisionFeature
? *symbolInstance.verticalIconCollisionFeature
: symbolInstance.iconCollisionFeature);
}
return std::pair<bool, bool>{false, false};
};
Expand Down

0 comments on commit 99feb9b

Please sign in to comment.