From 7dfb4bed049bde5b7950f3e2e8233fd4c06950cc Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 17 Oct 2019 22:19:28 +0200 Subject: [PATCH] New region: San Francisco. --- oeffi/assets/networks.txt | 1 + oeffi/res/values-de/networks.xml | 2 ++ oeffi/res/values/networks.xml | 2 ++ .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 +++ 4 files changed, 8 insertions(+) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index 82853dd..a963e1f 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -95,6 +95,7 @@ PL|pl-PL|PL;Warschau DUB|ae-AE|AE;Dubai|beta # US +BART|us-US|US;California;Kalifornien;San Francisco|beta RTACHICAGO|us-US|US;Illinois;Chicago|beta CMTA|us-US|US;Texas;Austin|beta diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index ee9b92c..e4f5ed0 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -117,6 +117,8 @@ Fern-, Regional und Lokalverkehr (z.B. Warschau) Dubai Lokalverkehr + San Francisco + Lokal- und Regionalverkehr Chicago Lokal- und Regionalverkehr Austin, Texas diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index 1b0d0b0..4c1b871 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -118,6 +118,8 @@ long-distance, regional and local (e.g. Warsaw) Dubai local + San Francisco + local and regional Chicago local and regional Austin, Texas diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 78195c1..ac6d1d5 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -25,6 +25,7 @@ import com.google.common.base.Charsets; import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AvvAachenProvider; import de.schildbach.pte.AvvProvider; +import de.schildbach.pte.BartProvider; import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BsvagProvider; import de.schildbach.pte.BvgProvider; @@ -214,6 +215,8 @@ public final class NetworkProviderFactory { return new PlProvider(); else if (networkId.equals(NetworkId.DUB)) return new DubProvider(); + else if (networkId.equals(NetworkId.BART)) + return new BartProvider("{\"type\":\"AID\",\"aid\":\"kEwHkFUCIL500dym\"}"); else if (networkId.equals(NetworkId.RTACHICAGO)) return new RtaChicagoProvider(); else if (networkId.equals(NetworkId.CMTA))