summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_feature.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-06 16:11:29 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-07 17:56:38 +0200
commitf3191dbbb48f6700419f193ff68cf86a50336190 (patch)
treec1b0bf865ccd74cc0c17a1ba165938c348bb688c /src/mbgl/text/collision_feature.hpp
parent1845919c25e5ff8845183e1d3e1eeed0b2f09e0c (diff)
downloadqtlocation-mapboxgl-f3191dbbb48f6700419f193ff68cf86a50336190.tar.gz
[core] change bool *AlongLine to SymbolPlacementType
Diffstat (limited to 'src/mbgl/text/collision_feature.hpp')
-rw-r--r--src/mbgl/text/collision_feature.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp
index 5c0095bc6d..12c14fe0c1 100644
--- a/src/mbgl/text/collision_feature.hpp
+++ b/src/mbgl/text/collision_feature.hpp
@@ -35,22 +35,22 @@ namespace mbgl {
// for text
explicit CollisionFeature(const GeometryCoordinates &line, const Anchor &anchor,
const Shaping &shapedText,
- const float boxScale, const float padding, const bool alongLine, const IndexedSubfeature& indexedFeature_)
+ const float boxScale, const float padding, const style::SymbolPlacementType placement, const IndexedSubfeature& indexedFeature_)
: CollisionFeature(line, anchor,
shapedText.top, shapedText.bottom, shapedText.left, shapedText.right,
- boxScale, padding, alongLine, indexedFeature_, false) {}
+ boxScale, padding, placement, indexedFeature_, false) {}
// for icons
explicit CollisionFeature(const GeometryCoordinates &line, const Anchor &anchor,
const PositionedIcon &shapedIcon,
- const float boxScale, const float padding, const bool alongLine, const IndexedSubfeature& indexedFeature_)
+ const float boxScale, const float padding, const style::SymbolPlacementType placement, const IndexedSubfeature& indexedFeature_)
: CollisionFeature(line, anchor,
shapedIcon.top, shapedIcon.bottom, shapedIcon.left, shapedIcon.right,
- boxScale, padding, alongLine, indexedFeature_, true) {}
+ boxScale, padding, placement, indexedFeature_, true) {}
explicit CollisionFeature(const GeometryCoordinates &line, const Anchor &anchor,
const float top, const float bottom, const float left, const float right,
- const float boxScale, const float padding, const bool alongLine,
+ const float boxScale, const float padding, const style::SymbolPlacementType placement,
IndexedSubfeature, const bool straight);