Merge pull request #113 from camsys/Test-NYS-147

Created getRouteTypes method and used ArrivalAndDepartureFilterByRout…
OneBusAway · May 15, 2023 · 6541bbb · 6541bbb
2 parents 915e2f3 + a1e90ed
commit 6541bbb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...src/main/java/org/onebusaway/transit_data/model/ArrivalAndDepartureFilterByRouteType.java b/...src/main/java/org/onebusaway/transit_data/model/ArrivalAndDepartureFilterByRouteType.java
@@ -41,6 +41,10 @@ public ArrivalAndDepartureFilterByRouteType(String routeTypeCommaDelimited) {
 
   }
 
+  public List<Integer> getRouteTypes() {
+    return routeTypes;
+  }
+
   public boolean matches(ArrivalAndDepartureBean bean) {
     if (routeTypes == null  || routeTypes.isEmpty())
       return true; // no filter, everything matches

diff --git a/...-data/src/main/java/org/onebusaway/transit_data/model/ArrivalsAndDeparturesQueryBean.java b/...-data/src/main/java/org/onebusaway/transit_data/model/ArrivalsAndDeparturesQueryBean.java
@@ -49,6 +49,7 @@ public final class ArrivalsAndDeparturesQueryBean implements Serializable {
   private FilterChain systemFilterChain = new FilterChain();
   private FilterChain instanceFilterChain = new FilterChain();
 
+ private List<Integer> routeTypes;
   public ArrivalsAndDeparturesQueryBean() {
 
   }
@@ -143,9 +144,16 @@ public void setRouteTypes(List<Integer> types) {
       if (types == null || types.isEmpty()) return;
       instanceFilterChain.add(new ArrivalAndDepartureFilterByRouteType(types));
   }
+
   public void setRouteType(String routeType) {
     if (routeType == null) return;
-    instanceFilterChain.add(new ArrivalAndDepartureFilterByRouteType(routeType));
+    ArrivalAndDepartureFilterByRouteType arrivalAndDepartureFilterByRouteType = new ArrivalAndDepartureFilterByRouteType(routeType);
+    routeTypes = arrivalAndDepartureFilterByRouteType.getRouteTypes();
+    instanceFilterChain.add(arrivalAndDepartureFilterByRouteType);
+  }
+
+  public List<Integer> getRouteTypes(){
+      return routeTypes;
   }
 
   public void setAgenciesExcludingScheduled(HashSet<String> agencies){