Merge pull request #576 from xcube-dev/clarasb-xxx-levels_rgb_mode

Fix DatasetZLevel in RGB mode

Author: clarasb

CHANGES.md

@@ -5,6 +5,9 @@
 * Fixed time series legend entry to show the dataset title associated with 
   the time series. (#574)
 
+* Show dataset level in the zoom level info box also if no dataset variable is being 
+  displayed (when in RGB-only mode). (#576)
+
 ## Changes in version 1.7.1
 
 ### Fixes

src/components/Viewer/Viewer.tsx

@@ -397,7 +397,14 @@ export default function Viewer({
         setDatasetZLevel(datasetZLevel);
       }
     }
-  }, [map, variableLayer, setDatasetZLevel]);
+  }, [
+    map,
+    variableLayer,
+    variable2Layer,
+    rgbLayer,
+    rgb2Layer,
+    setDatasetZLevel,
+  ]);
 
   return (
     <ErrorBoundary>

src/components/ol/util.ts

@@ -6,6 +6,7 @@
 
 import { default as OlMap } from "ol/Map";
 import { default as OlLayer } from "ol/layer/Layer";
+import OlTileLayer from "ol/layer/Tile";
 
 export function findMapLayer(map: OlMap, layerId: string): OlLayer | null {
   const layerGroup = map.getLayers();
@@ -17,3 +18,13 @@ export function findMapLayer(map: OlMap, layerId: string): OlLayer | null {
   }
   return null;
 }
+
+export function findDatasetMapLayer(map: OlMap): OlLayer | null {
+  // Find the first active dataset tile layer named "variable", "rgb",
+  // "variable2", "rgb2" (in that order)
+  const layer = (["variable", "rgb", "variable2", "rgb2"] as const)
+    .map((name) => findMapLayer(map, name))
+    .find((layer) => layer instanceof OlTileLayer);
+
+  return layer as OlLayer;
+}

src/model/dataset.ts

@@ -8,7 +8,7 @@ import OlTileLayer from "ol/layer/Tile";
 import { default as OlMap } from "ol/Map";
 import { default as OlView } from "ol/View";
 
-import { findMapLayer } from "@/components/ol/util";
+import { findDatasetMapLayer } from "@/components/ol/util";
 import { GEOGRAPHIC_CRS, WEB_MERCATOR_CRS } from "@/model/proj";
 import { type UserVariable } from "@/model/userVariable";
 import { type JsonPrimitive } from "@/util/json";
@@ -145,14 +145,15 @@ export function getDatasetTimeRange(dataset: Dataset): TimeRange | null {
   return [coordinates[0], coordinates[coordinates.length - 1]];
 }
 
-// this returns the level of the current OLTileLayer of the selected variable
+// Returns the level of the current OLTileLayer of the selected variable
 export const getDatasetZLevel = (
   view: OlView,
   map: OlMap | undefined,
 ): number | undefined => {
   if (map) {
     const resolution = view.getResolution();
-    const layer = findMapLayer(map, "variable");
+
+    const layer = findDatasetMapLayer(map);
     if (layer instanceof OlTileLayer) {
       const source = layer.getSource();
       const tileGrid = source.getTileGrid();