From e4b03df6f543c6fe80f393aef5d5145190490154 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Mon, 6 Feb 2017 11:16:07 +0100 Subject: [PATCH] ATC: Remove provider. --- .../src/de/schildbach/pte/AtcProvider.java | 32 ------- enabler/src/de/schildbach/pte/NetworkId.java | 2 +- .../pte/live/AtcProviderLiveTest.java | 83 ------------------- 3 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 enabler/src/de/schildbach/pte/AtcProvider.java delete mode 100644 enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/AtcProvider.java b/enabler/src/de/schildbach/pte/AtcProvider.java deleted file mode 100644 index c0fc2e8b..00000000 --- a/enabler/src/de/schildbach/pte/AtcProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2015 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 okhttp3.HttpUrl; - -/** - * @author Andreas Schildbach - */ -public class AtcProvider extends AbstractEfaProvider { - private static final HttpUrl API_BASE = HttpUrl.parse("http://82.187.83.50/TravelPlanner/"); - // http://cisium.webhop.net/TravelPlanner/ - - public AtcProvider() { - super(NetworkId.ATC, API_BASE); - } -} diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index b40d1f20..61eaa353 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -67,7 +67,7 @@ public enum NetworkId { PL, // Italy - ATC, IT, + IT, // United Arab Emirates DUB, diff --git a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java deleted file mode 100644 index 28e8833a..00000000 --- a/enabler/test/de/schildbach/pte/live/AtcProviderLiveTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2010-2015 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 java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.AtcProvider; -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.NearbyLocationsResult; -import de.schildbach.pte.dto.Product; -import de.schildbach.pte.dto.QueryDeparturesResult; -import de.schildbach.pte.dto.QueryTripsResult; -import de.schildbach.pte.dto.SuggestLocationsResult; - -/** - * @author Andreas Schildbach - */ -public class AtcProviderLiveTest extends AbstractProviderLiveTest { - public AtcProviderLiveTest() { - super(new AtcProvider()); - } - - @Test - public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "740")); - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception { - // TODO bad coordinate! - final NearbyLocationsResult result = queryNearbyStations(Location.coord(8168907, 10609969)); - print(result); - } - - @Test - public void queryDepartures() throws Exception { - final QueryDeparturesResult result = queryDepartures("740", false); - print(result); - } - - @Test - public void suggestLocations() throws Exception { - final SuggestLocationsResult result = suggestLocations("ponte"); - print(result); - } - - @Test - public void suggestLocationsWithUmlaut() throws Exception { - final SuggestLocationsResult result = suggestLocations("grünwink"); - print(result); - } - - @Test - public void shortTrip() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, null, null, "Hauptwache"), null, - new Location(LocationType.STATION, null, null, "Südbahnhof"), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); - print(result); - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - print(laterResult); - } -}