cleanup debug, make location comparable+printable

motis-project · Jul 2, 2024 · 7170d8b · 7170d8b
1 parent d83779c
commit 7170d8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/include/osr/lookup.h b/include/osr/lookup.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "cista/reflection/printable.h"
+
 #include "osr/ways.h"
 
 #include "utl/cflow.h"
@@ -11,6 +13,8 @@
 namespace osr {
 
 struct location {
+  CISTA_PRINTABLE(location)
+  CISTA_FRIEND_COMPARABLE(location)
   geo::latlng pos_;
   level_t lvl_;
 };

diff --git a/include/osr/ways.h b/include/osr/ways.h
@@ -30,13 +30,6 @@
 
 namespace osr {
 
-#define OSR_DEBUG
-#ifdef OSR_DEBUG
-#define trace(...) fmt::println(std::cerr, __VA_ARGS__)
-#else
-#define trace(...)
-#endif
-
 struct resolved_restriction {
   enum class type { kNo, kOnly } type_;
   way_idx_t from_, to_;