route url

Author: felixguendling

include/nigiri/loader/register.h

@@ -121,6 +121,7 @@ struct route {
         std::string_view id,
         translation_idx_t short_name,
         translation_idx_t long_name,
+        translation_idx_t url,
         route_type_t,
         route_color,
         provider_idx_t);
@@ -136,6 +137,10 @@ struct route {
   translated_str_t get_long_name_translations() const;
   void set_long_name(translated_str_t);
 
+  std::string_view get_url() const;
+  translated_str_t get_url_translations() const;
+  void set_url(translated_str_t);
+
   std::uint16_t get_route_type() const;
   void set_route_type(std::uint16_t);
 
@@ -154,6 +159,7 @@ struct route {
   std::string_view id_;
   translation_idx_t short_name_;
   translation_idx_t long_name_;
+  translation_idx_t url_;
   route_type_t route_type_;
   route_color color_;
   provider_idx_t agency_;

include/nigiri/rt/frun.h

@@ -44,6 +44,7 @@ struct run_stop {
   std::optional<route_type_t> route_type(event_type) const;
   std::string_view route_short_name(event_type, lang_t const&) const;
   std::string_view route_long_name(event_type, lang_t const&) const;
+  std::string_view route_url(event_type, lang_t const&) const;
   std::string_view trip_short_name(event_type, lang_t const&) const;
   std::string_view display_name(event_type, lang_t const&) const;
   run_stop get_first_trip_stop(event_type) const;

include/nigiri/timetable.h

@@ -297,6 +297,7 @@ struct timetable {
   struct route_ids {
     vector_map<route_id_idx_t, translation_idx_t> route_id_short_names_;
     vector_map<route_id_idx_t, translation_idx_t> route_id_long_names_;
+    vector_map<route_id_idx_t, translation_idx_t> rotue_id_url_;
     vector_map<route_id_idx_t, route_type_t> route_id_type_;
     vector_map<route_id_idx_t, provider_idx_t> route_id_provider_;
     vector_map<route_id_idx_t, route_color> route_id_colors_;

src/loader/gtfs/route.cc

@@ -159,6 +159,7 @@ route_map_t read_routes(source_idx_t const src,
     utl::csv_col<utl::cstr, UTL_NAME("agency_id")> agency_id_;
     utl::csv_col<utl::cstr, UTL_NAME("route_short_name")> route_short_name_;
     utl::csv_col<utl::cstr, UTL_NAME("route_long_name")> route_long_name_;
+    utl::csv_col<utl::cstr, UTL_NAME("route_url")> route_url_;
     utl::csv_col<utl::cstr, UTL_NAME("route_desc")> route_desc_;
     utl::csv_col<std::uint16_t, UTL_NAME("route_type")> route_type_;
     utl::csv_col<utl::cstr, UTL_NAME("route_color")> route_color_;
@@ -206,6 +207,8 @@ route_map_t read_routes(source_idx_t const src,
                        r.route_short_name_->view(), r.route_id_->view()),
               i18n.get(t::kRoutes, f::kRouteLongName,
                        r.route_long_name_->view(), r.route_id_->view()),
+              i18n.get(t::kRoutes, f::kRouteURL, r.route_url_->view(),
+                       r.route_id_->view()),
               route_type_t{*r.route_type_},
               {.color_ = to_color(r.route_color_->view()),
                .text_color_ = to_color(r.route_text_color_->view())},

src/loader/netex/load_timetable.cc

@@ -1405,6 +1405,7 @@ void load_timetable(loader_config const& config,
                       line.short_name_.empty() ? line.name_ : line.short_name_),
                   tt.register_translation(
                       line.product_.empty() ? line.name_ : line.product_),
+                  kEmptyTranslation,
                   route_type_t{get_more_precise_route_type(sj.route_type_,
                                                            line.route_type_)},
                   line.color_,

src/loader/register.cc

@@ -191,13 +191,15 @@ route::route(timetable& tt,
              std::string_view id,
              translation_idx_t short_name,
              translation_idx_t long_name,
+             translation_idx_t url,
              route_type_t const route_type,
              route_color const color,
              provider_idx_t const agency)
     : src_{src},
       id_{id},
       short_name_{short_name},
       long_name_{long_name},
+      url_{url},
       route_type_{route_type},
       color_{color},
       agency_{agency},
@@ -235,6 +237,14 @@ void route::set_long_name(translated_str_t x) {
   long_name_ = tt_->register_translation(x);
 }
 
+std::string_view route::get_url() const {
+  return tt_->get_default_translation(url_);
+}
+translated_str_t route::get_url_translations() const { return tt_->get(url_); }
+void route::set_url(translated_str_t x) {
+  long_name_ = tt_->register_translation(x);
+}
+
 route_type_t::value_t route::get_route_type() const {
   return static_cast<route_type_t::value_t>(route_type_);
 }
@@ -706,6 +716,7 @@ route_id_idx_t register_route(timetable& tt, route const& r) {
   auto const idx = route_id.ids_.store(r.id_);
   route_id.route_id_short_names_.emplace_back(r.short_name_);
   route_id.route_id_long_names_.emplace_back(r.long_name_);
+  route_id.rotue_id_url_.emplace_back(r.url_);
   route_id.route_id_colors_.emplace_back(r.color_);
   route_id.route_id_type_.emplace_back(r.route_type_);
   route_id.route_id_provider_.emplace_back(r.agency_);

src/rt/frun.cc

@@ -290,6 +290,14 @@ std::string_view run_stop::route_long_name(event_type const ev_type,
                               route_ids->route_id_long_names_.at(route_id_idx));
 }
 
+std::string_view run_stop::route_url(event_type const ev_type,
+                                     lang_t const& lang) const {
+  auto const [route_ids, route_id_idx] = get_route(ev_type);
+  return route_ids == nullptr
+             ? "?"
+             : tt().translate(lang, route_ids->rotue_id_url_.at(route_id_idx));
+}
+
 std::string_view run_stop::trip_short_name(event_type const ev_type,
                                            lang_t const& lang) const {
   if (fr_->is_scheduled()) {