summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/symbol_bucket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/renderer/symbol_bucket.cpp')
-rw-r--r--src/mbgl/renderer/symbol_bucket.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index f53bbfa954..9d9636b399 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -238,9 +238,26 @@ void SymbolBucket::addFeature(const std::vector<Coordinate> &line, const Shaping
Anchors anchors;
if (properties.placement == PlacementType::Line) {
+ float textResampleOffset = 0;
+ float iconResampleOffset = 0;
+
+ if (shaping.size()) {
+ float minX = std::numeric_limits<float>::infinity();
+ float maxX = -std::numeric_limits<float>::infinity();
+ for (const auto &glyph : shaping) {
+ minX = std::min(minX, glyph.x);
+ maxX = std::max(maxX, glyph.x);
+ }
+ const float labelLength = maxX - minX;
+ textResampleOffset = (labelLength / 2.0 + glyphSize) * fontScale;
+ }
+ if (image) {
+ iconResampleOffset = image.w;
+ }
+
// Line labels
anchors = resample(line, properties.min_distance, minScale, collision.maxPlacementScale,
- collision.tilePixelRatio);
+ collision.tilePixelRatio, std::max(iconResampleOffset, textResampleOffset));
// Sort anchors by segment so that we can start placement with the
// anchors that can be shown at the lowest zoom levels.