From 0c546aea63cb57c91724b3c155be1db2ec31d1ea Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 9 Jan 2023 18:40:45 +0100 Subject: [PATCH] VMS: remove provider for Verkehrsverbund Mittelsachsen --- src/de/schildbach/pte/NetworkId.java | 2 +- src/de/schildbach/pte/VmsProvider.java | 81 -------------- .../pte/live/VmsProviderLiveTest.java | 103 ------------------ 3 files changed, 1 insertion(+), 185 deletions(-) delete mode 100644 src/de/schildbach/pte/VmsProvider.java delete mode 100644 test/de/schildbach/pte/live/VmsProviderLiveTest.java diff --git a/src/de/schildbach/pte/NetworkId.java b/src/de/schildbach/pte/NetworkId.java index 652c3f4e..0e4d45d4 100644 --- a/src/de/schildbach/pte/NetworkId.java +++ b/src/de/schildbach/pte/NetworkId.java @@ -25,7 +25,7 @@ public enum NetworkId { RT, // Germany - DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, AVV_AUGSBURG, VGN, VVM, VMV, SH, GVH, BSVAG, VBN, NASA, VMT, VVO, VMS, VGS, VRR, VRS, AVV_AACHEN, MVG, VRN, VVS, DING, KVV, NVBW, VVV, + DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, AVV_AUGSBURG, VGN, VVM, VMV, SH, GVH, BSVAG, VBN, NASA, VMT, VVO, VGS, VRR, VRS, AVV_AACHEN, MVG, VRN, VVS, DING, KVV, NVBW, VVV, // Austria OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, STV, VMOBIL, diff --git a/src/de/schildbach/pte/VmsProvider.java b/src/de/schildbach/pte/VmsProvider.java deleted file mode 100644 index b69aa157..00000000 --- a/src/de/schildbach/pte/VmsProvider.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte; - -import java.util.Date; - -import javax.annotation.Nullable; - -import com.google.common.base.Charsets; - -import de.schildbach.pte.dto.Line; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.TripOptions; - -import okhttp3.HttpUrl; - -/** - * @author Andreas Schildbach - */ -public class VmsProvider extends AbstractEfaProvider { - private static final HttpUrl API_BASE = HttpUrl.parse("https://www.vms.de/VMSSL3/"); - - public VmsProvider() { - this(API_BASE); - } - - public VmsProvider(final HttpUrl apiBase) { - super(NetworkId.VMS, apiBase); - setRequestUrlEncoding(Charsets.UTF_8); - setUseLineRestriction(false); - } - - @Override - protected void appendTripRequestParameters(final HttpUrl.Builder url, final Location from, - final @Nullable Location via, final Location to, final Date time, final boolean dep, - final @Nullable TripOptions options) { - super.appendTripRequestParameters(url, from, via, to, time, dep, options); - url.addEncodedQueryParameter("inclMOT_11", "on"); - url.addEncodedQueryParameter("inclMOT_17", "on"); - } - - @Override - protected Line parseLine(final @Nullable String id, final @Nullable String network, final @Nullable String mot, - final @Nullable String symbol, final @Nullable String name, final @Nullable String longName, - final @Nullable String trainType, final @Nullable String trainNum, final @Nullable String trainName) { - if ("0".equals(mot)) { - if ("Ilztalbahn".equals(trainName) && trainNum == null) - return new Line(id, network, Product.REGIONAL_TRAIN, "ITB"); - if ("Meridian".equals(trainName) && trainNum == null) - return new Line(id, network, Product.REGIONAL_TRAIN, "M"); - if ("CityBahn".equals(trainName) && trainNum == null) - return new Line(id, network, Product.REGIONAL_TRAIN, "CB"); - if ("CityBahn".equals(longName) && "C11".equals(symbol)) - return new Line(id, network, Product.REGIONAL_TRAIN, symbol); - if ("Zug".equals(longName) - && ("C11".equals(symbol) || "C13".equals(symbol) || "C14".equals(symbol) || "C15".equals(symbol))) - return new Line(id, network, Product.REGIONAL_TRAIN, symbol); - - if ("RE 3".equals(symbol) && "Zug".equals(longName)) - return new Line(id, network, Product.REGIONAL_TRAIN, "RE3"); - } - - return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); - } -} diff --git a/test/de/schildbach/pte/live/VmsProviderLiveTest.java b/test/de/schildbach/pte/live/VmsProviderLiveTest.java deleted file mode 100644 index 464adacd..00000000 --- a/test/de/schildbach/pte/live/VmsProviderLiveTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright the original author or authors. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package de.schildbach.pte.live; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.VmsProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyLocationsResult; -import de.schildbach.pte.dto.Point; -import de.schildbach.pte.dto.QueryDeparturesResult; -import de.schildbach.pte.dto.QueryTripsResult; -import de.schildbach.pte.dto.SuggestLocationsResult; - -/** - * @author Andreas Schildbach - */ -public class VmsProviderLiveTest extends AbstractProviderLiveTest { - public VmsProviderLiveTest() { - super(new VmsProvider()); - } - - @Test - public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "36030062")); - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(Location.coord(50832754, 12918348)); - print(result); - } - - @Test - public void queryDepartures() throws Exception { - final QueryDeparturesResult result = queryDepartures("36030062", false); - print(result); - } - - @Test - public void queryDeparturesInvalidStation() throws Exception { - final QueryDeparturesResult result = queryDepartures("999999", false); - assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status); - } - - @Test - public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = suggestLocations("Kur"); - print(result); - } - - @Test - public void shortTrip() throws Exception { - final Location from = new Location(LocationType.STATION, "36030131", Point.from1E6(50831380, 12922278), - "Chemnitz", "Zentralhaltestelle"); - final Location to = new Location(LocationType.STATION, "36030522", Point.from1E6(50836056, 12922042), - "Chemnitz", "Stadthalle"); - final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null); - print(result); - assertEquals(QueryTripsResult.Status.OK, result.status); - assertTrue(result.trips.size() > 0); - - if (!result.context.canQueryLater()) - return; - - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - print(laterResult); - - if (!laterResult.context.canQueryLater()) - return; - - final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - print(later2Result); - - if (!later2Result.context.canQueryEarlier()) - return; - - final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - print(earlierResult); - } -}