Merge branch 'master' into multidimcoverage3

.github/workflows/docker-publish.yml

@@ -33,6 +33,9 @@ jobs:
           vuln-type: 'os,library'
           trivyignores: .trivyignore
 #          severity: 'CRITICAL,HIGH'
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
+          TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db:1
   docker-build-and-publish:
     name: Build Docker image and potentially push to Docker Hub
     runs-on: ubuntu-latest

Dockerfile

@@ -6,7 +6,7 @@ USER root
 LABEL maintainer="[email protected]"
 
 # Version should be same as in Definitions.h
-LABEL version="2.28.1"
+LABEL version="2.29.0"
 
 # Try to update image packages
 RUN apt-get -q -y update \

NEWS.md

@@ -1,3 +1,18 @@
+**Version 2.29.0 2024-11-11**
+- Adds support for grids where the data cells are defined by lat_bnds and lon_bnds parameters describing the cell bounds.
+
+**Version 2.28.5 2024-11-04**
+- Added Solar Terminator post-processor to use in combination with LiveUpdate layer type. 
+
+**Version 2.28.4 2024-11-12**
+- Fix bug where autofinddataset would not use Layer configurations which do not have a type configured
+
+**Version 2.28.3 2024-10-24**
+- Fix bug where directory reader could not figure out the file type (opendir ent->d_type == DT_UNKNOWN)
+
+**Version 2.28.2 2024-10-23**
+- Fix bug which caused sheduled metadata updates to only work intermittently.
+
 **Version 2.28.1 2024-10-11**
 - Windbarbs on modelfields can now display the windspeed in kts as text when rendertextforvectors in RenderSettings is set to true.
 

adagucserverEC/CConvertLatLonBnds.cpp

@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ * Project:  ADAGUC Server
+ * Purpose:  ADAGUC OGC Server
+ * Author:   Maarten Plieger, plieger "at" knmi.nl
+ * Date:     2013-06-01
+ *
+ ******************************************************************************
+ *
+ * Copyright 2013, Royal Netherlands Meteorological Institute (KNMI)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+#include "CConvertLatLonBnds.h"
+#include "CFillTriangle.h"
+#include "CImageWarper.h"
+
+// #define CConvertLatLonBnds_DEBUG
+
+const char *CConvertLatLonBnds::className = "CConvertLatLonBnds";
+
+bool CConvertLatLonBnds::isThisLatLonBndsData(CDFObject *cdfObject) {
+  try {
+    CDF::Attribute *attr = cdfObject->getAttributeNE("USE_ADAGUC_LATLONBNDS_CONVERTER");
+    if ((attr != NULL) && attr->getDataAsString().toLowerCase().equals("true")) {
+      return true;
+    }
+  } catch (int e) {
+    // Go on
+  }
+  try {
+    CDF::Variable *pointLon = cdfObject->getVariable("lon_bnds");
+    CDF::Variable *pointLat = cdfObject->getVariable("lat_bnds");
+  } catch (int e) {
+    return false;
+  }
+  try {
+    CDF::Dimension *gridpointDim = cdfObject->getDimension("gridpoint");
+    CDF::Variable *pointLon = cdfObject->getVariable("lon_bnds");
+    CDF::Variable *pointLat = cdfObject->getVariable("lat_bnds");
+    pointLon->getDimension("gridpoint");
+    pointLat->getDimension("gridpoint");
+    if ((pointLon->dimensionlinks.size() > 1) && (pointLon->dimensionlinks.size() > 1)) {
+      cdfObject->setAttributeText("USE_ADAGUC_LATLONBNDS_CONVERTER", "true");
+      return true;
+    }
+
+  } catch (int e) {
+  }
+  return false;
+};

adagucserverEC/CConvertLatLonBnds.h

@@ -0,0 +1,41 @@
+/******************************************************************************
+ *
+ * Project:  ADAGUC Server
+ * Purpose:  ADAGUC OGC Server
+ * Author:   Maarten Plieger, plieger "at" knmi.nl
+ * Date:     2016-08-05
+ *
+ ******************************************************************************
+ *
+ * Copyright 2013, Royal Netherlands Meteorological Institute (KNMI)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef CCONVERTLATLONBNDS_H
+#define CCONVERTLATLONBNDS_H
+#include "CDataSource.h"
+class CConvertLatLonBnds {
+private:
+  DEF_ERRORFUNCTION();
+  /**
+   * returns 0 on success.
+   */
+  static bool isThisLatLonBndsData(CDFObject *cdfObject);
+
+public:
+  static int convertLatLonBndsHeader(CDFObject *cdfObject, CServerParams *srvParams);
+  static int convertLatLonBndsData(CDataSource *dataSource, int mode);
+};
+#endif