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

workaround for Austria predicted stop times where trains actually don't stop

Browse source
This commit is contained in:
Andreas Schildbach 2012-08-31 10:56:06 +02:00
parent 03fe13c3b0
commit 65ceab85d4
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -81,6 +81,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
private final String accessId; private final String accessId;
private final Charset jsonEncoding; private final Charset jsonEncoding;
private final Charset xmlMlcResEncoding; private final Charset xmlMlcResEncoding;
private boolean dominantPlanStopTime = false;
private static class Context implements QueryConnectionsContext private static class Context implements QueryConnectionsContext
{ {
@ -149,6 +150,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
this.xmlMlcResEncoding = ISO_8859_1; this.xmlMlcResEncoding = ISO_8859_1;
} }
protected void setDominantPlanStopTime(final boolean dominantPlanStopTime)
{
this.dominantPlanStopTime = dominantPlanStopTime;
}
protected TimeZone timeZone() protected TimeZone timeZone()
{ {
return TimeZone.getTimeZone("CET"); return TimeZone.getTimeZone("CET");
@ -1814,9 +1820,13 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
final Location stopLocation = stations.read(is); final Location stopLocation = stations.read(is);
final Stop stop = new Stop(stopLocation, plannedStopArrivalDate, predictedStopArrivalDate, final boolean validPredictedDate = !dominantPlanStopTime
plannedStopArrivalPosition, predictedStopArrivalPosition, plannedStopDepartureDate, || (plannedStopArrivalDate != null && plannedStopDepartureDate != null);
predictedStopDepartureDate, plannedStopDeparturePosition, predictedStopDeparturePosition);
final Stop stop = new Stop(stopLocation, plannedStopArrivalDate,
validPredictedDate ? predictedStopArrivalDate : null, plannedStopArrivalPosition,
predictedStopArrivalPosition, plannedStopDepartureDate, validPredictedDate ? predictedStopDepartureDate
: null, plannedStopDeparturePosition, predictedStopDeparturePosition);
intermediateStops.add(stop); intermediateStops.add(stop);
} }

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

@ -41,6 +41,8 @@ public class OebbProvider extends AbstractHafasProvider
public OebbProvider() public OebbProvider()
{ {
super(API_BASE + "query.exe/dn", 13, null); super(API_BASE + "query.exe/dn", 13, null);
setDominantPlanStopTime(true);
} }
public NetworkId id() public NetworkId id()