Merge branch 'globe-updates'

* globe-updates: Some improvements to globe rendering: Add the ability to specify custom URL templates
UW-Macrostrat · May 28, 2024 · ec48b04 · ec48b04
2 parents 5c53624 + a874b49
commit ec48b04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/deps/cesium-martini b/deps/cesium-martini
diff --git a/deps/cesium-viewer b/deps/cesium-viewer
diff --git a/packages/globe-dev/src/cesium-view.ts b/packages/globe-dev/src/cesium-view.ts
@@ -10,6 +10,7 @@ import CesiumViewer, {
   SatelliteLayer,
 } from "@macrostrat/cesium-viewer";
 import { MapboxImageryProvider } from "cesium";
+import { elevationLayerURL } from "@macrostrat-web/settings";
 
 // export function BaseLayer({ enabled = true, style, accessToken, ...rest }) {
 //   const provider = useRef(
@@ -43,6 +44,7 @@ function CesiumView({ style, accessToken, ...rest }) {
       highResolution: true,
       skipZoomLevels: (z) => z % 3 != 0,
       credit: "Mapbox",
+      urlTemplate: elevationLayerURL,
     })
   );
 

diff --git a/packages/settings/index.ts b/packages/settings/index.ts
@@ -39,6 +39,8 @@ export const postgrestPrefix = getRuntimeConfig(
 
 export const macrostratInstance = getRuntimeConfig("MACROSTRAT_INSTANCE");
 
+export const elevationLayerURL = getRuntimeConfig("ELEVATION_LAYER_URL");
+
 /** Legacy settings object */
 export const SETTINGS = {
   darkMapURL,
+7 −5		src/mapbox-resource.ts
+10 −4		src/terrain-provider.ts
+2 −0		src/worker-util.ts
+2 −2		src/layers/terrain/hillshade.ts
+18 −17		src/layers/terrain/provider.ts