UTM projection

1 files changed, 9 insertions, 10 deletions

diff --git a/server/src/api.cppm b/server/src/api.cppm
index b0f3944..77e0f85 100644
--- a/server/src/api.cppm
+++ b/server/src/api.cppm
@@ -7,7 +7,8 @@ export module routemon:api;
 
 import std;
 import :datex2;
-import :geo;
+import :geo.wgs84;
+import :geo.multizonal;
 import :gpx;
 import :log;
 import :time;
@@ -25,20 +26,20 @@ export namespace routemon::api {
 
 struct relevant_road_closure
 {
-  std::vector<geo::linestring> relevant_lss;
+  std::vector<geo::utm::zonable_wgs84_linestring> relevant_lss;
 };
 
 struct relevant_situation
 {
   std::string id;
-  std::optional<geo::point> location;
+  std::optional<geo::utm::zonable_wgs84_point> location;
   std::vector<std::string> comments;
   std::vector<relevant_road_closure> relevant_road_closures;
 };
 
 struct track_segment
 {
-  geo::linestring points;
+  geo::utm::zonable_wgs84_linestring points;
 };
 
 struct track
@@ -79,13 +80,11 @@ class handler
 {
   constexpr static auto const min_distance_ = 5.0;
 
-  using blse_index_value = std::tuple<
-      geo::box, geo::multi_polygon, std::shared_ptr<datex2::road_closure>
+  using blse_index_value = std::shared_ptr<datex2::road_closure>;
+  using blse_index = geo::multizonal::linestring_rtree<blse_index_value>;
+  using p_index_value = std::pair<
+      geo::utm::zonable_wgs84_point, std::shared_ptr<datex2::road_closure>
   >;
-  using p_index_value =
-      std::pair<geo::point, std::shared_ptr<datex2::road_closure>>;
-  using blse_index =
-      bgeo::index::rtree<blse_index_value, bgeo::index::quadratic<16>>;
   using p_index = bgeo::index::rtree<p_index_value, bgeo::index::quadratic<16>>;
 
   log::logger l_;