From 8c74b58d25fd5ad97ee5689d348816c1986c3883 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 18 Jan 2019 14:29:57 +0100 Subject: [PATCH] New region: Spain. --- 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 cee2efe..d0167ed 100644 --- a/oeffi/assets/networks.txt +++ b/oeffi/assets/networks.txt @@ -57,6 +57,9 @@ IT|it-IT|IT|alpha # FR PARIS|fr-FR|FR|alpha +# ES +SPAIN|es-ES|ES|alpha + # BE SNCB|be-BE|BE|alpha diff --git a/oeffi/res/values-de/networks.xml b/oeffi/res/values-de/networks.xml index 5b4f3b2..9f6400e 100644 --- a/oeffi/res/values-de/networks.xml +++ b/oeffi/res/values-de/networks.xml @@ -91,6 +91,8 @@ Fern-, Regional und Lokalverkehr (z.B. Mailand, Rom, Neapel) Paris Lokal- und Regionalverkehr + Spanien + Lokal- und Regionalverkehr (z.B. Barcelona) Belgien Fern-, Regional und Lokalverkehr (z.B. Antwerpen, Gent, Charleroi, BrĂ¼ssel) Luxemburg diff --git a/oeffi/res/values/networks.xml b/oeffi/res/values/networks.xml index 22040ae..13436f5 100644 --- a/oeffi/res/values/networks.xml +++ b/oeffi/res/values/networks.xml @@ -92,6 +92,8 @@ long-distance, regional and local (e.g. Milan, Rome, Naples) Paris local and regional + Spain + local and regional (e.g. Barcelona) Belgium long-distance, regional and local (e.g. Antwerp, Ghent, Charleroi, Brussels) Luxembourg diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java index 0fb85d8..459525d 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java @@ -59,6 +59,7 @@ import de.schildbach.pte.SbbProvider; import de.schildbach.pte.SeProvider; import de.schildbach.pte.ShProvider; import de.schildbach.pte.SncbProvider; +import de.schildbach.pte.SpainProvider; import de.schildbach.pte.StvProvider; import de.schildbach.pte.SydneyProvider; import de.schildbach.pte.TfiProvider; @@ -185,6 +186,8 @@ public final class NetworkProviderFactory { return new ItalyProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.PARIS)) return new ParisProvider(NAVITIA_AUTHORIZATION); + else if (networkId.equals(NetworkId.SPAIN)) + return new SpainProvider(NAVITIA_AUTHORIZATION); else if (networkId.equals(NetworkId.SNCB)) return new SncbProvider("{\"type\":\"AID\",\"aid\":\"sncb-mobi\"}"); else if (networkId.equals(NetworkId.LU))