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

New region: Finland.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-06 17:03:01 +01:00
parent d4286b9d09
commit d1fd907edd
4 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -73,6 +73,9 @@ DSB|da-DK|DK;København
# SE # SE
SE|sv-SE|SE;Stockholm SE|sv-SE|SE;Stockholm
# FI
FINLAND|fi-FI|FI;Helsinki|beta
# GB # GB
TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham TLEM|en-UK|GB;Greater London;Derbyshire;Leicestershire;Rutland;Northamptonshire;Nottinghamshire;Lincolnshire;Berkshire;Buckinghamshire;East Sussex;Hampshire;Isle of Wight;Kent;Oxfordshire;Surrey;West Sussex;Essex;Hertfordshire;Bedfordshire;Cambridgeshire;Norfolk;Suffolk;Somerset;Gloucestershire;Wiltshire;Dorset;Devon;Cornwall;West Devon;Stowford;Eastleigh;Swindon;Gloucester;Plymouth;Torbay;Bournemouth;Poole;Birmingham
MERSEY|en-UK|GB;Liverpool|beta MERSEY|en-UK|GB;Liverpool|beta

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

@ -103,6 +103,8 @@
<string name="network_dsb_comment">Fern-, Regional und Lokalverkehr (z.B. Kopenhagen)</string> <string name="network_dsb_comment">Fern-, Regional und Lokalverkehr (z.B. Kopenhagen)</string>
<string name="network_se_label">Schweden</string> <string name="network_se_label">Schweden</string>
<string name="network_se_comment">Fern-, Regional und Lokalverkehr (z.B. Stockholm)</string> <string name="network_se_comment">Fern-, Regional und Lokalverkehr (z.B. Stockholm)</string>
<string name="network_finland_label">Finnland</string>
<string name="network_finland_comment">Fern-, Regional und Lokalverkehr (z.B. Helsinki)</string>
<string name="network_tlem_label">England, Schottland &amp; Wales.</string> <string name="network_tlem_label">England, Schottland &amp; Wales.</string>
<string name="network_tlem_comment">Lokal- und Regionalverkehr (z.B. London, Birmingham)</string> <string name="network_tlem_comment">Lokal- und Regionalverkehr (z.B. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string> <string name="network_mersey_label">Liverpool</string>

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

@ -104,6 +104,8 @@
<string name="network_dsb_comment">long-distance, regional and local (e.g. Copenhagen)</string> <string name="network_dsb_comment">long-distance, regional and local (e.g. Copenhagen)</string>
<string name="network_se_label">Sweden</string> <string name="network_se_label">Sweden</string>
<string name="network_se_comment">long-distance, regional and local (e.g. Stockholm)</string> <string name="network_se_comment">long-distance, regional and local (e.g. Stockholm)</string>
<string name="network_finland_label">Finland</string>
<string name="network_finland_comment">long-distance, regional and local (e.g. Helsinki)</string>
<string name="network_tlem_label">England, Scotland &amp; Wales</string> <string name="network_tlem_label">England, Scotland &amp; Wales</string>
<string name="network_tlem_comment">local and regional (e.g. London, Birmingham)</string> <string name="network_tlem_comment">local and regional (e.g. London, Birmingham)</string>
<string name="network_mersey_label">Liverpool</string> <string name="network_mersey_label">Liverpool</string>

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

@ -31,6 +31,7 @@ import de.schildbach.pte.CmtaProvider;
import de.schildbach.pte.DingProvider; import de.schildbach.pte.DingProvider;
import de.schildbach.pte.DsbProvider; import de.schildbach.pte.DsbProvider;
import de.schildbach.pte.DubProvider; import de.schildbach.pte.DubProvider;
import de.schildbach.pte.FinlandProvider;
import de.schildbach.pte.GvhProvider; import de.schildbach.pte.GvhProvider;
import de.schildbach.pte.InvgProvider; import de.schildbach.pte.InvgProvider;
import de.schildbach.pte.ItalyProvider; import de.schildbach.pte.ItalyProvider;
@ -188,6 +189,8 @@ public final class NetworkProviderFactory {
return new DsbProvider("{\"type\":\"AID\",\"aid\":\"irkmpm9mdznstenr-android\"}"); return new DsbProvider("{\"type\":\"AID\",\"aid\":\"irkmpm9mdznstenr-android\"}");
else if (networkId.equals(NetworkId.SE)) else if (networkId.equals(NetworkId.SE))
return new SeProvider("{\"type\":\"AID\",\"aid\":\"h5o3n7f4t2m8l9x1\"}"); return new SeProvider("{\"type\":\"AID\",\"aid\":\"h5o3n7f4t2m8l9x1\"}");
else if (networkId.equals(NetworkId.FINLAND))
return new FinlandProvider(NAVITIA_AUTHORIZATION);
else if (networkId.equals(NetworkId.TLEM)) else if (networkId.equals(NetworkId.TLEM))
return new TlemProvider(); return new TlemProvider();
else if (networkId.equals(NetworkId.MERSEY)) else if (networkId.equals(NetworkId.MERSEY))