From 2c5b5c5ba672d3e10a8c5457ad7d1eadee248c61 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 17 Oct 2019 20:51:59 +0200 Subject: [PATCH] New region: Prague. --- oeffi/assets/networks.txt | 3 +++ oeffi/res/values-de/networks.xml | 2 ++ oeffi/res/values/networks.xml | 2 ++ .../de/schildbach/oeffi/network/NetworkProviderFactory.java | 3 +++ 4 files changed, 10 insertions(+) diff --git a/oeffi/assets/networks.txt b/oeffi/assets/networks.txt index d0167ed..82853dd 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -46,6 +46,9 @@ VVT|de-AT|Tirol|disabled SVV|de-AT|Salzburg|disabled VMOBIL|de-AT|Vorarlberg;Bregenz|disabled +# CZ +CZECH_REPUBLIC|cs-CZ|Tschechien;Praha;Prag|beta + # CH SBB|de-CH|CH VBL|de-CH|Luzern diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index e77bd4a..ee9b92c 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -81,6 +81,8 @@ Lokal- und Regionalverkehr Bregenz & Vorarlberg Nicht verfügbar, weil der VVV ausdrücklich darum gebeten hat, nicht in Öffi enthalten zu sein. Du kannst stattdessen die ÖBB verwenden, das funktioniert für Vorarlberg auch gut. + Prag + Lokal- und Regionalverkehr Schweiz Fern- und Regionalverkehr (z.B. Genf, Basel, Bern) Luzern diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index 525ba7f..1b0d0b0 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -82,6 +82,8 @@ local and regional Bregenz & Vorarlberg Not available, because the VVV explicitly desires not to be included in Offi. You can use the ÖBB instead, it works well for Vorarlberg too. + Prague + local and regional long-distance and regional (e.g. Geneva, Basel, Bern) Switzerland Lucerne diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 5c67609..78195c1 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -29,6 +29,7 @@ import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BsvagProvider; import de.schildbach.pte.BvgProvider; import de.schildbach.pte.CmtaProvider; +import de.schildbach.pte.CzechRepublicProvider; import de.schildbach.pte.DbProvider; import de.schildbach.pte.DingProvider; import de.schildbach.pte.DsbProvider; @@ -177,6 +178,8 @@ public final class NetworkProviderFactory { return new LinzProvider(); else if (networkId.equals(NetworkId.STV)) return new StvProvider(); + else if (networkId.equals(NetworkId.CZECH_REPUBLIC)) + return new CzechRepublicProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.SBB)) return new SbbProvider(); else if (networkId.equals(NetworkId.VBL))