From 1046bc70f4a37762118e708aa0cdd82d771be485 Mon Sep 17 00:00:00 2001
From: Anna Peery <42715836+avpeery@users.noreply.github.com>
Date: Tue, 31 May 2022 08:46:04 -0700
Subject: [PATCH] Fix setStyle breaking with globe view (#11913)

* set draping for terrain

* use map option for terrain draping check

* move to one line

* wip: add render test

* fixed error with render test

* demonstrate issue with mercator

* fix background id to update in second setStyle call

* bring zoom out to show sphere

* Updating expected.png

* better readability

* fix conditional

* fix lint

Co-authored-by: Aidan H <aidan.hendrickson@mapbox.com>
---
 src/ui/map.js                                 |   2 +
 .../globe-set-style/default/expected.png      | Bin 0 -> 3100 bytes
 .../globe/globe-set-style/default/style.json  |  60 ++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 test/integration/render-tests/globe/globe-set-style/default/expected.png
 create mode 100644 test/integration/render-tests/globe/globe-set-style/default/style.json

diff --git a/src/ui/map.js b/src/ui/map.js
index 09d366f8551..bcc4e268c11 100755
--- a/src/ui/map.js
+++ b/src/ui/map.js
@@ -1208,6 +1208,8 @@ class Map extends Camera {
             }
             this.style.applyProjectionUpdate();
             this._update(true);
+        } else if (this.transform.projection.requiresDraping && !this.getTerrain() && !this.style.stylesheet.terrain) {
+            this.style.setTerrainForDraping();
         }
 
         return this;
diff --git a/test/integration/render-tests/globe/globe-set-style/default/expected.png b/test/integration/render-tests/globe/globe-set-style/default/expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..53c7d3942333006a408f6e6af7bc141ed8fbe007
GIT binary patch
literal 3100
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

literal 0
HcmV?d00001

diff --git a/test/integration/render-tests/globe/globe-set-style/default/style.json b/test/integration/render-tests/globe/globe-set-style/default/style.json
new file mode 100644
index 00000000000..9d497e81a64
--- /dev/null
+++ b/test/integration/render-tests/globe/globe-set-style/default/style.json
@@ -0,0 +1,60 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "height": 256,
+      "width": 256,
+      "operations": [
+        ["setStyle", {
+          "version": 8,
+          "projection": {"name": "globe"},
+          "sources": {
+            "mapbox": {
+              "type": "vector",
+              "maxzoom": 14,
+              "tiles": [
+                "local://tiles/{z}-{x}-{y}.mvt"
+              ]
+            }
+          },
+          "layers": [
+            {
+              "id": "background1",
+              "type": "background",
+              "paint": {
+                "background-color": "rgb(255,89,252)"
+              }
+            }
+          ]
+        }],
+        ["wait"],
+        ["setStyle", {
+          "version": 8,
+          "projection": {"name": "globe"},
+          "sources": {
+            "mapbox": {
+              "type": "vector",
+              "maxzoom": 14,
+              "tiles": [
+                "local://tiles/{z}-{x}-{y}.mvt"
+              ]
+            }
+          },
+          "layers": [
+            {
+              "id": "background2",
+              "type": "background",
+              "paint": {
+                "background-color": "rgb(17,207,20)"
+              }
+            }
+          ]
+        }],
+        ["wait"]
+      ]
+    }
+  },
+  "zoom": 1,
+  "sources": {},
+  "layers": []
+}
\ No newline at end of file