reuse clasz regional fast -> ride sharing (#322)

* reuse clasz regional fast -> ride sharing

* fix test

Author: felixguendling

include/nigiri/types.h

@@ -385,7 +385,7 @@ enum class clasz : std::uint8_t {
   kLongDistance = 2,
   kCoach = 3,
   kNight = 4,
-  kRegionalFast = 5,
+  kRideSharing = 5,
   kRegional = 6,
   kSuburban = 7,
   kSubway = 8,
@@ -404,10 +404,10 @@ constexpr auto const kNumClasses =
 
 constexpr std::string_view to_str(clasz const c) {
   constexpr auto const clasz_str =
-      std::array{"AIR",    "HIGHSPEED",     "LONG_DISTANCE", "COACH",
-                 "NIGHT",  "REGIONAL_FAST", "REGIONAL",      "SUBURBAN",
-                 "SUBWAY", "TRAM",          "BUS",           "SHIP",
-                 "ODM",    "FUNICULAR",     "AERIAL_LIFT",   "OTHER"};
+      std::array{"AIR",    "HIGHSPEED",    "LONG_DISTANCE", "COACH",
+                 "NIGHT",  "RIDE_SHARING", "REGIONAL",      "SUBURBAN",
+                 "SUBWAY", "TRAM",         "BUS",           "SHIP",
+                 "ODM",    "FUNICULAR",    "AERIAL_LIFT",   "OTHER"};
   return clasz_str[static_cast<unsigned>(c)];
 }
 

src/clasz.cc

@@ -84,7 +84,7 @@ clasz get_clasz(std::string_view s) {
     case hash("RegioExpress"):
     case hash("TER"):  // Transport express regional
     case hash("TE2"): [[fallthrough]];  // Transport express regional
-    case hash("Cross-Country Rail"): return clasz::kRegionalFast;
+    case hash("Cross-Country Rail"): return clasz::kRegional;
 
     // local trains
     case hash("Railway Service"):
@@ -218,7 +218,8 @@ clasz to_clasz(std::string_view s) {
     case cista::hash("LONGDISTANCE"): return clasz::kLongDistance;
     case cista::hash("COACH"): return clasz::kCoach;
     case cista::hash("NIGHT"): return clasz::kNight;
-    case cista::hash("REGIONALFAST"): return clasz::kRegionalFast;
+    case cista::hash("RIDE_SHARING"): return clasz::kRideSharing;
+    case cista::hash("REGIONALFAST"): return clasz::kRegional;
     case cista::hash("REGIONAL"): return clasz::kRegional;
     case cista::hash("METRO"): return clasz::kSuburban;
     case cista::hash("SUBURBAN"): return clasz::kSuburban;

src/loader/gtfs/route.cc

@@ -25,7 +25,7 @@ clasz to_clasz(std::uint16_t const route_type) {
     case 1 /* Subway, Metro. Any underground rail system within a metropolitan area. */ :
       return clasz::kSubway;
     case 2 /* Rail. Used for intercity or long-distance travel. */:
-      return clasz::kRegionalFast;
+      return clasz::kRegional;
     case 3 /* Bus. Used for short- and long-distance bus routes. */:
       return clasz::kBus;
     case 4 /* Ferry. Used for short- and long-distance boat service. */:
@@ -40,7 +40,7 @@ clasz to_clasz(std::uint16_t const route_type) {
       return clasz::kBus;
     case 12 /* Monorail. Railway in which the track consists of a single rail or a beam. */ :
       return clasz::kOther;
-    case 100 /* Railway Service */: return clasz::kRegionalFast;
+    case 100 /* Railway Service */: return clasz::kRegional;
     case 101 /* High Speed Rail Service */: return clasz::kHighSpeed;
     case 102 /* Long Distance Trains */: return clasz::kLongDistance;
     case 103 /* Inter Regional Rail Service */: return clasz::kRegional;
@@ -120,6 +120,7 @@ clasz to_clasz(std::uint16_t const route_type) {
     case 1505 /* Licensed Taxi Service */:
     case 1506 /* Private Hire Service Vehicle */:
     case 1507 /* All Taxi Services */: return clasz::kODM;
+    case 1551 /* Ride Sharing */: return clasz::kRideSharing;
     case 1700 /* Miscellaneous Service */:
     case 1702 /* Horse-drawn Carriage */: return clasz::kOther;
   }

src/loader/register.cc

@@ -260,7 +260,7 @@ void route::set_clasz(clasz const x) {
     case clasz::kLongDistance: route_type_ = route_type_t{102}; return;
     case clasz::kCoach: route_type_ = route_type_t{200}; return;
     case clasz::kNight: route_type_ = route_type_t{105}; return;
-    case clasz::kRegionalFast: route_type_ = route_type_t{100}; return;
+    case clasz::kRideSharing: route_type_ = route_type_t{1551}; return;
     case clasz::kRegional: route_type_ = route_type_t{103}; return;
     case clasz::kSuburban: route_type_ = route_type_t{109}; return;
     case clasz::kSubway: route_type_ = route_type_t{402}; return;

test/loader/gtfs/route_test.cc

@@ -88,7 +88,7 @@ TEST(gtfs, read_routes_berlin_data) {
   EXPECT_EQ("Leisnig -- Leipzig, Hauptbahnhof",
             tt.get_default_translation(
                 src_routes.route_id_long_names_[route_809_idx]));
-  EXPECT_EQ(clasz::kRegionalFast,
+  EXPECT_EQ(clasz::kRegional,
             to_clasz(src_routes.route_id_type_[route_809_idx]));
 
   ASSERT_NE(end(routes), routes.find("812"));
@@ -101,7 +101,7 @@ TEST(gtfs, read_routes_berlin_data) {
                         src_routes.route_id_short_names_[route_812_idx]));
   EXPECT_EQ("", tt.get_default_translation(
                     src_routes.route_id_long_names_[route_812_idx]));
-  EXPECT_EQ(clasz::kRegionalFast,
+  EXPECT_EQ(clasz::kRegional,
             to_clasz(src_routes.route_id_type_[route_812_idx]));
   EXPECT_EQ(color_t{0xFFB10093},
             src_routes.route_id_colors_[route_812_idx].color_);

test/routing/clasz_filter_test.cc

@@ -151,15 +151,15 @@ TEST(routing, clasz_filter_test) {
   {  // All available classes.
     auto const results = raptor_search(
         tt, nullptr, "A", "C", tt.date_range_, direction::kForward,
-        make_mask(clasz::kBus, clasz::kRegionalFast, clasz::kAir));
+        make_mask(clasz::kBus, clasz::kRegional, clasz::kAir));
 
     EXPECT_EQ(expected, to_string(tt, results));
   }
 
   {  // No plane - one transfer, 2h
     auto const results = raptor_search(
         tt, nullptr, "A", "C", tt.date_range_, direction::kForward,
-        make_mask(clasz::kBus, clasz::kRegionalFast));
+        make_mask(clasz::kBus, clasz::kRegional));
 
     EXPECT_EQ(expected_1, to_string(tt, results));
   }
@@ -191,17 +191,17 @@ TEST(routing, clasz_filter_test) {
   rt::gtfsrt_update_msg(tt, rtt, source_idx_t{0}, "", msg);
 
   {  // All available classes.
-    auto const results = raptor_search(
-        tt, &rtt, "A", "C", tt.date_range_, direction::kForward,
-        make_mask(clasz::kBus, clasz::kRegionalFast, clasz::kAir));
+    auto const results =
+        raptor_search(tt, &rtt, "A", "C", tt.date_range_, direction::kForward,
+                      make_mask(clasz::kBus, clasz::kRegional, clasz::kAir));
 
     EXPECT_EQ(expected_rt, to_string(tt, results));
   }
 
   {  // No plane - one transfer, 2h
     auto const results =
         raptor_search(tt, &rtt, "A", "C", tt.date_range_, direction::kForward,
-                      make_mask(clasz::kBus, clasz::kRegionalFast));
+                      make_mask(clasz::kBus, clasz::kRegional));
 
     EXPECT_EQ(expected_rt_1, to_string(tt, results));
   }