From 99bfc7f5e905ac40507cd3d78ffa97bc744934b7 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Mon, 27 Jan 2020 20:25:11 +0200
Subject: [PATCH] Fix a bug where lines with duplicate endpoint disappear on
 z18+ (#9218)

* fix a bug with vanishing line with duplicate end points

* fix flow :(
---
 src/data/bucket/line_bucket.js                |   4 +-
 src/style-spec/types.js                       |   6 +--
 .../mapbox-gl-js#5171/expected.png            | Bin 0 -> 800 bytes
 .../regressions/mapbox-gl-js#5171/style.json  |  35 ++++++++++++++++++
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5171/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5171/style.json

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index d15b18a4c8d..bb63e4d3a4e 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -274,8 +274,8 @@ class LineBucket implements Bucket {
 
         for (let i = first; i < len; i++) {
 
-            nextVertex = isPolygon && i === len - 1 ?
-                vertices[first + 1] : // if the line is closed, we treat the last vertex like the first
+            nextVertex = i === len - 1 ?
+                (isPolygon ? vertices[first + 1] : (undefined: any)) : // if it's a polygon, treat the last vertex like the first
                 vertices[i + 1]; // just the next vertex
 
             // if two consecutive vertices exist, skip the current one
diff --git a/src/style-spec/types.js b/src/style-spec/types.js
index bd74a4f62ba..ecfab1078b5 100644
--- a/src/style-spec/types.js
+++ b/src/style-spec/types.js
@@ -88,7 +88,8 @@ export type VectorSourceSpecification = {
     "scheme"?: "xyz" | "tms",
     "minzoom"?: number,
     "maxzoom"?: number,
-    "attribution"?: string
+    "attribution"?: string,
+    "promoteId"?: PromoteIdSpecification
 }
 
 export type RasterSourceSpecification = {
@@ -112,8 +113,7 @@ export type RasterDEMSourceSpecification = {
     "maxzoom"?: number,
     "tileSize"?: number,
     "attribution"?: string,
-    "encoding"?: "terrarium" | "mapbox",
-    "promoteId"?: PromoteIdSpecification
+    "encoding"?: "terrarium" | "mapbox"
 }
 
 export type GeoJSONSourceSpecification = {|
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5171/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#5171/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..8784429cebc22d5e70e9a32eed65a54a03f2259d
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0008#Nkl<ZcmdVH
zPl%Lt9LMqZ=b0yroj-{N5<(pc3Ooqy&g?>k>@zC~2?Zivf`S4MUW9}K55MOJMYkw0
zD2RwCDC!guR<qAWMCr_iorEMJA%cP=cb>6ucb~5vIz))M`}}5S=JgU2uAj_2E=4JD
zH=7_P)L{SYY_V=$;$cb<6XtTexl`aHbc_JR1nDQO<AM}%8zmX`mrO2Z0^|#=N6gF%
zrU}5{jYw;*x_IsvF~%;>&)i#4<Pk>*pfLLa!!?$AU-FNbF=U4iSMp02z2GDP81}P}
zYh=AQ`42H>@^<qH121$J0m$sdshxvVADq9+b;OK`EBogjDAo%Pv_*M_eP|}v$a?3w
z0Wo6zWOf%SywFhsFyp%@lB;&ke#A|P8KHjCd`6fDRVmH#2;5ZGdx;GYBQR*U9xX60
zw3h%3UL&fw`sd&L#s-Nk)SqweL3l}r2*Kz?R=BC9<*(VKm@RPOz&+dUSlf}xc#a_K
zCy=XU-M1-83|XGEo-&yi+D!mvJYRdL>*Og2Kn%&s!puGuk(by<5cXaS?$*WL1p*R*
z4U)Ots7MW-CIB;*70J~)XFp*GL_m4ceAd8A+D3VQm=$R~TYiNhiV0w)J$neu1A9aW
zc51Csaoa!ZUSh~Z3Hf|$FOj97#|XfT(-D!YW@ox=k(f=egVR&_pOFVnfGE#?Fi7iJ
z?_IW-*r1i9bu^NB&@KWfjI@z;JtGoxlllwIwhB_jgCGKUr$XUs+47H!koX^07N+l9
zw~7}$NeE_Vh)8Rl-lvQKaRYhMJZa!1RVc}f-vL+8y00=u#C7!BGe<;}0{0Pwy<ELT
zPN%yojG35!$&<PJjlv5K5`c`4S54{mrS7+kDe*Tu&}s};&4Z2;fWh}rxccJq`;0mD
zlh!eb6u6y|%xqoYYFY0ECPXZ8iU17WTD7%w$I`irOpute%)YXSwBG40GJ#??&3={1
eRkPmfOt5Q_Toc+I;qedv0000<MNUMnLSTX#U2pLK

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5171/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#5171/style.json
new file mode 100644
index 00000000000..bbcbe066ed0
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#5171/style.json
@@ -0,0 +1,35 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 32
+    }
+  },
+  "center": [-0.63938, 44.77458],
+  "zoom": 18,
+  "sources": {
+    "geojson": {
+      "type": "geojson",
+      "data": {
+        "type": "LineString",
+        "coordinates": [
+          [-0.639208, 44.774651],
+          [-0.639605, 44.774487],
+          [-0.639605, 44.774487]
+        ]
+      }
+    }
+  },
+  "layers": [
+    {
+      "id": "line",
+      "type": "line",
+      "source": "geojson",
+      "paint": {
+        "line-color": "#f44336",
+        "line-width": 10
+      }
+    }
+  ]
+}