From 0643bf8de61929e1ae23dfa25a65937874b3e982 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 10 Feb 2014 11:22:00 +0100 Subject: [PATCH] Remove Maribor. --- .../de/schildbach/pte/MariborProvider.java | 58 ---------- enabler/src/de/schildbach/pte/NetworkId.java | 3 - .../pte/live/MariborProviderLiveTest.java | 108 ------------------ 3 files changed, 169 deletions(-) delete mode 100644 enabler/src/de/schildbach/pte/MariborProvider.java delete mode 100644 enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/MariborProvider.java b/enabler/src/de/schildbach/pte/MariborProvider.java deleted file mode 100644 index 74707204..00000000 --- a/enabler/src/de/schildbach/pte/MariborProvider.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 MariborProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.MARIBOR; - private final static String API_BASE = "http://164.8.32.183/slo/"; - - public MariborProvider() - { - 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, 0, null, constraint.toString())); - } -} diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index f3f41f4b..e7cb3764 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -58,9 +58,6 @@ public enum NetworkId // Ireland TFI, EIREANN, - // Slovenia - MARIBOR, - // Poland PL, diff --git a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java deleted file mode 100644 index 895cc281..00000000 --- a/enabler/test/de/schildbach/pte/live/MariborProviderLiveTest.java +++ /dev/null @@ -1,108 +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.MariborProvider; -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 MariborProviderLiveTest extends AbstractProviderLiveTest -{ - public MariborProviderLiveTest() - { - super(new MariborProvider()); - } - - @Test - public void nearbyStations() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 63203067), 0, 0); - - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 46559958, 15646391), 0, 0); - - print(result); - } - - @Test - public void queryDepartures() throws Exception - { - final QueryDeparturesResult result = provider.queryDepartures(63203067, 0, false); - - print(result); - } - - @Test - public void autocompleteIncomplete() throws Exception - { - final List autocompletes = provider.autocompleteStations("Kur"); - - print(autocompletes); - } - - @Test - public void shortTrip() throws Exception - { - final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, 63202999, null, "Graz Marburger Straße"), null, new Location( - LocationType.STATION, 63201746, null, "Flughafen Graz Bahnhof"), 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); - } -}