From 7ca8f72b7cf8058be3a463f5b00621c33783b1ac Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis@mapbox.com>
Date: Thu, 6 May 2021 06:08:32 -0400
Subject: [PATCH] fix dashed lines with square line caps (#9561)

* fix "line-dasharray" with "line-cap": "square"

fix #9531

* remove leftover

Co-authored-by: Vladimir Agafonkin <agafonkin@gmail.com>
---
 src/data/bucket/line_bucket.js                |  42 +++++++++++-------
 src/render/draw_line.js                       |   5 +--
 src/render/line_atlas.js                      |  22 ++++-----
 test/ignores.json                             |   1 -
 .../line-dasharray/case/square/expected.png   | Bin 9458 -> 3581 bytes
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js
index 0c620c747dc..13ce96de051 100644
--- a/src/data/bucket/line_bucket.js
+++ b/src/data/bucket/line_bucket.js
@@ -206,12 +206,12 @@ class LineBucket implements Bucket {
                 hasFeatureDashes = true;
 
             } else {
-                const round = capPropertyValue.value === 'round';
+                const constCap = capPropertyValue.value;
                 const constDash = dashPropertyValue.value;
                 if (!constDash) continue;
-                lineAtlas.addDash(constDash.from, round);
-                lineAtlas.addDash(constDash.to, round);
-                if (constDash.other) lineAtlas.addDash(constDash.other, round);
+                lineAtlas.addDash(constDash.from, constCap);
+                lineAtlas.addDash(constDash.to, constCap);
+                if (constDash.other) lineAtlas.addDash(constDash.other, constCap);
             }
         }
 
@@ -228,7 +228,7 @@ class LineBucket implements Bucket {
 
             if (dashPropertyValue.kind === 'constant' && capPropertyValue.kind === 'constant') continue;
 
-            let minDashArray, midDashArray, maxDashArray, minRound, midRound, maxRound;
+            let minDashArray, midDashArray, maxDashArray, minCap, midCap, maxCap;
 
             if (dashPropertyValue.kind === 'constant') {
                 const constDash = dashPropertyValue.value;
@@ -244,21 +244,21 @@ class LineBucket implements Bucket {
             }
 
             if (capPropertyValue.kind === 'constant') {
-                minRound = midRound = maxRound = capPropertyValue.value === 'round';
+                minCap = midCap = maxCap = capPropertyValue.value;
 
             } else {
-                minRound = capPropertyValue.evaluate({zoom: zoom - 1}, feature) === 'round';
-                midRound = capPropertyValue.evaluate({zoom}, feature) === 'round';
-                maxRound = capPropertyValue.evaluate({zoom: zoom + 1}, feature) === 'round';
+                minCap = capPropertyValue.evaluate({zoom: zoom - 1}, feature);
+                midCap = capPropertyValue.evaluate({zoom}, feature);
+                maxCap = capPropertyValue.evaluate({zoom: zoom + 1}, feature);
             }
 
-            lineAtlas.addDash(minDashArray, minRound);
-            lineAtlas.addDash(midDashArray, midRound);
-            lineAtlas.addDash(maxDashArray, maxRound);
+            lineAtlas.addDash(minDashArray, minCap);
+            lineAtlas.addDash(midDashArray, midCap);
+            lineAtlas.addDash(maxDashArray, maxCap);
 
-            const min = lineAtlas.getKey(minDashArray, minRound);
-            const mid = lineAtlas.getKey(midDashArray, midRound);
-            const max = lineAtlas.getKey(maxDashArray, maxRound);
+            const min = lineAtlas.getKey(minDashArray, minCap);
+            const mid = lineAtlas.getKey(midDashArray, midCap);
+            const max = lineAtlas.getKey(maxDashArray, maxCap);
 
             // save positions for paint array
             feature.patterns[layer.id] = {min, mid, max};
@@ -540,7 +540,17 @@ class LineBucket implements Bucket {
 
             } else if (currentJoin === 'square') {
                 const offset = prevVertex ? 1 : -1; // closing or starting square cap
-                this.addCurrentVertex(currentVertex, joinNormal, offset, offset, segment);
+
+                if (!prevVertex) {
+                    this.addCurrentVertex(currentVertex, joinNormal, offset, offset, segment);
+                }
+
+                // make the cap it's own quad to avoid the cap affecting the line distance
+                this.addCurrentVertex(currentVertex, joinNormal, 0, 0, segment);
+
+                if (prevVertex) {
+                    this.addCurrentVertex(currentVertex, joinNormal, offset, offset, segment);
+                }
 
             } else if (currentJoin === 'round') {
 
diff --git a/src/render/draw_line.js b/src/render/draw_line.js
index a8a95a52256..aeed831936c 100644
--- a/src/render/draw_line.js
+++ b/src/render/draw_line.js
@@ -70,9 +70,8 @@ export default function drawLine(painter: Painter, sourceCache: SourceCache, lay
 
         if (!image && constantDash && constantCap && tile.lineAtlas) {
             const atlas = tile.lineAtlas;
-            const round = constantCap === 'round';
-            const posTo = atlas.getDash(constantDash.to, round);
-            const posFrom = atlas.getDash(constantDash.from, round);
+            const posTo = atlas.getDash(constantDash.to, constantCap);
+            const posFrom = atlas.getDash(constantDash.from, constantCap);
             if (posTo && posFrom) programConfiguration.setConstantPatternPositions(posTo, posFrom);
         }
 
diff --git a/src/render/line_atlas.js b/src/render/line_atlas.js
index f8d0fb620e1..46a5672a236 100644
--- a/src/render/line_atlas.js
+++ b/src/render/line_atlas.js
@@ -34,12 +34,12 @@ class LineAtlas {
      * Get a dash line pattern.
      *
      * @param {Array<number>} dasharray
-     * @param {boolean} round whether to add circle caps in between dash segments
+     * @param {string} lineCap the type of line caps to be added to dashes
      * @returns {Object} position of dash texture in { y, height, width }
      * @private
      */
-    getDash(dasharray: Array<number>, round: boolean) {
-        const key = this.getKey(dasharray, round);
+    getDash(dasharray: Array<number>, lineCap: string) {
+        const key = this.getKey(dasharray, lineCap);
         return this.positions[key];
     }
 
@@ -49,8 +49,8 @@ class LineAtlas {
         this.image.resize({width, height});
     }
 
-    getKey(dasharray: Array<number>, round: boolean): string {
-        return dasharray.join(',') + String(round);
+    getKey(dasharray: Array<number>, lineCap: string): string {
+        return dasharray.join(',') + lineCap;
     }
 
     getDashRanges(dasharray: Array<number>, lineAtlasWidth: number, stretch: number) {
@@ -111,7 +111,7 @@ class LineAtlas {
         }
     }
 
-    addRegularDash(ranges: Object) {
+    addRegularDash(ranges: Object, capLength: number) {
 
         // Collapse any zero-length range
         // Collapse neighbouring same-type parts into a single part
@@ -147,14 +147,15 @@ class LineAtlas {
             const distRight = Math.abs(x - range.right);
 
             const minDist = Math.min(distLeft, distRight);
-            const signedDistance = range.isDash ? minDist : -minDist;
+            const signedDistance = (range.isDash ? minDist : -minDist) + capLength;
 
             this.image.data[index + x] = Math.max(0, Math.min(255, signedDistance + 128));
         }
     }
 
-    addDash(dasharray: Array<number>, round: boolean) {
-        const key = this.getKey(dasharray, round);
+    addDash(dasharray: Array<number>, lineCap: string) {
+        const key = this.getKey(dasharray, lineCap);
+        const round = lineCap === 'round';
         const n = round ? 7 : 0;
         const height = 2 * n + 1;
 
@@ -185,7 +186,8 @@ class LineAtlas {
             if (round) {
                 this.addRoundDash(ranges, stretch, n);
             } else {
-                this.addRegularDash(ranges);
+                const capLength = lineCap === 'square' ? 0.5 * stretch : 0;
+                this.addRegularDash(ranges, capLength);
             }
         }
 
diff --git a/test/ignores.json b/test/ignores.json
index 53191757fc0..c3a536134dc 100644
--- a/test/ignores.json
+++ b/test/ignores.json
@@ -10,7 +10,6 @@
   "render-tests/geojson/inline-linestring-fill": "skip - current behavior is arbitrary",
   "render-tests/icon-image/icon-sdf-non-sdf-one-layer": "skip - render sdf icon and normal icon in one layer",
   "render-tests/icon-text-fit/text-variable-anchor-tile-map-mode": "skip - mapbox-gl-js does not support tile-mode",
-  "render-tests/line-dasharray/case/square": "skip - https://github.com/mapbox/mapbox-gl-js/issues/9531",
   "render-tests/map-mode/static": "https://github.com/mapbox/mapbox-gl-js/issues/5649",
   "render-tests/map-mode/tile": "skip - mapbox-gl-js does not support tile-mode",
   "render-tests/map-mode/tile-avoid-edges": "skip - mapbox-gl-js does not support tile-mode",
diff --git a/test/integration/render-tests/line-dasharray/case/square/expected.png b/test/integration/render-tests/line-dasharray/case/square/expected.png
index 950a308bc81edef8c4a2812c8703f3782cd372d7..40aa45378f90b8b029c2d9678d76260b24b63c13 100644
GIT binary patch
literal 3581
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
F@jrE+xYqyx

literal 9458
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
D&Q-)q