From e1233210dd6ba0c8d3faa38a9f199ac8efc112a1 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 21 Jan 2014 11:41:54 +0100 Subject: [PATCH] Fix departures for Stockholm. --- enabler/src/de/schildbach/pte/AbstractHafasProvider.java | 4 +++- enabler/src/de/schildbach/pte/StockholmProvider.java | 1 + .../de/schildbach/pte/live/StockholmProviderLiveTest.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java index 249608ea..4e0e82ab 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java @@ -662,7 +662,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider // TODO is_reachable // TODO disableTrainInfo - if (depStation == null && !"cancel".equals(eDelay)) + final boolean isEquivStation = canDoEquivs && depStation != null; + + if (!isEquivStation && !"cancel".equals(eDelay)) { final Calendar plannedTime = new GregorianCalendar(timeZone()); plannedTime.clear(); diff --git a/enabler/src/de/schildbach/pte/StockholmProvider.java b/enabler/src/de/schildbach/pte/StockholmProvider.java index f865eaa4..51eb0374 100644 --- a/enabler/src/de/schildbach/pte/StockholmProvider.java +++ b/enabler/src/de/schildbach/pte/StockholmProvider.java @@ -51,6 +51,7 @@ public class StockholmProvider extends AbstractHafasProvider super(API_BASE + "stboard.exe/sn", API_BASE + "ajax-getstop.exe/sny", API_BASE + "query.exe/sn", 7); setStyles(STYLES); + setCanDoEquivs(false); } public NetworkId id() diff --git a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java index dfbb3d4e..277ee486 100644 --- a/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java @@ -45,7 +45,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void nearbyStations() throws Exception { - final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 311109529), 0, 0); + final NearbyStationsResult result = provider.queryNearbyStations(new Location(LocationType.STATION, 301109600), 0, 0); print(result); } @@ -61,7 +61,7 @@ public class StockholmProviderLiveTest extends AbstractProviderLiveTest @Test public void queryDepartures() throws Exception { - final QueryDeparturesResult result = provider.queryDepartures(311109529, 0, false); + final QueryDeparturesResult result = provider.queryDepartures(301109600, 0, false); print(result); }