centralized time parsing (#164)

include/nigiri/common/parse_time.h

@@ -4,6 +4,10 @@
 
 namespace nigiri {
 
-unixtime_t parse_time(std::string const&);
+unixtime_t parse_time_tz(std::string_view s, char const* format);
+
+unixtime_t parse_time(std::string_view s, char const* format);
+
+unixtime_t parse_time_no_tz(std::string_view);
 
 }  // namespace nigiri

src/common/parse_time.cc

@@ -4,12 +4,32 @@
 
 namespace nigiri {
 
-unixtime_t parse_time(std::string const& str) {
-  unixtime_t parsed;
-  auto ss = std::stringstream{str};
-  ss.exceptions(std::ios::badbit | std::ios::failbit | std::ios::eofbit);
-  ss >> date::parse("%FT%T", parsed);
-  return parsed;
+unixtime_t parse_time_tz(std::string_view s, char const* format) {
+  std::stringstream in;
+  in.exceptions(std::ios::badbit | std::ios::failbit);
+  in << s;
+
+  date::local_seconds ls;
+  std::string tz;
+  in >> date::parse(format, ls, tz);
+
+  return std::chrono::time_point_cast<unixtime_t::duration>(
+      date::make_zoned(tz, ls).get_sys_time());
+}
+
+unixtime_t parse_time(std::string_view s, char const* format) {
+  std::stringstream in;
+  in.exceptions(std::ios::badbit | std::ios::failbit);
+  in << s;
+
+  unixtime_t u;
+  in >> date::parse(format, u);
+
+  return u;
+}
+
+unixtime_t parse_time_no_tz(std::string_view s) {
+  return parse_time(s, "%FT%T");
 }
 
 }  // namespace nigiri

src/rt/vdv/vdv_update.cc

@@ -87,7 +87,7 @@ std::optional<unixtime_t> updater::get_opt_time(pugi::xml_node const& node,
   auto const xpath = node.select_node(str);
   if (xpath != nullptr) {
     try {
-      return std::optional{parse_time(xpath.node().child_value())};
+      return std::optional{parse_time_no_tz(xpath.node().child_value())};
     } catch (std::exception const& e) {
       log(log_lvl::error, "vdv_update.get_opt_time",
           "{}, invalid time input: {}", e.what(), xpath.node().child_value());

test/parse_time_test.cc

@@ -7,12 +7,32 @@
 using namespace nigiri;
 using namespace date;
 
+TEST(parse_time, invalid_time_tz) {
+  EXPECT_THROW(parse_time_tz("invalid", "%Y-%m-%d %H:%M %Z"), std::exception);
+}
+
+TEST(parse_time, valid_time_tz) {
+  EXPECT_EQ(
+      unixtime_t{date::sys_days{2000_y / January / 1} + 7_hours + 7_minutes},
+      parse_time_tz("2000-01-01 08:07 Europe/Berlin", "%Y-%m-%d %H:%M %Z"));
+}
+
 TEST(parse_time, invalid_time) {
-  EXPECT_THROW(parse_time("invalid"), std::exception);
+  EXPECT_THROW(parse_time("invalid", "%FT%T%z"), std::exception);
 }
 
 TEST(parse_time, valid_time) {
   EXPECT_EQ(
       unixtime_t{date::sys_days{2000_y / January / 1} + 7_hours + 7_minutes},
-      parse_time("2000-01-01T07:07:00"));
+      parse_time("2000-01-01T07:07:00+0000", "%FT%T%z"));
+}
+
+TEST(parse_time, invalid_time_no_tz) {
+  EXPECT_THROW(parse_time_no_tz("invalid"), std::exception);
+}
+
+TEST(parse_time, valid_time_no_tz) {
+  EXPECT_EQ(
+      unixtime_t{date::sys_days{2000_y / January / 1} + 7_hours + 7_minutes},
+      parse_time_no_tz("2000-01-01T07:07:00"));
 }

test/raptor_search.cc

@@ -1,5 +1,6 @@
 #include "./raptor_search.h"
 
+#include "nigiri/common/parse_time.h"
 #include "nigiri/routing/limits.h"
 #include "nigiri/routing/raptor/raptor.h"
 #include "nigiri/routing/raptor_search.h"
@@ -8,18 +9,6 @@
 
 namespace nigiri::test {
 
-unixtime_t parse_time(std::string_view s, char const* format) {
-  std::stringstream in;
-  in << s;
-
-  date::local_seconds ls;
-  std::string tz;
-  in >> date::parse(format, ls, tz);
-
-  return std::chrono::time_point_cast<unixtime_t::duration>(
-      date::make_zoned(tz, ls).get_sys_time());
-}
-
 pareto_set<routing::journey> raptor_search(timetable const& tt,
                                            rt_timetable const* rtt,
                                            routing::query q,
@@ -64,8 +53,9 @@ pareto_set<routing::journey> raptor_search(timetable const& tt,
                                            direction const search_dir,
                                            routing::clasz_mask_t mask,
                                            bool const require_bikes_allowed) {
-  return raptor_search(tt, rtt, from, to, parse_time(time, "%Y-%m-%d %H:%M %Z"),
-                       search_dir, mask, require_bikes_allowed, 0U);
+  return raptor_search(tt, rtt, from, to,
+                       parse_time_tz(time, "%Y-%m-%d %H:%M %Z"), search_dir,
+                       mask, require_bikes_allowed, 0U);
 }
 
 pareto_set<routing::journey> raptor_search(timetable const& tt,
@@ -85,7 +75,7 @@ pareto_set<routing::journey> raptor_search(timetable const& tt,
         {tt.locations_.location_id_to_idx_.at({to, src}), 0_minutes, 0U}};
   }
   if (!time.empty()) {
-    q.start_time_ = parse_time(time, "%Y-%m-%d %H:%M %Z");
+    q.start_time_ = parse_time_tz(time, "%Y-%m-%d %H:%M %Z");
   }
   return raptor_search(tt, rtt, std::move(q), search_dir);
 }

test/raptor_search.h

@@ -9,8 +9,6 @@ struct rt_timetable;
 
 namespace nigiri::test {
 
-unixtime_t parse_time(std::string_view s, char const* format);
-
 pareto_set<routing::journey> raptor_search(
     timetable const&,
     rt_timetable const*,

test/routing/via_search_test.cc

@@ -5,6 +5,8 @@
 
 #include "utl/erase_if.h"
 
+#include "nigiri/common/parse_time.h"
+
 #include "nigiri/loader/gtfs/agency.h"
 #include "nigiri/loader/gtfs/calendar.h"
 #include "nigiri/loader/gtfs/calendar_date.h"
@@ -26,7 +28,6 @@ using namespace nigiri;
 using namespace date;
 using namespace std::chrono_literals;
 using namespace std::string_view_literals;
-using nigiri::test::parse_time;
 using nigiri::test::raptor_search;
 
 namespace {
@@ -173,7 +174,7 @@ location_idx_t loc(timetable const& tt, std::string_view const id) {
 }
 
 unixtime_t time(std::string_view const time) {
-  return parse_time(time, "%Y-%m-%d %H:%M %Z");
+  return parse_time_tz(time, "%Y-%m-%d %H:%M %Z");
 }
 
 timetable load_timetable(std::string_view s) {