Change to index trip pattern for feed id, for #1990

opentripplanner · Jun 22, 2015 · 060c540 · 060c540
1 parent b5569f0
commit 060c540
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/AlertPatch.java b/src/main/java/org/opentripplanner/routing/alertpatch/AlertPatch.java
@@ -127,11 +127,8 @@ public void apply(Graph graph) {
             } else if (route != null) {
                tripPatterns = graph.index.patternsForRoute.get(route);
             } else {
-                // Find patterns for the agency.
+                // Find patterns for the feed.
-                Multimap<Agency, TripPattern> patternsForAgency = graph.index.agencyPatternsForFeedId.get(feedId);
+                tripPatterns = graph.index.patternsForFeedId.get(feedId);
-                if (patternsForAgency != null) {
-                    tripPatterns = patternsForAgency.get(agency);
-                }
             }
 
             if (tripPatterns != null) {
@@ -191,11 +188,8 @@ public void remove(Graph graph) {
             } else if (route != null) {
                tripPatterns = graph.index.patternsForRoute.get(route);
             } else {
-                // Find patterns for the agency.
+                // Find patterns for the feed.
-                Multimap<Agency, TripPattern> patternsForAgency = graph.index.agencyPatternsForFeedId.get(feedId);
+                tripPatterns = graph.index.patternsForFeedId.get(feedId);
-                if (patternsForAgency != null) {
-                    tripPatterns = patternsForAgency.get(agency);
-                }
             }
 
             if (tripPatterns != null) {

diff --git a/src/main/java/org/opentripplanner/routing/graph/GraphIndex.java b/src/main/java/org/opentripplanner/routing/graph/GraphIndex.java
@@ -60,7 +60,7 @@ public class GraphIndex {
     public final Map<String, TripPattern> patternForId = Maps.newHashMap();
     public final Map<Stop, TransitStop> stopVertexForStop = Maps.newHashMap();
     public final Map<Trip, TripPattern> patternForTrip = Maps.newHashMap();
-    public final Map<String, Multimap<Agency, TripPattern>> agencyPatternsForFeedId = Maps.newHashMap();
+    public final Multimap<String, TripPattern> patternsForFeedId = ArrayListMultimap.create();
     public final Multimap<Route, TripPattern> patternsForRoute = ArrayListMultimap.create();
     public final Multimap<Stop, TripPattern> patternsForStop = ArrayListMultimap.create();
     public final Multimap<String, Stop> stopsForParentStation = ArrayListMultimap.create();
@@ -130,14 +130,7 @@ public GraphIndex (Graph graph) {
             // The key stored in patternForId is the pattern code that is constructed as.
             // Agency:RouteId:DirectionId:PatternNumber, the first part is the feed id.
             String feedId = pattern.code.substring(0, pattern.code.indexOf(':'));
-            Multimap<Agency, TripPattern> patternsForAgency;
+            patternsForFeedId.put(feedId, pattern);
-            if (!agencyPatternsForFeedId.containsKey(feedId)) {
-                patternsForAgency = ArrayListMultimap.create();
-            } else {
-                patternsForAgency = agencyPatternsForFeedId.get(feedId);
-            }
-            patternsForAgency.put(pattern.route.getAgency(), pattern);
-            agencyPatternsForFeedId.put(feedId, patternsForAgency);
 
             patternsForRoute.put(pattern.route, pattern);