Remove old TKRouter.modesToGroupInRequest

Should instead use `TKUIRoutingResultsCard.config.routingModeRequestGroupAdjuster`
or `groupedModeIdentifiers` input to `multiFetchTrips`.

Author: nighthawk

Sources/TripKit/server/TKRouter.swift

@@ -244,8 +244,7 @@ extension TKRouter {
 
     let groupedIdentifier = groupedModeIdentifiers ?? TKTransportMode.groupModeIdentifiers(
       enabledModes,
-      includeGroupForAll: true,
-      alwaysGroupedModeIdentifierPrefixes: TKRouter.modesToGroupInRequest ?? []
+      includeGroupForAll: true
     )
 
     let tripRequest: TripRequest = try request.performAndWait {

Sources/TripKitAPI/TKRouter.swift

@@ -24,13 +24,6 @@ public class TKRouter: NSObject {
   /// Optional parameters to add to routing query. Only used by TripKit.
   public static var defaultParameters: [URLQueryItem]? = nil
 
-  /// Optional setting to group certain modes always in a single `routing.json` when sending a
-  /// multi-fetch request.
-  ///
-  /// If you're using `TKUIRoutingResultsCard`, prefer
-  /// `TKUIRoutingResultsCard.config.routingModeRequestGroupAdjuster`.
-  public static var modesToGroupInRequest: [String]? = nil
-  
   /// Optional server to use instead of ``TKServer/shared``.
   public var server: TKServer?
 
@@ -104,8 +97,7 @@ extension TKRouter {
     } else {
       let groupedIdentifier = TKTransportMode.groupModeIdentifiers(
         request.modes,
-        includeGroupForAll: true,
-        alwaysGroupedModeIdentifierPrefixes: TKRouter.modesToGroupInRequest ?? []
+        includeGroupForAll: true
       )
       guard !groupedIdentifier.isEmpty else {
         throw RoutingError.invalidRequest("No modes enabled")
@@ -265,11 +257,9 @@ extension TKTransportMode {
   ///   - modes: A set of all the identifiers to be grouped
   ///   - includeGroupForAll: If an extra group which has all the identifiers should be added
   /// - Returns: A set of a set of mode identifiers
-  public static func groupModeIdentifiers(_ modes: Set<String>, includeGroupForAll: Bool, alwaysGroupedModeIdentifierPrefixes: [String] = []) -> Set<Set<String>> {
-    let identifiersToAlwaysGroup = alwaysGroupedModeIdentifierPrefixes
+  public static func groupModeIdentifiers(_ modes: Set<String>, includeGroupForAll: Bool) -> Set<Set<String>> {
     var result: Set<Set<String>> = []
     var processedModes: Set<String> = []
-    var specialGroups: [String: Set<String>] = [:]
     var includesWalkOnly = false
 
     for mode in modes {
@@ -279,10 +269,6 @@ extension TKTransportMode {
         continue // don't add flights by themselves
       } else if mode == TKTransportMode.walking.modeIdentifier || mode == TKTransportMode.wheelchair.modeIdentifier {
         includesWalkOnly = true
-      } else if let forceGroup = identifiersToAlwaysGroup.first(where: { mode.hasPrefix($0) }) {
-        specialGroups[forceGroup, default: []].insert(mode)
-        processedModes.insert(mode)
-        continue
       }
 
       var group: Set<String> = [mode]
@@ -306,10 +292,6 @@ extension TKTransportMode {
       processedModes.formUnion(group)
     }
 
-    for specials in specialGroups.values {
-      result.insert(specials)
-    }
-    
     if includeGroupForAll, result.count > 1 + (includesWalkOnly ? 1 : 0) {
       result.insert(modes)
     }

Tests/TripKitTests/parsing/TKRegionManagerTest.swift

@@ -112,31 +112,4 @@ class TKRegionManagerTest: XCTestCase {
     ])
   }
 
-  func testGroupingSchoolBusModes() {
-    let inputModes: Set<String> = [
-      "pt_pub",
-      "pt_ltd_SCHOOLBUS_1",
-      "pt_ltd_SCHOOLBUS_2",
-      "pt_ltd_SCHOOLBUS_3",
-      "wa_wal",
-      "cy_bic"]
-    
-    let groupedModes = TKTransportMode.groupModeIdentifiers(
-      inputModes,
-      includeGroupForAll: false,
-      alwaysGroupedModeIdentifierPrefixes: ["pt_ltd_SCHOOLBUS"]
-    )
-    
-    let expectedGroups: Set<Set<String>> = [
-      ["pt_pub"],
-      ["pt_ltd_SCHOOLBUS_1",
-       "pt_ltd_SCHOOLBUS_2",
-       "pt_ltd_SCHOOLBUS_3"],
-      ["wa_wal"],
-      ["cy_bic"]
-    ]
-    
-    XCTAssertEqual(groupedModes, expectedGroups, "The grouped modes are not correct")
-  }
-  
 }