diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index 5dd97bf6..ec3a2ca8 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -53,7 +53,7 @@ public enum NetworkId LU, // United Kingdom - TFL, TLEM, TLWM, TLEA, TLSE, TLSW, + TFL, TLEM, TLWM, TLSW, // Ireland EIREANN, diff --git a/enabler/src/de/schildbach/pte/TleaProvider.java b/enabler/src/de/schildbach/pte/TleaProvider.java deleted file mode 100644 index b32523ae..00000000 --- a/enabler/src/de/schildbach/pte/TleaProvider.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2010-2013 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 java.util.TimeZone; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - -/** - * @author Andreas Schildbach - */ -public class TleaProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.TLEA; - private final static String API_BASE = "http://www.travelineeastanglia.org.uk/ea/"; - - public TleaProvider() - { - super(API_BASE, null); - } - - public NetworkId id() - { - return NETWORK_ID; - } - - @Override - protected TimeZone timeZone() - { - return TimeZone.getTimeZone("Europe/London"); - } - - public boolean hasCapabilities(final Capability... capabilities) - { - for (final Capability capability : capabilities) - if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS) - return true; - - return false; - } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } -} diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index 96aeb776..d9d9c024 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/enabler/src/de/schildbach/pte/TlemProvider.java @@ -31,6 +31,8 @@ public class TlemProvider extends AbstractEfaProvider { public static final NetworkId NETWORK_ID = NetworkId.TLEM; private final static String API_BASE = "http://www.travelineeastmidlands.co.uk/em/"; + // http://www.travelinesoutheast.org.uk/se/ + // http://www.travelineeastanglia.org.uk/ea/ public TlemProvider() { diff --git a/enabler/src/de/schildbach/pte/TlseProvider.java b/enabler/src/de/schildbach/pte/TlseProvider.java deleted file mode 100644 index 4cd89a6c..00000000 --- a/enabler/src/de/schildbach/pte/TlseProvider.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2010-2013 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 java.util.TimeZone; - -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; - -/** - * @author Andreas Schildbach - */ -public class TlseProvider extends AbstractEfaProvider -{ - public static final NetworkId NETWORK_ID = NetworkId.TLSE; - private final static String API_BASE = "http://www.travelinesoutheast.org.uk/se/"; - - public TlseProvider() - { - super(API_BASE, null); - } - - public NetworkId id() - { - return NETWORK_ID; - } - - @Override - protected TimeZone timeZone() - { - return TimeZone.getTimeZone("Europe/London"); - } - - public boolean hasCapabilities(final Capability... capabilities) - { - for (final Capability capability : capabilities) - if (capability == Capability.AUTOCOMPLETE_ONE_LINE || capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS) - return true; - - return false; - } - - @Override - public List autocompleteStations(final CharSequence constraint) throws IOException - { - return xmlStopfinderRequest(new Location(LocationType.ANY, 0, null, constraint.toString())); - } -} diff --git a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java deleted file mode 100644 index e958c7da..00000000 --- a/enabler/test/de/schildbach/pte/live/TleaProviderLiveTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2010-2013 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.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.TleaProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyStationsResult; -import de.schildbach.pte.dto.QueryConnectionsResult; -import de.schildbach.pte.dto.QueryDeparturesResult; - -/** - * @author Andreas Schildbach - */ -public class TleaProviderLiveTest extends AbstractProviderLiveTest -{ - public TleaProviderLiveTest() - { - super(new TleaProvider()); - } - - @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 = provider.queryDepartures(1001003, 0, false); - - print(result); - } - - @Test - public void autocompleteIncomplete() throws Exception - { - final List autocompletes = provider.autocompleteStations("Kur"); - - print(autocompletes); - } - - @Test - public void shortConnection() throws Exception - { - final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, - new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); - System.out.println(result); - assertEquals(QueryConnectionsResult.Status.OK, result.status); - assertTrue(result.connections.size() > 0); - - if (!result.context.canQueryLater()) - return; - - final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); - System.out.println(laterResult); - - if (!laterResult.context.canQueryLater()) - return; - - final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); - System.out.println(later2Result); - - if (!later2Result.context.canQueryEarlier()) - return; - - final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); - System.out.println(earlierResult); - } -} diff --git a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java deleted file mode 100644 index 4daf9483..00000000 --- a/enabler/test/de/schildbach/pte/live/TlseProviderLiveTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2010-2013 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.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -import de.schildbach.pte.TlseProvider; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyStationsResult; -import de.schildbach.pte.dto.QueryConnectionsResult; -import de.schildbach.pte.dto.QueryDeparturesResult; - -/** - * @author Andreas Schildbach - */ -public class TlseProviderLiveTest extends AbstractProviderLiveTest -{ - public TlseProviderLiveTest() - { - super(new TlseProvider()); - } - - @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 = provider.queryDepartures(1001003, 0, false); - - print(result); - } - - @Test - public void autocompleteIncomplete() throws Exception - { - final List autocompletes = provider.autocompleteStations("Kur"); - - print(autocompletes); - } - - @Test - public void shortConnection() throws Exception - { - final QueryConnectionsResult result = queryConnections(new Location(LocationType.STATION, 1008730, null, "King & Queen Wharf"), null, - new Location(LocationType.STATION, 1006433, null, "Edinburgh Court"), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL, - Accessibility.NEUTRAL); - System.out.println(result); - assertEquals(QueryConnectionsResult.Status.OK, result.status); - assertTrue(result.connections.size() > 0); - - if (!result.context.canQueryLater()) - return; - - final QueryConnectionsResult laterResult = queryMoreConnections(result.context, true); - System.out.println(laterResult); - - if (!laterResult.context.canQueryLater()) - return; - - final QueryConnectionsResult later2Result = queryMoreConnections(laterResult.context, true); - System.out.println(later2Result); - - if (!later2Result.context.canQueryEarlier()) - return; - - final QueryConnectionsResult earlierResult = queryMoreConnections(later2Result.context, false); - System.out.println(earlierResult); - } -}