From 1c32dc0c05590f2ba3436123c65c11765f6cb1fc Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 20 Jan 2015 22:04:55 +0100 Subject: [PATCH] Merge Birmingham & West Midlands into England, Scotland & Wales. --- enabler/src/de/schildbach/pte/NetworkId.java | 2 +- .../src/de/schildbach/pte/TlemProvider.java | 3 + .../src/de/schildbach/pte/TlwmProvider.java | 64 ----------- .../pte/live/TlemProviderLiveTest.java | 37 +++++- .../pte/live/TlwmProviderLiveTest.java | 108 ------------------ 5 files changed, 37 insertions(+), 177 deletions(-) delete mode 100644 enabler/src/de/schildbach/pte/TlwmProvider.java delete mode 100644 enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index c2155bd8..71c2244f 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -56,7 +56,7 @@ public enum NetworkId LU, // United Kingdom - TLEM, TLWM, + TLEM, // Ireland TFI, EIREANN, diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index 967f98f8..af0d4f96 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/enabler/src/de/schildbach/pte/TlemProvider.java @@ -36,12 +36,15 @@ public class TlemProvider extends AbstractEfaProvider // http://www.travelinesw.com/swe/ // http://www.travelinesoutheast.org.uk/se/ // http://www.travelineeastanglia.org.uk/ea/ + // http://www.travelinemidlands.co.uk/wmtis/ + // http://jp.networkwestmidlands.com/centro/ public TlemProvider() { super(API_BASE); setTimeZone("Europe/London"); + setUseProxFootSearch(false); setStyles(STYLES); } diff --git a/enabler/src/de/schildbach/pte/TlwmProvider.java b/enabler/src/de/schildbach/pte/TlwmProvider.java deleted file mode 100644 index 5341cc74..00000000 --- a/enabler/src/de/schildbach/pte/TlwmProvider.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012-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 java.util.Collection; - -import de.schildbach.pte.dto.Product; - -/** - * @author Andreas Schildbach - */ -public class TlwmProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.TLWM; - private final static String API_BASE = "http://www.travelinemidlands.co.uk/wmtis/"; - - // http://jp.networkwestmidlands.com/centro/ - - public TlwmProvider() - { - super(API_BASE); - - setTimeZone("Europe/London"); - } - - public NetworkId id() - { - return NETWORK_ID; - } - - @Override - protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType, - final String trainNum, final String trainName) - { - if ("0".equals(mot)) - { - if ("Metro".equals(trainName) && trainType == null && name != null) - return "U" + name; - } - - return super.parseLine(mot, symbol, name, longName, trainType, trainNum, trainName); - } - - @Override - public Collection defaultProducts() - { - return Product.ALL; - } -} diff --git a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java index f763e130..8cc02fa4 100644 --- a/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/TlemProviderLiveTest.java @@ -68,8 +68,8 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest final QueryDeparturesResult result1 = queryDepartures("1001003", false); print(result1); - final QueryDeparturesResult result3 = queryDepartures("1000086", false); - print(result3); + final QueryDeparturesResult result2 = queryDepartures("1000086", false); + print(result2); } @Test @@ -97,13 +97,13 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest @Test public void suggestLocationsIncomplete() throws Exception { - final SuggestLocationsResult result = provider.suggestLocations("Kur"); + final SuggestLocationsResult result = provider.suggestLocations("Birming"); print(result); } @Test - public void shortTrip() throws Exception + public void shortTrip1() throws Exception { final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1008730", null, "King & Queen Wharf"), null, new Location( LocationType.STATION, "1006433", null, "Edinburgh Court"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); @@ -130,6 +130,35 @@ public class TlemProviderLiveTest extends AbstractProviderLiveTest print(earlierResult); } + @Test + public void shortTrip2() throws Exception + { + final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2099014", 52478184, -1898364, "Birmingham", + "Birmingham New Street Rail Station"), null, new Location(LocationType.STATION, "2099150", 52585468, -2122962, "Wolverhampton", + "Wolverhampton Rail Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + 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); + } + @Test public void tripArncott() throws Exception { diff --git a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java deleted file mode 100644 index 57c46f24..00000000 --- a/enabler/test/de/schildbach/pte/live/TlwmProviderLiveTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2012-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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.TlwmProvider; -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; -import de.schildbach.pte.dto.SuggestLocationsResult; - -/** - * @author Andreas Schildbach - */ -public class TlwmProviderLiveTest extends AbstractProviderLiveTest -{ - public TlwmProviderLiveTest() - { - super(new TlwmProvider()); - } - - @Test - public void nearbyStations() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, "1001003"), 0, 0); - - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception - { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.ADDRESS, 51507161, -0127144), 0, 0); - - print(result); - } - - @Test - public void queryDepartures() throws Exception - { - final QueryDeparturesResult result = queryDepartures("1001003", false); - - print(result); - } - - @Test - public void suggestLocationsIncomplete() throws Exception - { - final SuggestLocationsResult result = provider.suggestLocations("Birming"); - - print(result); - } - - @Test - public void shortTrip() throws Exception - { - final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "2099014", 52478184, -1898364, "Birmingham", - "Birmingham New Street Rail Station"), null, new Location(LocationType.STATION, "2099150", 52585468, -2122962, "Wolverhampton", - "Wolverhampton Rail Station"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); - 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); - } -}