1 files changed, 6 insertions, 6 deletions

diff --git a/server/src/datex2.cppm b/server/src/datex2.cppm
index 9c75013..ae66631 100644
--- a/server/src/datex2.cppm
+++ b/server/src/datex2.cppm
@@ -1,6 +1,5 @@
 module;
 
-#include <boost/geometry/algorithms/is_empty.hpp>
 #include <boost/geometry/srs/epsg.hpp>
 #include <boost/geometry/srs/transformation.hpp>
 
@@ -9,7 +8,7 @@ module;
 export module routemon:datex2;
 
 import std;
-import :geo;
+import :geo.utm;
 import :time;
 import :util;
 
@@ -23,14 +22,15 @@ export struct road_closure
 {
   std::weak_ptr<situation> parent;
   std::optional<time::period_seq> validity;
-  std::vector<geo::point> relevant_points = {};
-  std::vector<std::shared_ptr<geo::linestring>> relevant_line_strings = {};
+  std::vector<geo::utm::zonable_wgs84_point> relevant_points = {};
+  std::vector<std::shared_ptr<geo::utm::zonable_wgs84_linestring>>
+      relevant_line_strings = {};
 };
 
 export struct situation
 {
   std::string id;
-  std::optional<geo::point> location =
+  std::optional<geo::utm::zonable_wgs84_point> location =
       std::nullopt; // as shown on the map, not used for querying
   std::vector<std::string> comments = {};
   std::vector<std::shared_ptr<road_closure>> road_closures = {};
@@ -47,7 +47,7 @@ export class loader
   // ETRS 89 (EPSG:4258) -> WGS 84 (EPSG:4326)
   bgeo::srs::
       transformation<bgeo::srs::static_epsg<4258>, bgeo::srs::static_epsg<4326>>
-          etrs89_to_wgs84_{};
+          etrs89_to_wgs84_ = {};
 
   std::multiset<std::string> warnings_;