Get rid of default constructor for LayerMetadataProjection.

KNMI · Sep 13, 2024 · 41e7dd5 · 41e7dd5
1 parent 61a5b8a
commit 41e7dd5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/adagucserverEC/Types/LayerMetadataType.h b/adagucserverEC/Types/LayerMetadataType.h
@@ -15,8 +15,7 @@ struct LayerMetadataDim {
 };
 
 struct LayerMetadataProjection {
-  LayerMetadataProjection() {}
-  LayerMetadataProjection(CT::string name, double bbox[]) {
+  LayerMetadataProjection(const CT::string& name, const double bbox[]) {
     this->name = name;
     for (size_t j = 0; j < 4; j++) {
       this->dfBBOX[j] = bbox[j];

diff --git a/adagucserverEC/utils/LayerMetadataStore.cpp b/adagucserverEC/utils/LayerMetadataStore.cpp
@@ -249,15 +249,18 @@ int loadLayerProjectionAndExtentListFromMetadataDb(MetadataLayer *metadataLayer)
       return 1;
     }
     json a;
-    auto c = a.parse(projInfo.c_str());
-    for (auto d : c.items()) {
+    auto c = json::parse(projInfo.c_str());
+    for (const auto& d : c.items()) {
       auto bboxArray = d.value();
-      LayerMetadataProjection projection;
+      double bbox[4] =
+          {
+              bboxArray[0].get_to((bbox[0])),
+              bboxArray[1].get_to((bbox[1])),
+              bboxArray[2].get_to((bbox[2])),
+              bboxArray[3].get_to((bbox[3])),
+          };
+      LayerMetadataProjection projection(d.key().c_str(), bbox);
       projection.name = d.key().c_str();
-      bboxArray[0].get_to((projection.dfBBOX[0]));
-      bboxArray[1].get_to((projection.dfBBOX[1]));
-      bboxArray[2].get_to((projection.dfBBOX[2]));
-      bboxArray[3].get_to((projection.dfBBOX[3]));
       metadataLayer->layerMetadata.projectionList.push_back(projection);
     }
   } catch (json::exception &e) {

diff --git a/adagucserverEC/utils/XMLGenUtils.cpp b/adagucserverEC/utils/XMLGenUtils.cpp
@@ -127,11 +127,11 @@ int populateMetadataLayerStruct(MetadataLayer *metadataLayer, bool readFromDB) {
 
   std::map<std::string, LayerMetadataProjection> projectionMap;
   // Make a unique list of projections
-  for (auto p : metadataLayer->layerMetadata.projectionList) {
-    projectionMap[p.name.c_str()] = p;
+  for (const auto& p : metadataLayer->layerMetadata.projectionList) {
+    projectionMap.emplace(p.name.c_str(), p);
   }
   metadataLayer->layerMetadata.projectionList.clear();
-  for (auto p : projectionMap) {
+  for (const auto& p : projectionMap) {
     metadataLayer->layerMetadata.projectionList.push_back(p.second);
   }