summaryrefslogtreecommitdiff
path: root/src/mbgl/layout/symbol_instance.cpp
diff options
context:
space:
mode:
authorRyan Hamley <rshamley@gmail.com>2018-10-18 12:14:52 -0700
committerGitHub <noreply@github.com>2018-10-18 12:14:52 -0700
commit0c6b1629efb85386c0197868b2764c14f3fba940 (patch)
treeae6b98f5fc0fe5d6148e350d992736e180a9898c /src/mbgl/layout/symbol_instance.cpp
parent201db67ee8d2368f6ca22753799af3101832ea35 (diff)
downloadqtlocation-mapboxgl-0c6b1629efb85386c0197868b2764c14f3fba940.tar.gz
[Core] Ensure queryRenderedFeatures accounts for icon-rotate (#13105)
Diffstat (limited to 'src/mbgl/layout/symbol_instance.cpp')
-rw-r--r--src/mbgl/layout/symbol_instance.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp
index 2d60020dd4..139a42113c 100644
--- a/src/mbgl/layout/symbol_instance.cpp
+++ b/src/mbgl/layout/symbol_instance.cpp
@@ -23,15 +23,16 @@ SymbolInstance::SymbolInstance(Anchor& anchor_,
const std::size_t layoutFeatureIndex_,
const std::size_t dataFeatureIndex_,
const std::u16string& key_,
- const float overscaling) :
+ const float overscaling,
+ const float rotate) :
anchor(anchor_),
line(line_),
hasText(false),
hasIcon(shapedIcon),
// Create the collision features that will be used to check whether this symbol instance can be placed
- textCollisionFeature(line_, anchor, shapedTextOrientations.first, textBoxScale, textPadding, textPlacement, indexedFeature, overscaling),
- iconCollisionFeature(line_, anchor, shapedIcon, iconBoxScale, iconPadding, indexedFeature),
+ textCollisionFeature(line_, anchor, shapedTextOrientations.first, textBoxScale, textPadding, textPlacement, indexedFeature, overscaling, rotate),
+ iconCollisionFeature(line_, anchor, shapedIcon, iconBoxScale, iconPadding, indexedFeature, rotate),
layoutFeatureIndex(layoutFeatureIndex_),
dataFeatureIndex(dataFeatureIndex_),
textOffset(textOffset_),