Custom palette issues

nasa-gibs · Jan 10, 2024 · 374a0f9 · 374a0f9
1 parent a4ef582
commit 374a0f9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/web/js/containers/tour.js b/web/js/containers/tour.js
@@ -546,6 +546,12 @@ const mapDispatchToProps = (dispatch) => ({
         promises.push(promiseImageryForTour(layers, parameters.t1, 'activeB'));
       }
     }
+    preloadPalettes(layers, {}, false).then((obj) => {
+      dispatch({
+        type: BULK_PALETTE_RENDERING_SUCCESS,
+        rendered: obj.rendered,
+      });
+    });
     await Promise.all(promises);
   },
   startTour: () => {

diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.js
@@ -115,7 +115,7 @@ export default function mapLayerBuilder(config, cache, store) {
     if (isVectorStyleActive(def.id, activeGroupStr, state)) {
       style = getVectorStyleKeys(def.id, undefined, state);
     }
-    if (options.style) {
+    if (def.custom && options.style) {
       style = options.style;
     }
     return [layerId, projId, date, style, activeGroupStr].join(':');

diff --git a/web/js/modules/palettes/selectors.js b/web/js/modules/palettes/selectors.js
@@ -350,15 +350,16 @@ export function getKey(layerId, groupStr, state) {
     return '';
   }
   const def = getPalette(layerId, undefined, groupStr, state);
+  const { values } = getPalette(layerId, 0, groupStr, state).entries;
   const keys = [];
   if (def.custom) {
     keys.push(`palette=${def.custom}`);
   }
   if (def.min) {
-    keys.push(`min=${def.min}`);
+    keys.push(`min=${getMinValue(values[def.min])}`);
   }
   if (def.max) {
-    keys.push(`max=${def.max}`);
+    keys.push(`max=${getMinValue(values[def.max])}`);
   }
   if (def.squash) {
     keys.push('squash');