Fix incorrect style serialization when using raster DEM tile sources (#…

…10418)
mapbox · Mar 2, 2021 · e1942b3 · e1942b3
1 parent 7325e2d
commit e1942b3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/source/raster_dem_tile_source.js b/src/source/raster_dem_tile_source.js
@@ -28,17 +28,6 @@ class RasterDEMTileSource extends RasterTileSource implements Source {
         this.encoding = options.encoding || "mapbox";
     }
 
-    serialize() {
-        return {
-            type: 'raster-dem',
-            url: this.url,
-            tileSize: this.tileSize,
-            tiles: this.tiles,
-            bounds: this.bounds,
-            encoding: this.encoding
-        };
-    }
-
     loadTile(tile: Tile, callback: Callback<void>) {
         const url = this.map._requestManager.normalizeTileURL(tile.tileID.canonical.url(this.tiles, this.scheme), false, this.tileSize);
         tile.request = getImage(this.map._requestManager.transformRequest(url, ResourceType.Tile), imageLoaded.bind(this));

diff --git a/test/unit/source/raster_dem_tile_source.test.js b/test/unit/source/raster_dem_tile_source.test.js
@@ -3,6 +3,7 @@ import RasterDEMTileSource from '../../../src/source/raster_dem_tile_source.js';
 import window from '../../../src/util/window.js';
 import {OverscaledTileID} from '../../../src/source/tile_id.js';
 import {RequestManager} from '../../../src/util/mapbox.js';
+import {extend} from '../../../src/util/util.js';
 
 function createSource(options, transformCallback) {
     const source = new RasterDEMTileSource('id', options, {send() {}}, options.eventedParent);
@@ -30,6 +31,28 @@ test('RasterTileSource', (t) => {
         callback();
     });
 
+    t.test('create and serialize source', (t) => {
+        window.server.respondWith('/source.json', JSON.stringify({}));
+        const transformSpy = t.spy((url) => {
+            return {url};
+        });
+        const options = {
+            url: "/source.json",
+            minzoom: 0,
+            maxzoom: 22,
+            attribution: "Mapbox",
+            tiles: ["http://example.com/{z}/{x}/{y}.png"],
+            bounds: [-47, -7, -45, -5],
+            encoding: "terrarium",
+            tileSize: 512,
+            volatile: false
+        };
+        const source = createSource(options, transformSpy);
+        source.load();
+        t.deepEqual(source.serialize(), extend({type: "raster-dem"}, options));
+        t.end();
+    });
+
     t.test('transforms request for TileJSON URL', (t) => {
         window.server.respondWith('/source.json', JSON.stringify({
             minzoom: 0,