[core] Fix really overscaled lines #16018

mapbox · Dec 17, 2019 · 864aa11 · 864aa11
1 parent 493d2ca
commit 864aa11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/metrics/ignores/platform-all.json b/metrics/ignores/platform-all.json
@@ -111,7 +111,6 @@
     "render-tests/regressions/mapbox-gl-js#7708": "skip - js specific",
     "render-tests/regressions/mapbox-gl-js#8026": "skip - js specific",
     "render-tests/regressions/mapbox-gl-js#8817": "skip - https://github.com/mapbox/mapbox-gl-native/issues/15737",
-    "render-tests/regressions/mapbox-gl-js#9009": "https://github.com/mapbox/mapbox-gl-native/issues/16018",
     "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357",
     "render-tests/runtime-styling/image-add-remove-add": "skip - https://github.com/mapbox/mapbox-gl-native/issues/16021",
     "render-tests/runtime-styling/pattern-add-remove-add": "skip - https://github.com/mapbox/mapbox-gl-native/issues/16021",

diff --git a/src/mbgl/renderer/buckets/line_bucket.cpp b/src/mbgl/renderer/buckets/line_bucket.cpp
@@ -129,18 +129,19 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates, const Geome
             total_length += util::dist<double>(coordinates[i], coordinates[i + 1]);
         }
 
-        lineDistances = Distances{*numericValue<double>(clip_start_it->second),
-                                  *numericValue<double>(clip_end_it->second),
-                                  total_length};
+        lineDistances = Distances{
+            *numericValue<double>(clip_start_it->second), *numericValue<double>(clip_end_it->second), total_length};
     }
 
     const LineJoinType joinType = layout.evaluate<LineJoin>(zoom, feature);
 
     const float miterLimit = joinType == LineJoinType::Bevel ? 1.05f : float(layout.get<LineMiterLimit>());
 
-    const double sharpCornerOffset = overscaling == 0 ?
-                                    SHARP_CORNER_OFFSET * (float(util::EXTENT) / util::tileSize) :
-                                    SHARP_CORNER_OFFSET * (float(util::EXTENT) / (util::tileSize * overscaling));
+    const double sharpCornerOffset =
+        overscaling == 0
+            ? SHARP_CORNER_OFFSET * (float(util::EXTENT) / util::tileSize)
+            : (overscaling <= 16.0 ? SHARP_CORNER_OFFSET * (float(util::EXTENT) / (util::tileSize * overscaling))
+                                   : 0.0f);
 
     const GeometryCoordinate firstCoordinate = coordinates[first];
     const LineCapType beginCap = layout.get<LineCap>();