From 0a95a2d7516206fa011470d1c14e2104c0837308 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 24 Sep 2024 18:32:42 -0700
Subject: [PATCH] fix(orca-fares): remove fare attributes with no rules

---
 .../ext/fares/impl/DefaultFareServiceFactory.java        | 2 +-
 .../opentripplanner/ext/fares/impl/OrcaFareFactory.java  | 2 ++
 .../org/opentripplanner/ext/fares/model/FareRuleSet.java | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
index ee4c87924ea..d7a3a0425ec 100644
--- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
+++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java
@@ -92,7 +92,7 @@ protected void fillFareRules(
       FareRuleSet fareRule = fareRuleSet.get(id);
       if (fareRule == null) {
         // Should never happen by design
-        LOG.error("Inexistant fare ID in fare rule: " + id);
+        LOG.error("Nonexistent fare ID in fare rule: " + id);
         continue;
       }
       String contains = rule.getContainsId();
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
index 34a03c1fc06..d48cad48450 100644
--- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
+++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareFactory.java
@@ -24,6 +24,8 @@ public FareService makeFareService() {
   @Override
   public void processGtfs(FareRulesData fareRuleService, OtpTransitService transitService) {
     fillFareRules(fareRuleService.fareAttributes(), fareRuleService.fareRules(), regularFareRules);
+    // ORCA agencies don't rely on fare attributes without rules, so let's remove them.
+    regularFareRules.entrySet().removeIf(entry -> !entry.getValue().hasRules());
   }
 
   /**
diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java b/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
index 30119631216..97cc4e637d2 100644
--- a/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
+++ b/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java
@@ -40,6 +40,15 @@ public Set<RouteOriginDestination> getRouteOriginDestinations() {
     return routeOriginDestinations;
   }
 
+  public boolean hasRules() {
+    return (
+      !routes.isEmpty() ||
+      !originDestinations.isEmpty() ||
+      !routeOriginDestinations.isEmpty() ||
+      !contains.isEmpty()
+    );
+  }
+
   public void addContains(String containsId) {
     contains.add(containsId);
   }