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

improve parsing of platforms

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@252 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-09 10:15:39 +00:00
parent 5d673618c8
commit 16ec23dd31
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
@ -536,14 +537,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
{ {
if (Integer.parseInt(pp.getAttributeValue(null, "stopID")) == locationId) if (Integer.parseInt(pp.getAttributeValue(null, "stopID")) == locationId)
{ {
String position = pp.getAttributeValue(null, "platform"); final String position = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null, "platformName"));
if (position != null)
{
if (position.length() != 0)
position = "Gl. " + position;
else
position = null;
}
departureTime.clear(); departureTime.clear();
@ -742,7 +736,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final String departure = normalizeLocationName(pp.getAttributeValue(null, "name")); final String departure = normalizeLocationName(pp.getAttributeValue(null, "name"));
if (firstDeparture == null) if (firstDeparture == null)
firstDeparture = departure; firstDeparture = departure;
final String departurePosition = pp.getAttributeValue(null, "platform"); final String departurePosition = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null,
"platformName"));
processItdDateTime(pp, departureTime); processItdDateTime(pp, departureTime);
if (firstDepartureTime == null) if (firstDepartureTime == null)
firstDepartureTime = departureTime.getTime(); firstDepartureTime = departureTime.getTime();
@ -754,7 +749,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final int arrivalId = Integer.parseInt(pp.getAttributeValue(null, "stopID")); final int arrivalId = Integer.parseInt(pp.getAttributeValue(null, "stopID"));
final String arrival = normalizeLocationName(pp.getAttributeValue(null, "name")); final String arrival = normalizeLocationName(pp.getAttributeValue(null, "name"));
lastArrival = arrival; lastArrival = arrival;
final String arrivalPosition = pp.getAttributeValue(null, "platform"); final String arrivalPosition = normalizePlatform(pp.getAttributeValue(null, "platform"), pp.getAttributeValue(null,
"platformName"));
processItdDateTime(pp, arrivalTime); processItdDateTime(pp, arrivalTime);
lastArrivalTime = arrivalTime.getTime(); lastArrivalTime = arrivalTime.getTime();
XmlPullUtil.skipRestOfTree(pp); XmlPullUtil.skipRestOfTree(pp);
@ -801,6 +797,32 @@ public abstract class AbstractEfaProvider implements NetworkProvider
} }
} }
private static final Pattern P_PLATFORM_GLEIS = Pattern.compile("Gleis (\\d+[a-z]?)(?: ([A-Z])\\s*-\\s*([A-Z]))?");
private static final String normalizePlatform(final String platform, final String platformName)
{
if (platformName != null && platformName.length() > 0)
{
final Matcher mGleis = P_PLATFORM_GLEIS.matcher(platformName);
if (mGleis.matches())
{
if (mGleis.group(2) == null)
return "Gl. " + mGleis.group(1);
else
return "Gl. " + mGleis.group(1) + " " + mGleis.group(2) + "-" + mGleis.group(3);
}
else
{
return platformName;
}
}
if (platform != null && platform.length() > 0)
return platform;
return null;
}
public GetConnectionDetailsResult getConnectionDetails(final String connectionUri) throws IOException public GetConnectionDetailsResult getConnectionDetails(final String connectionUri) throws IOException
{ {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();