Merge remote-tracking branch 'origin/release/9.0' into release/9.0

Author: epicstar

pat-static/src/main/java/com/rectanglel/patstatic/model/RetrofitPatApi.kt

@@ -23,7 +23,7 @@ interface RetrofitPatApi {
      * Generates a response to get routes from the API
      * @return the list of routes available from the TrueTime API
      */
-    @get:GET("getroutes?format=json&rtpidatafeed=Port%20Authority%20Bus")
+    @get:GET("getroutes?format=json")
     val routes: Single<BusRouteResponse>
 
     /**
@@ -37,7 +37,7 @@ interface RetrofitPatApi {
      * Generates a response to get vehicles
      * @param routes - the routes
      */
-    @GET("getvehicles?format=json&rtpidatafeed=Port%20Authority%20Bus")
+    @GET("getvehicles?format=json")
     fun getVehicles(@Query("rt") routes: String): Flowable<VehicleResponse>
 
     /**

pat-static/src/main/kotlin/com/rectanglel/patstatic/patterns/PatternDataManager.kt

@@ -54,6 +54,12 @@ class PatternDataManager(dataDirectory: File,
             getPatternsFromInternet(rt)
         } else {
             getPatternsFromDisk(rt)
+                .concatMap { ptrList ->
+                    when {
+                        ptrList.size == 0 -> getPatternsFromInternet(rt)
+                        else -> Flowable.just(ptrList)
+                    }
+                }
         }
     }