Added tests

KNMI · May 27, 2024 · ebb1e40 · ebb1e40
1 parent 79397da
commit ebb1e40
Show file tree

Hide file tree

Showing 18 changed files with 810 additions and 544 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -89,4 +89,10 @@
     "editor.defaultFormatter": "ms-python.black-formatter",
 
   },
+  "[XML]": {
+    "editor.autoClosingBrackets": "never",
+    "files.trimFinalNewlines": true,
+    "editor.wordWrap": "off",
+    "editor.formatOnSave": false,
+  }
 }
diff --git a/adagucserverEC/CDataSource.cpp b/adagucserverEC/CDataSource.cpp
@@ -1293,6 +1293,7 @@ CDataSource *CDataSource::clone() {
     ogcDim->value = requiredDims[j]->value;
     ogcDim->queryValue = requiredDims[j]->queryValue;
     ogcDim->netCDFDimName = requiredDims[j]->netCDFDimName;
+    ogcDim->hidden = requiredDims[j]->hidden;
     for (size_t i = 0; i < requiredDims[j]->uniqueValues.size(); i++) {
       ogcDim->uniqueValues.push_back(requiredDims[j]->uniqueValues[i].c_str());
     }

diff --git a/adagucserverEC/COGCDims.h b/adagucserverEC/COGCDims.h
@@ -33,6 +33,7 @@ class COGCDims {
   COGCDims() {
     isATimeDimension = false;
     hasFixedValue = false;
+    hidden = false;
   }
   /**
    * OGC name
@@ -65,6 +66,8 @@ class COGCDims {
   bool isATimeDimension;
 
   bool hasFixedValue;
+
+  bool hidden;
 };
 
 class CCDFDims {

diff --git a/adagucserverEC/CRequest.cpp b/adagucserverEC/CRequest.cpp
@@ -932,6 +932,7 @@ int CRequest::fillDimValuesForDataSource(CDataSource *dataSource, CServerParams
             ogcDim->value.copy(&srvParam->requestDims[k]->value);
             ogcDim->queryValue.copy(&srvParam->requestDims[k]->value);
             ogcDim->netCDFDimName.copy(dataSource->cfgLayer->Dimension[i]->attr.name.c_str());
+            ogcDim->hidden = dataSource->cfgLayer->Dimension[i]->attr.hidden;
 
             if (ogcDim->name.equals("time") || ogcDim->name.equals("reference_time")) {
               // Make nice time value 1970-01-01T00:33:26 --> 1970-01-01T00:33:26Z
@@ -1078,6 +1079,7 @@ int CRequest::fillDimValuesForDataSource(CDataSource *dataSource, CServerParams
         dataSource->requiredDims.push_back(ogcDim);
         ogcDim->name.copy(&dimName);
         ogcDim->netCDFDimName.copy(dataSource->cfgLayer->Dimension[i]->attr.name.c_str());
+        ogcDim->hidden = dataSource->cfgLayer->Dimension[i]->attr.hidden;
 
         bool isReferenceTimeDimension = false;
         if (dataSource->cfgLayer->Dimension[i]->value.equals("reference_time")) {
@@ -1187,6 +1189,7 @@ int CRequest::fillDimValuesForDataSource(CDataSource *dataSource, CServerParams
     ogcDim->name.copy("none");
     ogcDim->value.copy("0");
     ogcDim->netCDFDimName.copy("none");
+    ogcDim->hidden = true;
   }
 
 #ifdef CREQUEST_DEBUG