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

Remove VGN (Nuremberg, Fürth and Erlangen).

Browse source 
Unfortunately, the VGN asked for itself to be temporarily removed.
This commit is contained in:
Andreas Schildbach 2018-07-18 13:02:48 +02:00
parent 77d49b939b
commit 350f686e66
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oeffi/assets/networks.txt
View file

@ -7,10 +7,10 @@ RT|eu|DE;AT;CH;BE;LU;NL;DK;SE;NO;FI;GB;SI;HU;RO;BG;PL;SK;IT;ES;PT
DB|de-DE|DE
BVG|de-DE|Brandenburg;Berlin
VBB|de-DE|Brandenburg
BAYERN|de-DE|Bayern;Würzburg;Regensburg
BAYERN|de-DE|Bayern;Nürnberg;Würzburg;Regensburg
AVV|de-DE|Augsburg
MVV|de-DE|Bayern;München
VGN|de-DE|Nürnberg;Fürth;Erlangen
VGN|de-DE|Nürnberg;Fürth;Erlangen|disabled
VVM|de-DE|Schwaben;Mittelschwaben;Krumbach;Günzburg;Memmingen
NVV|de-DE|Hessen;Frankfurt am Main;Kassel
VMV|de-DE|Mecklenburg-Vorpommern;Schwerin

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

@ -11,14 +11,14 @@
<string name="network_vbb_comment">Brandenburg &amp; Berlin, Lokal- und Regionalverkehr</string>
<string name="network_nvv_label">Hessen (Frankfurt/Rhein-Main, Kassel, …)</string>
<string name="network_nvv_comment">Lokal- und Regionalverkehr</string>
<string name="network_bayern_label">Bayern (Würzburg, Regensburg, …)</string>
<string name="network_bayern_label">Bayern (Nürnberg, Würzburg, Regensburg, …)</string>
<string name="network_bayern_comment">Lokal- und Regionalverkehr</string>
<string name="network_mvv_label">München</string>
<string name="network_mvv_comment">Lokal- und Regionalverkehr</string>
<string name="network_avv_label">Augsburg</string>
<string name="network_avv_comment">nur Tram und Bus</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_label">Nürnberg, Fürth &amp; Erlangen</string>
<string name="network_vgn_comment">Nicht verfügbar, weil der VGN vorübergehend nicht in Öffi enthalten sein will. Du kannst stattdessen Bayern verwenden, das funktioniert für Nürnberg auch gut.</string>
<string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string>
<string name="network_vvm_comment">Lokal- und Regionalverkehr</string>
<string name="network_vmv_label">Schwerin &amp; Mecklenburg-Vorpommern</string>

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

@ -11,14 +11,14 @@
<string name="network_vbb_comment">Brandenburg &amp; Berlin, local and regional</string>
<string name="network_nvv_label">Hesse (Frankfurt/Rhine-Main, Kassel, …)</string>
<string name="network_nvv_comment">local and regional</string>
<string name="network_bayern_label">Bavaria (Würzburg, Regensburg, …)</string>
<string name="network_bayern_label">Bavaria (Nuremberg, Würzburg, Regensburg, …)</string>
<string name="network_bayern_comment">local and regional</string>
<string name="network_mvv_label">Munich</string>
<string name="network_mvv_comment">local and regional</string>
<string name="network_avv_label">Augsburg</string>
<string name="network_avv_comment">tram and bus only</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_label">Nuremberg, Fürth &amp; Erlangen</string>
<string name="network_vgn_comment">Not available, because the VGN desires to temporarily not be included in Offi. You can select the Bavaria instead, it works well for Nuremberg too.</string>
<string name="network_vvm_label">Mittelschwaben (Krumbach, Günzburg, …)</string>
<string name="network_vvm_comment">local and regional</string>
<string name="network_vmv_label">Schwerin &amp; Mecklenburg-Vorpommern</string>

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

@ -132,6 +132,11 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, IVB);
QueryHistoryProvider.deleteQueryHistory(this, IVB);
// 2018-07-20: migrate VGN to use Bayern
final String VGN = "VGN";
migrateSelectedNetwork(VGN, NetworkId.BAYERN);
Downloader.deleteDownload(new File(getFilesDir(), VGN.toLowerCase(Locale.ENGLISH) + ".db"));
log.info("Migrations took {}", watch);
}

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

@ -61,7 +61,6 @@ import de.schildbach.pte.VagfrProvider;
import de.schildbach.pte.VbbProvider;
import de.schildbach.pte.VblProvider;
import de.schildbach.pte.VbnProvider;
import de.schildbach.pte.VgnProvider;
import de.schildbach.pte.VmsProvider;
import de.schildbach.pte.VmtProvider;
import de.schildbach.pte.VmvProvider;
@ -110,8 +109,6 @@ public final class NetworkProviderFactory {
return new MvvProvider();
else if (networkId.equals(NetworkId.AVV))
return new AvvProvider();
else if (networkId.equals(NetworkId.VGN))
return new VgnProvider();
else if (networkId.equals(NetworkId.VVM))
return new VvmProvider();
else if (networkId.equals(NetworkId.VMV))