From 7f5a8d6011235bfe97e5689e04535a92d629ee28 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 29 Apr 2014 22:43:52 +0200 Subject: [PATCH] Remove Bremen. --- .../src/de/schildbach/pte/BsagProvider.java | 58 --------- enabler/src/de/schildbach/pte/NetworkId.java | 2 +- .../pte/live/BsagProviderLiveTest.java | 115 ------------------ 3 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 enabler/src/de/schildbach/pte/BsagProvider.java delete mode 100644 enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/BsagProvider.java b/enabler/src/de/schildbach/pte/BsagProvider.java deleted file mode 100644 index 91d9719e..00000000 --- a/enabler/src/de/schildbach/pte/BsagProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2010-2014 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.io.IOException; -import java.util.List; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - -/** - * @author Andreas Schildbach - */ -public class BsagProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.BSAG; - private final static String API_BASE = "http://62.206.133.180/bsag/"; - - public BsagProvider() - { - super(API_BASE); - } - - public NetworkId id() - { - return NETWORK_ID; - } - - public boolean hasCapabilities(final Capability... capabilities) - { - for (final Capability capability : capabilities) - if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.TRIPS) - return true; - - return false; - } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.STATION, null, null, constraint.toString())); - } -} diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index 273a4deb..25dff014 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -26,7 +26,7 @@ public enum NetworkId RT, // Germany - DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, HVV, SH, GVH, BSVAG, BSAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VRT, VVS, NALDO, DING, KVV, VAGFR, NVBW, VVV, + DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, HVV, SH, GVH, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VRT, VVS, NALDO, DING, KVV, VAGFR, NVBW, VVV, // Austria OEBB, VOR, WIEN, LINZ, SVV, VVT, VMOBIL, IVB, STV, diff --git a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java deleted file mode 100644 index cfb499ed..00000000 --- a/enabler/test/de/schildbach/pte/live/BsagProviderLiveTest.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2010-2014 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 java.util.List; - -import org.junit.Test; - -import de.schildbach.pte.BsagProvider; -import de.schildbach.pte.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyStationsResult; -import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; -import de.schildbach.pte.dto.QueryTripsResult; - -/** - * @author Andreas Schildbach - */ -public class BsagProviderLiveTest extends AbstractProviderLiveTest -{ - public BsagProviderLiveTest() - { - super(new BsagProvider()); - } - - @Test - public void nearbyStations() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "28000257"), 0, 0); - - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 53076146, 8806858), 0, 0); - - print(result); - } - - @Test - public void queryDepartures() throws Exception - { - final QueryDeparturesResult result = provider.queryDepartures("28003375", 0, false); - - print(result); - } - - @Test - public void autocompleteIncomplete() throws Exception - { - final List autocompletes = provider.autocompleteStations("Kurf"); - - print(autocompletes); - } - - @Test - public void autocompleteWithUmlaut() throws Exception - { - final List autocompletes = provider.autocompleteStations("grünwink"); - - print(autocompletes); - } - - @Test - public void shortTrip() throws Exception - { - final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "28000257", null, "Bremen, Hauptbahnhof"), null, new Location( - LocationType.STATION, "28000512", null, "Herdentor"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - System.out.println(result); - assertEquals(QueryTripsResult.Status.OK, result.status); - assertTrue(result.trips.size() > 0); - - if (!result.context.canQueryLater()) - return; - - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - System.out.println(laterResult); - - if (!laterResult.context.canQueryLater()) - return; - - final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true); - System.out.println(later2Result); - - if (!later2Result.context.canQueryEarlier()) - return; - - final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); - System.out.println(earlierResult); - } -}