KNMI · mats-knmi · Dec 15, 2024 · Dec 15, 2024 · Dec 16, 2024 · Dec 16, 2024
diff --git a/CCDFDataModel/CCDFHDF5IO_ODIM.cpp b/CCDFDataModel/CCDFHDF5IO_ODIM.cpp
@@ -98,6 +98,11 @@ int CDFHDF5Reader::convertODIMHDF5toCF() {
   if (whereVar == nullptr) {
     return 2;
   }
+  CDF::Attribute *whereHeightAttr = whereVar->getAttributeNE("height");
+  if (whereHeightAttr != nullptr) {
+    CDBDebug("Is an ODIM volume file, skipping parsing as projected dataset");
+    return 2;
+  }
   std::map<std::string, std::string> quantityToUnits = {{"TH", "dBZ"}, {"TV", "dBZ"}, {"DBZH", "dBZ"}, {"DBZV", "dBZ"}, {"ZDR", "dB"}, {"UZDR", "dB"}, {"RHOHV", "-"}, {"URHOHV", "-"}, {"ACRR", "mm"}};
 
   const size_t MAX_ODIM_DATASETS = 100;

diff --git a/adagucserverEC/CConvertKNMIH5VolScan.cpp b/adagucserverEC/CConvertKNMIH5VolScan.cpp
diff --git a/tests/AdagucTests/TestWMSVolScan.py b/tests/AdagucTests/TestWMSVolScan.py
@@ -49,7 +49,7 @@ def test_WMSGetCapabilities_VolScan(self):
     def test_WMSGetMap_VolScan(self):
         AdagucTestTools().cleanTempDir()
         for layer in ["ZDR", "KDP", "RhoHV"]:
-            for elev in ["0.3l", "0.3", "8"]:
+            for elev in ["0.3l", "0.3", "8.0"]:
                 filename = f"test_WMSGetMap_VolScan_{layer}_{elev}.png"
                 wms_arg = f"source=test/volscan/RAD_NL62_VOL_NA_202106181850.h5&SERVICE=WMS&request=getmap&LAYERS={layer}&format=image/png&STYLES=&WMS=1.3.0&CRS=EPSG:4326&BBOX=46,0,58,12&WIDTH=400&HEIGHT=400&SHOWDIMS=true&DIM_scan_elevation={elev}"
                 status, data, headers = AdagucTestTools().runADAGUCServer(

diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetCapabilities_VolScan.xml b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetCapabilities_VolScan.xml
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_0.3.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_0.3.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_0.3l.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_0.3l.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_8.0.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_8.0.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_8.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_KDP_8.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_0.3.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_0.3.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_0.3l.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_0.3l.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_8.0.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_8.0.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_8.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_RhoHV_8.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_0.3.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_0.3.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_0.3l.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_0.3l.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_8.0.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_8.0.png
diff --git a/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_8.png b/tests/expectedoutputs/TestWMSVolScan/test_WMSGetMap_VolScan_ZDR_8.png