mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-17 12:39:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable useProxFootSearch generally for VRR.

Browse source
This commit is contained in:
Andreas Schildbach 2014-09-18 10:27:01 +02:00
parent 6a71482d15
commit 7a467473b9
4 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -90,7 +90,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private boolean canAcceptPoiId = false; private boolean canAcceptPoiId = false;
private boolean needsSpEncId = false; private boolean needsSpEncId = false;
private boolean includeRegionId = true; private boolean includeRegionId = true;
private boolean xsltDepartureMonitorUseProxFootSearch = true; private boolean useProxFootSearch = true;
private Charset requestUrlEncoding = ISO_8859_1; private Charset requestUrlEncoding = ISO_8859_1;
private String httpReferer = null; private String httpReferer = null;
private String httpRefererTrip = null; private String httpRefererTrip = null;
@ -196,9 +196,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.includeRegionId = includeRegionId; 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) 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("&type_dm=stop&name_dm=").append(normalizeStationId(stationId));
parameters.append("&itOptionsActive=1"); parameters.append("&itOptionsActive=1");
parameters.append("&ptOptionsActive=1"); parameters.append("&ptOptionsActive=1");
parameters.append("&useProxFootSearch=1"); if (useProxFootSearch)
parameters.append("&useProxFootSearch=1");
parameters.append("&mergeDep=1"); parameters.append("&mergeDep=1");
parameters.append("&useAllStops=1"); parameters.append("&useAllStops=1");
parameters.append("&mode=direct"); parameters.append("&mode=direct");
@ -1440,7 +1441,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
parameters.append("&mode=direct"); parameters.append("&mode=direct");
parameters.append("&ptOptionsActive=1"); parameters.append("&ptOptionsActive=1");
parameters.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1'); parameters.append("&deleteAssignedStops_dm=").append(equivs ? '0' : '1');
if (xsltDepartureMonitorUseProxFootSearch) if (useProxFootSearch)
parameters.append("&useProxFootSearch=").append(equivs ? '1' : '0'); parameters.append("&useProxFootSearch=").append(equivs ? '1' : '0');
parameters.append("&mergeDep=1"); // merge departures parameters.append("&mergeDep=1"); // merge departures
if (maxDepartures > 0) if (maxDepartures > 0)
@ -2120,7 +2121,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
uri.append("&locationServerActive=1"); uri.append("&locationServerActive=1");
if (useRealtime) if (useRealtime)
uri.append("&useRealtime=1"); 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 uri.append("&nextDepsPerLeg=1"); // next departure in case previous was missed
return uri.toString(); return uri.toString();

2
enabler/src/de/schildbach/pte/VrrProvider.java
View file

@ -35,7 +35,7 @@ public class VrrProvider extends AbstractEfaProvider
super(API_BASE); super(API_BASE);
setIncludeRegionId(false); setIncludeRegionId(false);
setXsltDepartureMonitorUseProxFootSearch(false); setUseProxFootSearch(false);
setNeedsSpEncId(true); setNeedsSpEncId(true);
setUseRouteIndexAsTripId(false); setUseRouteIndexAsTripId(false);
setStyles(STYLES); setStyles(STYLES);

3
enabler/test/de/schildbach/pte/live/AbstractProviderLiveTest.java
View file

@ -68,6 +68,9 @@ public abstract class AbstractProviderLiveTest
protected final void print(final QueryTripsResult result) protected final void print(final QueryTripsResult result)
{ {
System.out.println(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 protected final QueryDeparturesResult queryDepartures(final String stationId, boolean equivs) throws IOException

10
enabler/test/de/schildbach/pte/live/VrrProviderLiveTest.java
View file

@ -207,4 +207,14 @@ public class VrrProviderLiveTest extends AbstractProviderLiveTest
final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false); final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
print(earlierResult); 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);
}
} }