From 3d7201fd2546e1a69dca589a9f14b54004ec0c23 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Tue, 2 Jan 2018 13:51:09 -0800
Subject: [PATCH] Regression test for issue #5911.

---
 .../mapbox-gl-js#5911/expected.png            | Bin 0 -> 9000 bytes
 .../regressions/mapbox-gl-js#5911/style.json  |  61 ++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5911/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5911/style.json

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5911/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#5911/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..af29b58146ece4888c2efb169ccacb96cee69643
GIT binary patch
literal 9000
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
YTblCX?2mo$|4w%9NZsD}=DR2V2lrx;9smFU

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5911/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#5911/style.json
new file mode 100644
index 00000000000..a8c9e153f66
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#5911/style.json
@@ -0,0 +1,61 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "collisionDebug": true,
+      "width": 256,
+      "height": 2048,
+      "description": "Issue #5911 caused items in the distance on a pitched map to have collision boxes that were too small, although the debug box drew correctly. Before the fix, this test would show both labels, with the boxes visibly overlapping."
+    }
+  },
+  "center": [
+    0,
+    70
+  ],
+  "zoom": 5,
+  "pitch": 60,
+  "bearing": 0,
+  "sources": {
+      "geojson": {
+        "type": "geojson",
+        "data": {
+          "type": "MultiPoint",
+          "coordinates": [
+            [
+              -0.8,
+              81.25
+            ],
+            [
+              1,
+              82
+            ]
+          ]
+        }
+      }
+  },
+  "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+  "sprite": "local://sprites/sprite",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "symbol",
+      "type": "symbol",
+      "source": "geojson",
+      "layout": {
+        "symbol-placement": "point",
+        "text-field": "test\ntest test\ntest",
+        "text-pitch-alignment": "viewport",
+        "text-font": [
+          "Open Sans Semibold",
+          "Arial Unicode MS Bold"
+        ]
+      }
+    }
+  ]
+}