Fix terrain "source" error being fired when using map.getStyle() wi…

…th globe view (#12163) * fix terrain error being fired with globe projection, added unit tests
mapbox · Aug 22, 2022 · d45dcaf · d45dcaf
1 parent b5ac1da
commit d45dcaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/style/style.js b/src/style/style.js
@@ -1222,12 +1222,13 @@ class Style extends Evented {
                 sources[source.id] = source.serialize();
             }
         }
+
         return filterObject({
             version: this.stylesheet.version,
             name: this.stylesheet.name,
             metadata: this.stylesheet.metadata,
             light: this.stylesheet.light,
-            terrain: this.stylesheet.terrain,
+            terrain: this.getTerrain() || undefined,
             fog: this.stylesheet.fog,
             center: this.stylesheet.center,
             zoom: this.stylesheet.zoom,

diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
@@ -341,6 +341,7 @@ test('Map', (t) => {
                 t.equal(initStyleObj.setTerrain.callCount, 1);
                 t.ok(map.style.terrain);
                 t.equal(map.getTerrain(), null);
+                t.equal(map.getStyle().terrain, undefined);
                 t.end();
             });
         });
@@ -356,6 +357,7 @@ test('Map', (t) => {
                 t.equal(initStyleObj.setTerrain.callCount, 1);
                 t.ok(map.style.terrain);
                 t.equal(map.getTerrain(), null);
+                t.equal(map.getStyle().terrain, undefined);
                 map.setZoom(12); // Above threshold for Mercator transition
                 map.once('render', () => {
                     t.notOk(map.style.terrain);
@@ -375,11 +377,13 @@ test('Map', (t) => {
                 t.equal(initStyleObj.setTerrain.callCount, 0);
                 t.notOk(map.style.terrain);
                 t.equal(map.getTerrain(), null);
+                t.equal(map.getStyle().terrain, undefined);
                 map.setZoom(3); // Below threshold for Mercator transition
                 map.once('render', () => {
                     t.equal(initStyleObj.setTerrain.callCount, 1);
                     t.ok(map.style.terrain);
                     t.equal(map.getTerrain(), null);
+                    t.equal(map.getStyle().terrain, undefined);
                     t.end();
                 });
             });