diff options
Diffstat (limited to 'src/mbgl/text/collision_index.cpp')
| -rw-r--r-- | src/mbgl/text/collision_index.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp index e75bdf8ba9..2f98ac6897 100644 --- a/src/mbgl/text/collision_index.cpp +++ b/src/mbgl/text/collision_index.cpp @@ -96,16 +96,18 @@ inline bool CollisionIndex::overlapsTile(const CollisionBoundaries& boundaries, boundaries[1] < tileBoundaries[3] && boundaries[3] > tileBoundaries[1]; } -bool CollisionIndex::featureIntersectsTileBorders(const CollisionFeature& feature, - Point<float> shift, - const mat4& posMatrix, - const float textPixelRatio, - const CollisionBoundaries& tileEdges) const { +FeatureLocation CollisionIndex::getFeatureLocation(const CollisionFeature& feature, + Point<float> shift, + const mat4& posMatrix, + const float textPixelRatio, + const CollisionBoundaries& tileEdges) const { assert(!feature.alongLine); assert(!feature.boxes.empty()); const CollisionBox& box = feature.boxes.front(); auto collisionBoundaries = getProjectedCollisionBoundaries(posMatrix, shift, textPixelRatio, box); - return overlapsTile(collisionBoundaries, tileEdges) && !isInsideTile(collisionBoundaries, tileEdges); + if (isInsideTile(collisionBoundaries, tileEdges)) return FeatureLocation::InsideTile; + if (overlapsTile(collisionBoundaries, tileEdges)) return FeatureLocation::IntersectsTileBorder; + return FeatureLocation::OutsideTile; } std::pair<bool, bool> CollisionIndex::placeFeature( |