GetMenu API

xpublish_wms/wms/get_feature_info.py

@@ -130,7 +130,7 @@ def get_feature_info(ds: xr.Dataset, query: dict) -> Response:
     else:
         elevation = []
     has_vertical_axis = [
-        "vertical" in ds[parameter].cf.coordinates for parameter in parameters
+        "vertical" in ds.grid.has_elevation(ds[parameter]) for parameter in parameters
     ]
     any_has_vertical_axis = True in has_vertical_axis
 
@@ -157,6 +157,8 @@ def get_feature_info(ds: xr.Dataset, query: dict) -> Response:
         else:
             selected_ds = selected_ds.cf.isel(time=0)
 
+    # TODO: This is really difficult when we have multiple parameters
+    # with different vertical dimensions, and even some without indexes
     if any_has_vertical_axis:
         if elevation == "all":
             # Dont select an elevation, just keep all elevation coords

xpublish_wms/wms/get_metadata.py

@@ -20,18 +20,20 @@ def get_metadata(ds: xr.Dataset, cache: cachey.Cache, params: dict) -> Response:
     layer_name = params.get("layername", None)
     metadata_type = params.get("item", "layerdetails")
 
-    if not layer_name and metadata_type != "minmax":
+    if not layer_name and metadata_type != "minmax" and metadata_type != "menu":
         raise HTTPException(
             status_code=400,
             detail="layerName must be specified",
         )
-    elif layer_name not in ds and metadata_type != "minmax":
+    elif layer_name not in ds and metadata_type != "minmax" and metadata_type != "menu":
         raise HTTPException(
             status_code=400,
             detail=f"layerName {layer_name} not found in dataset",
         )
 
-    if metadata_type == "layerdetails":
+    if metadata_type == "menu":
+        payload = get_menu(ds)
+    elif metadata_type == "layerdetails":
         payload = get_layer_details(ds, layer_name)
     elif metadata_type == "timesteps":
         da = ds[layer_name]
@@ -120,3 +122,24 @@ def get_layer_details(ds: xr.Dataset, layer_name: str) -> dict:
         "elevation_units": elevation_units,
         "timesteps": timesteps,
     }
+
+def get_menu(ds: xr.Dataset):
+    """
+    Returns the dataset menu items for the xreds viewer
+    TODO - support grouped layers?
+    """
+    results = {
+        "children": [],
+        "label": ds.attrs.get("title", "")
+    }
+
+    for var in ds.data_vars:
+        da = ds[var]
+
+        results["children"].append({
+            "plottable": "longitude" in da.cf.coords,
+            "id": var,
+            "label": da.attrs.get("long_name", da.attrs.get("name", var))
+        })
+
+    return results