mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 18:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New region: Aachen, Germany.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-13 20:36:22 +01:00
parent c7ece64273
commit ea069dd976
4 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oeffi/assets/networks.txt
View file

@ -25,6 +25,7 @@ NASA|de-DE|Sachsen;Leipzig;Sachsen-Anhalt;Magdeburg;Halle
VMT|de-DE|Thüringen;Mittelthüringen;Erfurt;Jena;Gera;Weimar;Gotha VMT|de-DE|Thüringen;Mittelthüringen;Erfurt;Jena;Gera;Weimar;Gotha
VRR|de-DE|Nordrhein-Westfalen;Essen;Dortmund;Düsseldorf;Münster;Paderborn;Höxter;Bielefeld VRR|de-DE|Nordrhein-Westfalen;Essen;Dortmund;Düsseldorf;Münster;Paderborn;Höxter;Bielefeld
VRS|de-DE|Köln;Bonn VRS|de-DE|Köln;Bonn
AVV_AACHEN|de-DE|Aachen
MVG|de-DE|Märkischer Kreis;Lüdenscheid MVG|de-DE|Märkischer Kreis;Lüdenscheid
VRN|de-DE|Baden-Württemberg;Rheinland-Pfalz;Mannheim;Mainz;Trier VRN|de-DE|Baden-Württemberg;Rheinland-Pfalz;Mannheim;Mainz;Trier
VVS|de-DE|Baden-Württemberg;Stuttgart VVS|de-DE|Baden-Württemberg;Stuttgart

2
oeffi/res/values-de/networks.xml
View file

@ -45,6 +45,8 @@
<string name="network_vrr_comment">Nordrhein-Westfalen, Düsseldorf &amp; Dortmund, Lokal- und Regionalverkehr</string> <string name="network_vrr_comment">Nordrhein-Westfalen, Düsseldorf &amp; Dortmund, Lokal- und Regionalverkehr</string>
<string name="network_vrs_label">Köln &amp; Bonn</string> <string name="network_vrs_label">Köln &amp; Bonn</string>
<string name="network_vrs_comment">Lokal- und Regionalverkehr</string> <string name="network_vrs_comment">Lokal- und Regionalverkehr</string>
<string name="network_avv_aachen_label">Aachen</string>
<string name="network_avv_aachen_comment">Lokal- und Regionalverkehr</string>
<string name="network_mvg_label">Lüdenscheid &amp; Märkischer Kreis</string> <string name="network_mvg_label">Lüdenscheid &amp; Märkischer Kreis</string>
<string name="network_mvg_comment">Lokal- und Regionalverkehr</string> <string name="network_mvg_comment">Lokal- und Regionalverkehr</string>
<string name="network_vrn_label">Rheinland-Pfalz, Rhein-Neckar &amp; Baden-Württemberg</string> <string name="network_vrn_label">Rheinland-Pfalz, Rhein-Neckar &amp; Baden-Württemberg</string>

2
oeffi/res/values/networks.xml
View file

@ -45,6 +45,8 @@
<string name="network_vrr_comment">North Rhine-Westphalia, Düsseldorf &amp; Dortmund, local and regional</string> <string name="network_vrr_comment">North Rhine-Westphalia, Düsseldorf &amp; Dortmund, local and regional</string>
<string name="network_vrs_label">Cologne &amp; Bonn</string> <string name="network_vrs_label">Cologne &amp; Bonn</string>
<string name="network_vrs_comment">local and regional</string> <string name="network_vrs_comment">local and regional</string>
<string name="network_avv_aachen_label">Aachen</string>
<string name="network_avv_aachen_comment">local and regional</string>
<string name="network_mvg_label">Lüdenscheid &amp; Märkischer Kreis</string> <string name="network_mvg_label">Lüdenscheid &amp; Märkischer Kreis</string>
<string name="network_mvg_comment">local and regional</string> <string name="network_mvg_comment">local and regional</string>
<string name="network_vrn_label">Rhineland-Palatinate, Rhine-Neckar &amp; Baden-Württemberg</string> <string name="network_vrn_label">Rhineland-Palatinate, Rhine-Neckar &amp; Baden-Württemberg</string>

3
oeffi/src/de/schildbach/oeffi/network/NetworkProviderFactory.java
View file

@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AbstractNetworkProvider;
import de.schildbach.pte.AvvAachenProvider;
import de.schildbach.pte.AvvProvider; import de.schildbach.pte.AvvProvider;
import de.schildbach.pte.BahnProvider; import de.schildbach.pte.BahnProvider;
import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BayernProvider;
@ -140,6 +141,8 @@ public final class NetworkProviderFactory {
return new VrrProvider(HttpUrl.parse("https://app.vrr.de/oeffi/")); return new VrrProvider(HttpUrl.parse("https://app.vrr.de/oeffi/"));
else if (networkId.equals(NetworkId.VRS)) else if (networkId.equals(NetworkId.VRS))
return new VrsProvider(); return new VrsProvider();
else if (networkId.equals(NetworkId.AVV_AACHEN))
return new AvvAachenProvider("{\"type\":\"AID\",\"aid\":\"4vV1AcH3N511icH\"}");
else if (networkId.equals(NetworkId.MVG)) else if (networkId.equals(NetworkId.MVG))
return new MvgProvider(); return new MvgProvider();
else if (networkId.equals(NetworkId.VRN)) else if (networkId.equals(NetworkId.VRN))