fix: fuzzy logic

HSLdevcom · Feb 26, 2021 · a33ae45 · a33ae45
1 parent f8c82b9
commit a33ae45
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/main/java/org/opentripplanner/routing/impl/DefaultFareServiceFactory.java b/src/main/java/org/opentripplanner/routing/impl/DefaultFareServiceFactory.java
@@ -89,9 +89,6 @@ protected void fillFareRules(String agencyId, Collection<FareAttribute> fareAttr
                     fareRule.addRouteOriginDestination(routeId.toString(), origin, destination);
                 } else {
                     fareRule.addRoute(routeId);
-                    if (origin != null || destination != null) {
-                        fareRule.addOriginDestination(origin, destination);
-                    }
                 }
             } else {
                 if (origin != null || destination != null) {

diff --git a/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java
@@ -113,7 +113,7 @@ but visit temporarily (maybe 1 stop only) an 'external' zone */
             for (FareRuleSet ruleSet : fareRules) {
                 String routeOriginDestination = String.valueOf(ride.route) + ", " + String.valueOf(ride.startZone) + ", " + String.valueOf(ride.endZone);
                 boolean isSpecialRoute = false;
-                if(ruleSet.getRoutes().size() == 1 && !ruleSet.getRouteOriginDestinations().isEmpty() && ruleSet.getRouteOriginDestinations().toString().indexOf(routeOriginDestination) != -1) {
+                if(!ruleSet.getRouteOriginDestinations().isEmpty() && ruleSet.getRouteOriginDestinations().toString().indexOf(routeOriginDestination) != -1) {
                     isSpecialRoute = true;
                 }
                 if(isSpecialRoute || (ruleSet.getRoutes().contains(ride.route) &&