From e7c415de7b477b8b844c36b27678b334d81afd46 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis@mapbox.com>
Date: Mon, 25 Nov 2019 21:32:09 -0500
Subject: [PATCH 1/2] fix really overscaled lines

We resample lines after sharp corners in some situations. Doing this for
really overscaled tiles mean that sometimes the offset to the new vertex
was closer than the precision supported. This disables that after a
certain point.

fix #9009
---
 src/data/bucket/line_bucket.js                |   4 +-
 .../mapbox-gl-js#9009/expected.png            | Bin 0 -> 8060 bytes
 .../regressions/mapbox-gl-js#9009/style.json  |  44 ++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#9009/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index 4e1f31c65d7..7e11a4fdae4 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -250,7 +250,9 @@ class LineBucket implements Bucket {
 
         if (join === 'bevel') miterLimit = 1.05;
 
-        const sharpCornerOffset = SHARP_CORNER_OFFSET * (EXTENT / (512 * this.overscaling));
+        const sharpCornerOffset = this.overscaling <= 16 ?
+            SHARP_CORNER_OFFSET * EXTENT / (512 * this.overscaling) :
+            0;
 
         // we could be more precise, but it would only save a negligible amount of space
         const segment = this.segments.prepareSegment(len * 10, this.layoutVertexArray, this.indexArray);
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#9009/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#9009/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b14d5740582c0c51d433ecc09a80872beec3328b
GIT binary patch
literal 8060
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

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json
new file mode 100644
index 00000000000..59b1f474e5f
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json
@@ -0,0 +1,44 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256
+    }
+  },
+  "center": [
+      0,
+      0
+  ],
+  "zoom": 18,
+  "sources": {
+    "line": {
+      "type": "geojson",
+      "maxzoom": 10,
+      "data": {
+          "type": "Feature",
+          "geometry": {
+              "type": "LineString",
+              "coordinates": [[-180, 70], [0, 0], [100, 80]]
+          }
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "road",
+      "type": "line",
+      "source": "line",
+      "paint": {
+        "line-width": 20,
+        "line-color": "#000"
+      }
+    }
+  ]
+}

From 0a8092aae83e239c5cd21b884e7b4b22955337c5 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis@mapbox.com>
Date: Tue, 26 Nov 2019 13:19:39 -0500
Subject: [PATCH 2/2] make test smaller

---
 .../mapbox-gl-js#9009/expected.png            | Bin 8060 -> 2372 bytes
 .../regressions/mapbox-gl-js#9009/style.json  |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#9009/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#9009/expected.png
index b14d5740582c0c51d433ecc09a80872beec3328b..c6f451504a09396640a33f593af615f166cec127 100644
GIT binary patch
literal 2372
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
G8~YzuN{Pt;

literal 8060
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

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json
index 59b1f474e5f..f6c9625ad2e 100644
--- a/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#9009/style.json
@@ -2,7 +2,8 @@
   "version": 8,
   "metadata": {
     "test": {
-      "height": 256
+      "height": 100,
+      "width": 100
     }
   },
   "center": [