Move low-level geom functions into their own file and test them

Author: joto

src/CMakeLists.txt

@@ -5,6 +5,7 @@ set(osm2pgsql_lib_SOURCES
   dependency-manager.cpp
   expire-tiles.cpp
   gazetteer-style.cpp
+  geom.cpp
   geometry-processor.cpp
   input.cpp
   logging.cpp

src/geom.cpp

@@ -0,0 +1,31 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "geom.hpp"
+
+namespace geom {
+
+double distance(osmium::geom::Coordinates p1,
+                osmium::geom::Coordinates p2) noexcept
+{
+    double const dx = p1.x - p2.x;
+    double const dy = p1.y - p2.y;
+    return std::sqrt(dx * dx + dy * dy);
+}
+
+osmium::geom::Coordinates interpolate(osmium::geom::Coordinates p1,
+                                      osmium::geom::Coordinates p2,
+                                      double frac) noexcept
+{
+    return osmium::geom::Coordinates{frac * (p1.x - p2.x) + p2.x,
+                                     frac * (p1.y - p2.y) + p2.y};
+}
+
+} // namespace geom
+

src/geom.hpp

@@ -0,0 +1,32 @@
+#ifndef OSM2PGSQL_GEOM_HPP
+#define OSM2PGSQL_GEOM_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+/**
+ * \file
+ *
+ * Low level geometry functions and types.
+ */
+
+#include <osmium/geom/coordinates.hpp>
+
+namespace geom {
+
+double distance(osmium::geom::Coordinates p1,
+                osmium::geom::Coordinates p2) noexcept;
+
+osmium::geom::Coordinates interpolate(osmium::geom::Coordinates p1,
+                                      osmium::geom::Coordinates p2,
+                                      double frac) noexcept;
+
+} // namespace geom
+
+#endif // OSM2PGSQL_GEOM_HPP

src/osmium-builder.cpp

@@ -14,26 +14,11 @@
 
 #include <osmium/area/geom_assembler.hpp>
 
+#include "geom.hpp"
 #include "osmium-builder.hpp"
 
 namespace {
 
-inline double distance(osmium::geom::Coordinates p1,
-                       osmium::geom::Coordinates p2)
-{
-    double const dx = p1.x - p2.x;
-    double const dy = p1.y - p2.y;
-    return std::sqrt(dx * dx + dy * dy);
-}
-
-inline osmium::geom::Coordinates interpolate(osmium::geom::Coordinates p1,
-                                             osmium::geom::Coordinates p2,
-                                             double frac) noexcept
-{
-    return osmium::geom::Coordinates{frac * (p1.x - p2.x) + p2.x,
-                                     frac * (p1.y - p2.y) + p2.y};
-}
-
 template <typename ITERATOR>
 void add_nodes_to_builder(osmium::builder::WayNodeListBuilder &builder,
                           ITERATOR const &begin, ITERATOR const &end,

tests/CMakeLists.txt

@@ -43,6 +43,7 @@ set_test(test-db-copy-thread)
 set_test(test-db-copy-mgr)
 set_test(test-domain-matcher LABELS NoDB)
 set_test(test-expire-tiles LABELS NoDB)
+set_test(test-geom LABELS NoDB)
 set_test(test-middle)
 set_test(test-options-database LABELS NoDB)
 set_test(test-options-parse LABELS NoDB)

tests/test-geom.cpp

@@ -0,0 +1,42 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2020 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <catch.hpp>
+
+#include "geom.hpp"
+
+TEST_CASE("geom::distance", "[NoDB]")
+{
+    osmium::geom::Coordinates const p1{10, 10};
+    osmium::geom::Coordinates const p2{20, 10};
+    osmium::geom::Coordinates const p3{13, 14};
+
+    REQUIRE(geom::distance(p1, p1) == Approx(0.0));
+    REQUIRE(geom::distance(p1, p2) == Approx(10.0));
+    REQUIRE(geom::distance(p1, p3) == Approx(5.0));
+}
+
+TEST_CASE("geom::interpolate", "[NoDB]")
+{
+    osmium::geom::Coordinates const p1{10, 10};
+    osmium::geom::Coordinates const p2{20, 10};
+
+    auto const i1 = geom::interpolate(p1, p1, 0.5);
+    REQUIRE(i1.x == 10);
+    REQUIRE(i1.y == 10);
+
+    auto const i2 = geom::interpolate(p1, p2, 0.5);
+    REQUIRE(i2.x == 15);
+    REQUIRE(i2.y == 10);
+
+    auto const i3 = geom::interpolate(p2, p1, 0.5);
+    REQUIRE(i3.x == 15);
+    REQUIRE(i3.y == 10);
+}
+