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

networks.txt: merge VMS into VVO

Browse source
This commit is contained in:
Andreas Schildbach 2023-01-09 18:37:25 +01:00
parent 6696c8f293
commit b10f240ea5
6 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oeffi/assets/networks.txt
View file

@ -19,8 +19,7 @@ SH|de-DE|Schleswig-Holstein;Kiel;Lübeck;Hamburg
GVH|de-DE|Niedersachsen;Hannover;Hamburg
BSVAG|de-DE|Braunschweig;Wolfsburg
VBN|de-DE|Niedersachsen;Hamburg;Bremen;Bremerhaven;Oldenburg (Oldenburg);Osnabrück;Göttingen;Rostock
VVO|de-DE|Sachsen;Dresden
VMS|de-DE|Mittelsachsen;Chemnitz
VVO|de-DE|Sachsen;Dresden;Mittelsachsen;Chemnitz
NASA|de-DE|Sachsen;Leipzig;Sachsen-Anhalt;Magdeburg;Halle
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

25
oeffi/res/drawable-anydpi/network_vms_logo.xml
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="48dp"
android:viewportHeight="127.8"
android:viewportWidth="127.8"
android:width="48dp">
<path
android:fillColor="#DD0B2F"
android:pathData="M32.7,46.2l11.5,0l-35.2,35.2l-9,0l0,-35.2l8.7,0l0,23.9z" />
<path
android:fillColor="#008244"
android:pathData="M48.1,57.5l-23.9,23.9l-11.5,0l35.1,-35.2l9,0l0,24.1l24,-24.1l8.8,0l0,35.2l-8.8,0l0,-23.6l-23.7,23.6l-9,0z" />
<path
android:fillColor="#DD0B2F"
android:pathData="m56.8,42.5v-15.7h-15.7v6.8c0,0 1.3,0 2.2,0 0.9,-0.1 1.6,-0.2 1.6,-0.2l-9.1,9.2L46,42.6l4.2,-4.2c0,0 -0.3,1.2 -0.3,2 -0.1,0.8 -0.1,2.2 -0.1,2.2h7z" />
<path
android:fillColor="#008244"
android:pathData="m126.5,46.2v8.6L103,54.8c-0.3,0 -1.1,0.1 -1.5,0.6 -0.4,0.5 -0.6,0.9 -0.6,1.5v1.1c0,0.1 0.1,0.6 0.4,1 0.3,0.4 0.7,0.7 1.3,0.7h16.8c1.1,0 4.1,1 5.8,2.9 1.9,2 2.6,4.4 2.6,6.6 0,1.4 0,3.6 0,3.6 0,1 -0.8,3.8 -2.1,5.1 -2.6,2.6 -5.9,3.4 -7.9,3.4h-25.6v-8.6h25.6c0.5,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.5,-0.5 0.5,-0.9v-2.2c0,-0.4 -0.2,-0.5 -0.4,-0.8 -0.4,-0.4 -0.9,-0.6 -1.2,-0.6L101,67.8c-0.4,0 -3,0.4 -6.2,-3 -1.8,-1.9 -2.2,-4.8 -2.2,-5.1v-3.5c0,-2.6 0.8,-4.7 2.2,-6.4 2.2,-2.6 5.1,-3.6 7.8,-3.6z" />
<path
android:fillColor="#008244"
android:pathData="m0,85.3v15.7h15.7v-6.8c0,0 -1.3,0 -2.2,0 -0.9,0.1 -1.6,0.2 -1.6,0.2l9.1,-9.2h-10.3l-4.2,4.2c0,0 0.3,-1.2 0.3,-2 0.1,-0.8 0.1,-2.2 0.1,-2.2L0,85.2Z" />
</vector>

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

@ -40,9 +40,7 @@
<string name="network_vmt_label">Erfurt, Jena &amp; Mittelthüringen</string>
<string name="network_vmt_comment">Lokal- und Regionalverkehr</string>
<string name="network_vvo_label">Verkehrsverbund Oberelbe</string>
<string name="network_vvo_comment">Dresden, Lokal- und Regionalverkehr</string>
<string name="network_vms_label">Verkehrsverbund Mittelsachsen</string>
<string name="network_vms_comment">Chemnitz &amp; Mittelsachsen, Lokal- und Regionalverkehr</string>
<string name="network_vvo_comment">Dresden, Chemnitz &amp; Mittelsachsen, Lokal- und Regionalverkehr</string>
<string name="network_vrr_label">Verkehrsverbund Rhein-Ruhr</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>

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

@ -39,9 +39,7 @@
<string name="network_vmt_label">Erfurt, Jena &amp; Central Thuringia</string>
<string name="network_vmt_comment">local and regional</string>
<string name="network_vvo_label">Verkehrsverbund Oberelbe</string>
<string name="network_vvo_comment">Dresden, local and regional</string>
<string name="network_vms_label">Verkehrsverbund Mittelsachsen</string>
<string name="network_vms_comment">Chemnitz &amp; Mittelsachsen, local and regional</string>
<string name="network_vvo_comment">Dresden, Chemnitz &amp; Mittelsachsen, local and regional</string>
<string name="network_vrr_label">Verkehrsverbund Rhein-Ruhr</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>

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

@ -103,6 +103,12 @@ public class Application extends android.app.Application {
FavoriteStationsProvider.deleteFavoriteStations(this, PL);
QueryHistoryProvider.deleteQueryHistory(this, PL);
// 2023-01-09: migrate VMS to use VVO
final String VMS = "VMS";
migrateSelectedNetwork(VMS, NetworkId.VVO);
FavoriteStationsProvider.migrateFavoriteStations(this, VMS, NetworkId.VVO);
QueryHistoryProvider.migrateQueryHistory(this, VMS, NetworkId.VVO);
log.info("Migrations took {}", watch);
}

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

@ -65,7 +65,6 @@ 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;
import de.schildbach.pte.VrnProvider;
@ -144,8 +143,6 @@ public final class NetworkProviderFactory {
return new VmtProvider("{\"aid\":\"vj5d7i3g9m5d7e3\",\"type\":\"AID\"}");
else if (networkId.equals(NetworkId.VVO))
return new VvoProvider(HttpUrl.parse("https://efa.vvo-online.de/Oeffi/"));
else if (networkId.equals(NetworkId.VMS))
return new VmsProvider(HttpUrl.parse("https://efa.vms.de/Oeffi/"));
else if (networkId.equals(NetworkId.VRR))
return new VrrProvider();
else if (networkId.equals(NetworkId.VRS))