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

networks.txt: migrate AVV (EFA) to AVV_AUGSBURG (Hafas)

Browse source
This commit is contained in:
Andreas Schildbach 2023-11-16 16:29:58 +01:00
parent ba3a37f6df
commit 843ed0fa7e
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oeffi/assets/networks.txt
View file

@ -8,7 +8,7 @@ DB|de-DE|DE
BVG|de-DE|Brandenburg;Berlin BVG|de-DE|Brandenburg;Berlin
VBB|de-DE|Brandenburg VBB|de-DE|Brandenburg
BAYERN|de-DE|Bayern;Würzburg;Regensburg BAYERN|de-DE|Bayern;Würzburg;Regensburg
AVV|de-DE|Augsburg AVV_AUGSBURG|de-DE|Augsburg
MVV|de-DE|Bayern;München MVV|de-DE|Bayern;München
INVG|de-DE|Ingolstadt INVG|de-DE|Ingolstadt
VGN|de-DE|Nürnberg;Fürth;Erlangen VGN|de-DE|Nürnberg;Fürth;Erlangen

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

@ -19,8 +19,8 @@
<string name="network_mvv_comment">Lokal- und Regionalverkehr</string> <string name="network_mvv_comment">Lokal- und Regionalverkehr</string>
<string name="network_invg_label">Ingolstadt</string> <string name="network_invg_label">Ingolstadt</string>
<string name="network_invg_comment">Lokal- und Regionalverkehr</string> <string name="network_invg_comment">Lokal- und Regionalverkehr</string>
<string name="network_avv_label">Augsburg</string> <string name="network_avv_augsburg_label">Augsburg</string>
<string name="network_avv_comment">nur Tram und Bus</string> <string name="network_avv_augsburg_comment">nur Tram und Bus</string>
<string name="network_vgn_label">Verkehrsverbund Großraum Nürnberg</string> <string name="network_vgn_label">Verkehrsverbund Großraum Nürnberg</string>
<string name="network_vgn_comment">Nürnberg, Fürth &amp; Erlangen, Lokal- und Regionalverkehr</string> <string name="network_vgn_comment">Nürnberg, Fürth &amp; Erlangen, Lokal- und Regionalverkehr</string>
<string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string> <string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string>

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

@ -18,8 +18,8 @@
<string name="network_mvv_comment">local and regional</string> <string name="network_mvv_comment">local and regional</string>
<string name="network_invg_label">Ingolstadt</string> <string name="network_invg_label">Ingolstadt</string>
<string name="network_invg_comment">local and regional</string> <string name="network_invg_comment">local and regional</string>
<string name="network_avv_label">Augsburg</string> <string name="network_avv_augsburg_label">Augsburg</string>
<string name="network_avv_comment">tram and bus only</string> <string name="network_avv_augsburg_comment">tram and bus only</string>
<string name="network_vgn_label">Verkehrsverbund Großraum Nürnberg</string> <string name="network_vgn_label">Verkehrsverbund Großraum Nürnberg</string>
<string name="network_vgn_comment">Nuremberg, Fürth &amp; Erlangen, local and regional</string> <string name="network_vgn_comment">Nuremberg, Fürth &amp; Erlangen, local and regional</string>
<string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string> <string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string>

6
oeffi/src/de/schildbach/oeffi/Application.java
View file

@ -115,6 +115,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, TFI); FavoriteStationsProvider.deleteFavoriteStations(this, TFI);
QueryHistoryProvider.deleteQueryHistory(this, TFI); QueryHistoryProvider.deleteQueryHistory(this, TFI);
// 2023-11-16: migrate AVV to use AVV_AUGSBURG
final String AVV = "AVV";
migrateSelectedNetwork(AVV, NetworkId.AVV_AUGSBURG);
FavoriteStationsProvider.deleteFavoriteStations(this, AVV);
QueryHistoryProvider.deleteQueryHistory(this, AVV);
log.info("Migrations took {}", watch); log.info("Migrations took {}", watch);
} }

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

@ -21,7 +21,7 @@ import com.google.common.base.Charsets;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
import de.schildbach.pte.AbstractNetworkProvider; import de.schildbach.pte.AbstractNetworkProvider;
import de.schildbach.pte.AvvAachenProvider; import de.schildbach.pte.AvvAachenProvider;
import de.schildbach.pte.AvvProvider; import de.schildbach.pte.AvvAugsburgProvider;
import de.schildbach.pte.BartProvider; import de.schildbach.pte.BartProvider;
import de.schildbach.pte.BayernProvider; import de.schildbach.pte.BayernProvider;
import de.schildbach.pte.BsvagProvider; import de.schildbach.pte.BsvagProvider;
@ -119,8 +119,8 @@ public final class NetworkProviderFactory {
else if (networkId.equals(NetworkId.INVG)) else if (networkId.equals(NetworkId.INVG))
return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}", return new InvgProvider("{\"type\":\"AID\",\"aid\":\"GITvwi3BGOmTQ2a5\"}",
"ERxotxpwFT7uYRsI".getBytes(Charsets.UTF_8)); "ERxotxpwFT7uYRsI".getBytes(Charsets.UTF_8));
else if (networkId.equals(NetworkId.AVV)) else if (networkId.equals(NetworkId.AVV_AUGSBURG))
return new AvvProvider(); return new AvvAugsburgProvider("{\"type\":\"AID\",\"aid\":\"jK91AVVZU77xY5oH\"}");
else if (networkId.equals(NetworkId.VGN)) else if (networkId.equals(NetworkId.VGN))
return new VgnProvider(HttpUrl.parse("https://efa.vgn.de/vgnExt_oeffi/")); return new VgnProvider(HttpUrl.parse("https://efa.vgn.de/vgnExt_oeffi/"));
else if (networkId.equals(NetworkId.VVM)) else if (networkId.equals(NetworkId.VVM))