Refactored includes

KNMI · Feb 14, 2025 · a29b49a · a29b49a
1 parent 414e40b
commit a29b49a
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 81 deletions.
diff --git a/adagucserverEC/CMakeEProfile.cpp b/adagucserverEC/CMakeEProfile.cpp
@@ -2,7 +2,7 @@
 #include <algorithm>
 #include "CMakeEProfile.h"
 #include "CImageDataWriter.h"
-#include "CUniqueRequests/CURConstants.h"
+#include "CUniqueRequests/CURTypes.h"
 
 const char *CMakeEProfile::className = "CMakeEProfile";
 

diff --git a/adagucserverEC/CMakeLists.txt b/adagucserverEC/CMakeLists.txt
@@ -192,9 +192,10 @@ add_library(
     CServerParams.h
     CStyleConfiguration.cpp
     CStyleConfiguration.h
-    CUniqueRequests/CURResult.h
+    CUniqueRequests/CURTypes.h
     CUniqueRequests/requestUtils.h
     CUniqueRequests/requestUtils.cpp
+    CUniqueRequests/CURUniqueRequests.h
     CUniqueRequests/CURUniqueRequests.cpp
     CXMLGen.cpp
     CXMLGen.h

diff --git a/adagucserverEC/CUniqueRequests/CURAggregatedDimension.h b/adagucserverEC/CUniqueRequests/CURAggregatedDimension.h
diff --git a/adagucserverEC/CUniqueRequests/CURConstants.h b/adagucserverEC/CUniqueRequests/CURConstants.h
diff --git a/adagucserverEC/CUniqueRequests/CURDimInfo.h b/adagucserverEC/CUniqueRequests/CURDimInfo.h
diff --git a/adagucserverEC/CUniqueRequests/CURFileInfo.h b/adagucserverEC/CUniqueRequests/CURFileInfo.h
diff --git a/adagucserverEC/CUniqueRequests/CURResult.h b/adagucserverEC/CUniqueRequests/CURResult.h
diff --git a/adagucserverEC/CUniqueRequests/CURTypes.h b/adagucserverEC/CUniqueRequests/CURTypes.h
@@ -0,0 +1,47 @@
+#ifndef CURTYPES_H
+#define CURTYPES_H
+
+#include <map>
+#include "CTString.h"
+#define CCUniqueRequests_MAX_DIMS 255
+typedef std::map<int, std::string> map_type_dimvalindex;
+typedef std::map<int, std::string>::iterator it_type_dimvalindex;
+
+class CURUniqueRequests;
+
+struct CURAggregatedDimensionNoName {
+  int start;
+  std::vector<std::string> values;
+};
+struct CURAggregatedDimensionAndName {
+  CT::string name;
+  int start;
+  std::vector<std::string> values;
+};
+
+struct CURDimInfo {
+  map_type_dimvalindex dimValuesMap;                          // All values, many starts with 1 count, result of set()
+  std::vector<CURAggregatedDimensionNoName> aggregatedValues; // Aggregated values (start/count series etc), result of  addDimSet()
+};
+
+typedef std::map<std::string, CURDimInfo> map_type_diminfo;
+typedef map_type_diminfo::iterator it_type_diminfo;
+
+struct CURDimensionKey {
+  std::string name;
+  int type;
+};
+
+struct CURResult {
+  CURUniqueRequests *parent;
+  CURDimensionKey dimensionKeys[CCUniqueRequests_MAX_DIMS];
+  CT::string value;
+  int numDims;
+};
+
+struct CURFileInfo {
+  std::vector<std::vector<CURAggregatedDimensionAndName>> requests;
+  map_type_diminfo dimInfoMap; // AggregatedDimension name is key
+};
+
+#endif
diff --git a/adagucserverEC/CUniqueRequests/CURUniqueRequests.h b/adagucserverEC/CUniqueRequests/CURUniqueRequests.h
@@ -5,19 +5,14 @@
 #include <map>
 #include "CTString.h"
 #include "CDebugger.h"
-#include "CURConstants.h"
-#include "CURDimInfo.h"
-#include "CURFileInfo.h"
+#include "CURTypes.h"
 #include "CServerParams.h"
 #include "CDrawImage.h"
 #include "CDataSource.h"
 #include "CImageWarper.h"
-#include "CUniqueRequests/CURResult.h"
 #include "CUniqueRequests/requestUtils.h"
 #include "requestUtils.h"
 
-struct CURResult;
-
 class CURUniqueRequests {
 
   typedef std::map<std::string, CURFileInfo>::iterator it_type_file;

diff --git a/adagucserverEC/CUniqueRequests/requestUtils.h b/adagucserverEC/CUniqueRequests/requestUtils.h
@@ -1,6 +1,6 @@
 #ifndef REQUESTUTILS_H
 #define REQUESTUTILS_H
-#include "CUniqueRequests/CURResult.h"
+#include "CUniqueRequests/CURTypes.h"
 
 void padTo(std::string &str, const size_t num, const char paddingChar = ' ');