diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 11df9ed8..bb0d4822 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -90,7 +90,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private boolean canAcceptPoiId = false; private boolean needsSpEncId = false; private boolean includeRegionId = true; - private boolean xsltDepartureMonitorUseProxFootSearch = true; + private boolean useProxFootSearch = true; private Charset requestUrlEncoding = ISO_8859_1; private String httpReferer = null; private String httpRefererTrip = null; @@ -196,9 +196,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.includeRegionId = includeRegionId; } - protected void setXsltDepartureMonitorUseProxFootSearch(final boolean xsltDepartureMonitorUseProxFootSearch) + protected void setUseProxFootSearch(final boolean useProxFootSearch) { - this.xsltDepartureMonitorUseProxFootSearch = xsltDepartureMonitorUseProxFootSearch; + this.useProxFootSearch = useProxFootSearch; } protected void setUseRouteIndexAsTripId(final boolean useRouteIndexAsTripId) @@ -896,7 +896,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider parameters.append("&type_dm=stop&name_dm=").append(normalizeStationId(stationId)); parameters.append("&itOptionsActive=1"); parameters.append("&ptOptionsActive=1"); - parameters.append("&useProxFootSearch=1"); + if (useProxFootSearch) + parameters.append("&useProxFootSearch=1"); parameters.append("&mergeDep=1"); parameters.append("&useAllStops=1"); parameters.append("&mode=direct"); @@ -1440,7 +1441,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider parameters.append("&mode=direct"); parameters.append("&ptOptionsActive=1"); parameters.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1'); - if (xsltDepartureMonitorUseProxFootSearch) + if (useProxFootSearch) parameters.append("&useProxFootSearch=").append(equivs ? '1' : '0'); parameters.append("&mergeDep=1"); // merge departures if (maxDepartures > 0) @@ -2120,7 +2121,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider uri.append("&locationServerActive=1"); if (useRealtime) uri.append("&useRealtime=1"); - uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker + if (useProxFootSearch) + uri.append("&useProxFootSearch=1"); // walk if it makes journeys quicker uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed return uri.toString(); diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index 3c6880dc..8d2b2457 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/enabler/src/de/schildbach/pte/VrrProvider.java @@ -35,7 +35,7 @@ public class VrrProvider extends AbstractEfaProvider super(API_BASE); setIncludeRegionId(false); - setXsltDepartureMonitorUseProxFootSearch(false); + setUseProxFootSearch(false); setNeedsSpEncId(true); setUseRouteIndexAsTripId(false); setStyles(STYLES); diff --git a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java index 7a4c2393..cab4d424 100644 --- a/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java @@ -68,6 +68,9 @@ public abstract class AbstractProviderLiveTest protected final void print(final QueryTripsResult result) { System.out.println(result); + + // for (final Trip trip : result.trips) + // System.out.println(trip); } protected final QueryDeparturesResult queryDepartures(final String stationId, boolean equivs) throws IOException diff --git a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java index 9b363ffd..852a7f5e 100644 --- a/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java +++ b/enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java @@ -207,4 +207,14 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); print(earlierResult); } + + @Test + public void shortTripDorsten() throws Exception + { + final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "20009643", "Bottrop", "West S"), null, new Location( + LocationType.STATION, "20003214", "Dorsten", "ZOB Dorsten"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); + print(result); + assertEquals(QueryTripsResult.Status.OK, result.status); + assertTrue(result.trips.size() > 0); + } }