From 1d5408d7eaf3c1f681da09d6e5d27b0c4af37740 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Tue, 9 Jan 2018 15:52:54 -0800
Subject: [PATCH] Don't place layers hidden by min/maxzoom constraints. Fixes
 issue #5776.

---
 src/style/pauseable_placement.js              |   5 +-
 .../mapbox-gl-js#5776/expected.png            | Bin 0 -> 3967 bytes
 .../regressions/mapbox-gl-js#5776/style.json  |  85 ++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5776/expected.png
 create mode 100644 test/integration/render-tests/regressions/mapbox-gl-js#5776/style.json

diff --git a/src/style/pauseable_placement.js b/src/style/pauseable_placement.js
index 16393b83fc1..358ac3f8e2c 100644
--- a/src/style/pauseable_placement.js
+++ b/src/style/pauseable_placement.js
@@ -63,7 +63,10 @@ class PauseablePlacement {
         while (this._currentPlacementIndex >= 0) {
             const layerId = order[this._currentPlacementIndex];
             const layer = layers[layerId];
-            if (layer.type === 'symbol') {
+            const placementZoom = this.placement.collisionIndex.transform.zoom;
+            if (layer.type === 'symbol' &&
+                (!layer.minzoom || layer.minzoom <= placementZoom) &&
+                (!layer.maxzoom || layer.maxzoom >= placementZoom)) {
 
                 if (!this._inProgressLayer) {
                     this._inProgressLayer = new LayerPlacement();
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5776/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#5776/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..618f5497c28b65d1fd983ecf6a93c97f1d34f93e
GIT binary patch
literal 3967
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
LLqz%AN1^`*^uTO1

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#5776/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#5776/style.json
new file mode 100644
index 00000000000..7670ff58a2b
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#5776/style.json
@@ -0,0 +1,85 @@
+{
+    "version": 8,
+    "metadata": {
+        "test": {
+            "width": 256,
+            "height": 256
+        }
+    },
+    "center": [
+        0,
+        0
+    ],
+    "zoom": 0.5,
+    "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+    "sources": {
+        "geojson": {
+            "type": "geojson",
+            "data": {
+                "type": "MultiPoint",
+                "coordinates": [
+                    [
+                        0,
+                        0
+                    ]
+                ]
+            }
+        }
+    },
+    "layers": [
+        {
+          "id": "background",
+          "type": "background",
+          "paint": {
+            "background-color": "white"
+          }
+        },
+        {
+            "id": "bottom",
+            "type": "symbol",
+            "source": "geojson",
+            "layout": {
+                "text-field": "Bottom Layer",
+                "text-font": [
+                    "Open Sans Semibold",
+                    "Arial Unicode MS Bold"
+                ]
+            },
+            "paint": {
+                "text-color": "black"
+            }
+        },
+        {
+            "id": "middle",
+            "type": "symbol",
+            "source": "geojson",
+            "minzoom": 0.8,
+            "layout": {
+                "text-field": "Middle Minzoom Layer",
+                "text-font": [
+                    "Open Sans Semibold",
+                    "Arial Unicode MS Bold"
+                ]
+            },
+            "paint": {
+                "text-color": "blue"
+            }
+        },
+        {
+            "id": "top",
+            "type": "symbol",
+            "source": "geojson",
+            "maxzoom": 0.3,
+            "layout": {
+                "text-field": "Top Maxzoom Layer",
+                "text-font": [
+                    "Open Sans Semibold",
+                    "Arial Unicode MS Bold"
+                ]
+            },
+            "paint": {
+                "text-color": "blue"
+            }
+        }
+    ]
+}