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

suppress positions for Karlsruhe

Browse source
This commit is contained in:
Andreas Schildbach 2012-03-12 14:29:03 +01:00
parent 4db44b1630
commit 5e1cbc3d70
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private final String additionalQueryParameter;
private final boolean canAcceptPoiID;
private final boolean needsSpEncId;
private boolean suppressPositions = false;
private final XmlPullParserFactory parserFactory;
public AbstractEfaProvider()
@ -116,6 +117,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.needsSpEncId = needsSpEncId;
}
protected void setSuppressPositions(final boolean suppressPositions)
{
this.suppressPositions = suppressPositions;
}
protected TimeZone timeZone()
{
return TimeZone.getTimeZone("Europe/Berlin");
@ -1361,7 +1367,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
new LinkedList<Departure>(), new LinkedList<LineDestination>());
}
final String position = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null, "platformName"));
final String position;
if (!suppressPositions)
position = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null, "platformName"));
else
position = null;
XmlPullUtil.enter(pp, "itdDeparture");
@ -1822,8 +1832,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final Location departure = processItdPointAttributes(pp);
if (firstDeparture == null)
firstDeparture = departure;
final String departurePosition = normalizePlatform(pp.getAttributeValue(null, "platform"),
pp.getAttributeValue(null, "platformName"));
final String departurePosition;
if (!suppressPositions)
departurePosition = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null, "platformName"));
else
departurePosition = null;
XmlPullUtil.enter(pp, "itdPoint");
if (XmlPullUtil.test(pp, "itdMapItemList"))
XmlPullUtil.next(pp);
@ -1847,8 +1860,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
throw new IllegalStateException();
final Location arrival = processItdPointAttributes(pp);
lastArrival = arrival;
final String arrivalPosition = normalizePlatform(pp.getAttributeValue(null, "platform"),
pp.getAttributeValue(null, "platformName"));
final String arrivalPosition;
if (!suppressPositions)
arrivalPosition = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null, "platformName"));
else
arrivalPosition = null;
XmlPullUtil.enter(pp, "itdPoint");
if (XmlPullUtil.test(pp, "itdMapItemList"))
XmlPullUtil.next(pp);
@ -1941,8 +1957,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
while (XmlPullUtil.test(pp, "itdPoint"))
{
final Location stopLocation = processItdPointAttributes(pp);
final String stopPosition = normalizePlatform(pp.getAttributeValue(null, "platform"),
final String stopPosition;
if (!suppressPositions)
stopPosition = normalizePlatform(pp.getAttributeValue(null, "platform"),
pp.getAttributeValue(null, "platformName"));
else
stopPosition = null;
XmlPullUtil.enter(pp, "itdPoint");
XmlPullUtil.require(pp, "itdDateTime");
final boolean success1 = processItdDateTime(pp, time);

4
enabler/src/de/schildbach/pte/KvvProvider.java
View file

@ -33,12 +33,14 @@ public class KvvProvider extends AbstractEfaProvider
public KvvProvider()
{
super(API_BASE, null);
this(API_BASE);
}
public KvvProvider(final String apiBase)
{
super(apiBase, null);
setSuppressPositions(true);
}
public NetworkId id()