Geometry class moved to infra

VITObelgium · Apr 23, 2024 · fedb833 · fedb833
1 parent e2ef4c7
commit fedb833
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 262 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,6 @@
 ---
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -4
-ConstructorInitializerIndentWidth: 0
 AlignAfterOpenBracket: Align
 AlignEscapedNewlines: Left
 AlignOperands: true
@@ -64,10 +63,6 @@ IndentWidth: 4
 TabWidth: 4
 UseTab: Never
 IndentFunctionDeclarationAfterType: false
-SpacesInParentheses: false
-SpacesInAngles: false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
 SpaceAfterControlStatementKeyword: true
 SpaceBeforeAssignmentOperators: true
 SortIncludes: true

diff --git a/deps/geodynamix b/deps/geodynamix
diff --git a/deps/infra b/deps/infra
diff --git a/deps/vcpkg b/deps/vcpkg
diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt
@@ -39,7 +39,6 @@ add_library(emaplogic
     enuminfo.h
     emissionvalidation.h emissionvalidation.cpp
     unitconversion.h
-    geometry.h geometry.cpp
     gridrasterbuilder.h
     emissionscollector.h emissionscollector.cpp
     outputwriters.h outputwriters.cpp

diff --git a/logic/debugtools.cpp b/logic/debugtools.cpp
@@ -2,13 +2,12 @@
 #include "emap/configurationparser.h"
 #include "emap/countryborders.h"
 #include "emap/gridprocessing.h"
-#include "geometry.h"
 
 #include "infra/chrono.h"
 #include "infra/gdal.h"
 #include "infra/gdalalgo.h"
+#include "infra/geometry.h"
 
-#include <geos/geom/DefaultCoordinateSequenceFactory.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/MultiPolygon.h>

diff --git a/logic/geometry.cpp b/logic/geometry.cpp
diff --git a/logic/geometry.h b/logic/geometry.h
diff --git a/logic/gridprocessing.cpp b/logic/gridprocessing.cpp
@@ -1,6 +1,5 @@
 #include "emap/gridprocessing.h"
 #include "emap/emissions.h"
-#include "geometry.h"
 
 #include "infra/algo.h"
 #include "infra/cast.h"
@@ -9,6 +8,7 @@
 #include "infra/enumutils.h"
 #include "infra/gdalio.h"
 #include "infra/geometadata.h"
+#include "infra/geometry.h"
 #include "infra/log.h"
 #include "infra/math.h"
 #include "infra/progressinfo.h"

diff --git a/logic/test/gridprocessingtest.cpp b/logic/test/gridprocessingtest.cpp
@@ -1,6 +1,6 @@
 #include "emap/gridprocessing.h"
 #include "emap/configurationparser.h"
-#include "geometry.h"
+#include "infra/geometry.h"
 #include "testconstants.h"
 
 #include "gdx/algo/sum.h"
@@ -17,7 +17,7 @@
 #include "testconfig.h"
 
 #include <doctest/doctest.h>
-#include <geos/geom/CoordinateArraySequence.h>
+#include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/GeometryFactory.h>
 
 namespace emap::test {
@@ -31,9 +31,13 @@ TEST_CASE("create_geometry_extent")
     auto geomFactory = geos::geom::GeometryFactory::create();
 
     const GeoMetadata gridMeta(4, 3, 50.0, -50.0, 50.0, {});
-    geos::geom::CoordinateArraySequence coords(std::vector<geos::geom::Coordinate>({{110.0, 55.0}, {130.0, 75.0}, {120.0, 65.0}, {110.0, 55.0}}));
 
-    const auto poly = geomFactory->createPolygon(geomFactory->createLinearRing(coords), {});
+    auto coords = std::make_unique<geos::geom::CoordinateSequence>(std::initializer_list<geos::geom::Coordinate>{geos::geom::Coordinate{110.0, 55.0},
+                                                                                                                 geos::geom::Coordinate{130.0, 75.0},
+                                                                                                                 geos::geom::Coordinate{120.0, 65.0},
+                                                                                                                 geos::geom::Coordinate{110.0, 55.0}});
+
+    const auto poly = geomFactory->createPolygon(geomFactory->createLinearRing(std::move(coords)), {});
 
     auto meta = create_geometry_intersection_extent(*poly, gridMeta);
     CHECK(GeoMetadata(1, 1, 100.0, 50.0, 50.0, {}) == meta);
@@ -334,4 +338,4 @@ TEST_CASE("Add to raster")
 //         }
 //     }
 // }
-}
+}
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
     "name": "emap",
     "version": "0.1.0",
     "dependencies": [