fix hillshade layers with non-mercator projections (#11224)

mapbox · Nov 4, 2021 · 302e679 · 302e679
1 parent ddd5ce3
commit 302e679
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 10 deletions.
diff --git a/src/render/draw_hillshade.js b/src/render/draw_hillshade.js
@@ -116,7 +116,7 @@ function prepareHillshade(painter, tile, layer, depthMode, stencilMode, colorMod
     context.bindFramebuffer.set(fbo.framebuffer);
     context.viewport.set([0, 0, tileSize, tileSize]);
 
-    const {tileBoundsBuffer, tileBoundsIndexBuffer, tileBoundsSegments} = painter.getTileBoundsBuffers(tile);
+    const {tileBoundsBuffer, tileBoundsIndexBuffer, tileBoundsSegments} = painter.getMercatorTileBoundsBuffers();
 
     painter.useProgram('hillshadePrepare').draw(context, gl.TRIANGLES,
         depthMode, stencilMode, colorMode, CullFaceMode.disabled,

diff --git a/src/render/painter.js b/src/render/painter.js
@@ -280,20 +280,25 @@ class Painter {
         this.loadTimeStamps.push(window.performance.now());
     }
 
+    getMercatorTileBoundsBuffers() {
+        return {
+            tileBoundsBuffer: this.mercatorBoundsBuffer,
+            tileBoundsIndexBuffer: this.quadTriangleIndexBuffer,
+            tileBoundsSegments: this.mercatorBoundsSegments
+        };
+    }
+
     getTileBoundsBuffers(tile: Tile) {
-        let tileBoundsBuffer, tileBoundsIndexBuffer, tileBoundsSegments;
         tile._makeTileBoundsBuffers(this.context, this.transform.projection);
         if (tile._tileBoundsBuffer) {
-            tileBoundsBuffer = tile._tileBoundsBuffer;
-            tileBoundsIndexBuffer = tile._tileBoundsIndexBuffer;
-            tileBoundsSegments = tile._tileBoundsSegments;
+            const tileBoundsBuffer = tile._tileBoundsBuffer;
+            const tileBoundsIndexBuffer = tile._tileBoundsIndexBuffer;
+            const tileBoundsSegments = tile._tileBoundsSegments;
+            return {tileBoundsBuffer, tileBoundsIndexBuffer, tileBoundsSegments};
         } else {
-            tileBoundsBuffer = this.mercatorBoundsBuffer;
-            tileBoundsIndexBuffer = this.quadTriangleIndexBuffer;
-            tileBoundsSegments = this.mercatorBoundsSegments;
+            return this.getMercatorTileBoundsBuffers();
         }
 
-        return {tileBoundsBuffer, tileBoundsIndexBuffer, tileBoundsSegments};
     }
 
     /*

diff --git a/src/source/source_cache.js b/src/source/source_cache.js
@@ -738,7 +738,7 @@ class SourceCache extends Evented {
         const cached = Boolean(tile);
         if (!cached) {
             const painter = this.map ? this.map.painter : null;
-            tile = new Tile(tileID, this._source.tileSize * tileID.overscaleFactor(), this.transform.tileZoom, painter, this._source.type === 'raster');
+            tile = new Tile(tileID, this._source.tileSize * tileID.overscaleFactor(), this.transform.tileZoom, painter, this._source.type === 'raster' || this._source.type === 'raster-dem');
             this._loadTile(tile, this._tileLoaded.bind(this, tile, tileID.key, tile.state));
         }
 

diff --git a/test/integration/render-tests/hillshade/projected/expected.png b/test/integration/render-tests/hillshade/projected/expected.png
diff --git a/test/integration/render-tests/hillshade/projected/style.json b/test/integration/render-tests/hillshade/projected/style.json
@@ -0,0 +1,38 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "width": 256
+    }
+  },
+  "center": [-113.26903, 35.9654],
+  "zoom": 11,
+  "projection": {
+    "name": "albers"
+  },
+  "sources": {
+    "source": {
+      "type": "raster-dem",
+      "tiles": [
+        "local://tiles/{z}-{x}-{y}.terrain.png"
+      ],
+      "maxzoom": 15,
+      "tileSize": 256
+    }
+  },
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {
+        "background-color": "white"
+      }
+    },
+    {
+      "id": "hillshade",
+      "type": "hillshade",
+      "source": "source"
+    }
+  ]
+}