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

re-use code to process itdOdvAssignedStop

Browse source
This commit is contained in:
Andreas Schildbach 2013-06-16 12:19:14 +02:00
parent aaa2a6c810
commit eb88bf47a0
1 changed files with 4 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -707,43 +707,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.enter(pp, "itdOdvAssignedStops"); XmlPullUtil.enter(pp, "itdOdvAssignedStops");
while (XmlPullUtil.test(pp, "itdOdvAssignedStop")) while (XmlPullUtil.test(pp, "itdOdvAssignedStop"))
{ {
final String mapName = pp.getAttributeValue(null, "mapName"); final Location newStation = processItdOdvAssignedStop(pp);
final float x = XmlPullUtil.optFloatAttr(pp, "x", 0);
final float y = XmlPullUtil.optFloatAttr(pp, "y", 0);
if (!(mapName == null || mapName.length() == 0 || (x == 0 && y == 0)))
{
final int parsedLocationId = XmlPullUtil.intAttr(pp, "stopID");
// final String parsedLongName = normalizeLocationName(XmlPullUtil.attr(pp,
// "nameWithPlace"));
final String parsedPlace = normalizeLocationName(XmlPullUtil.attr(pp, "place"));
final int parsedLat = Math.round(y);
final int parsedLon = Math.round(x);
XmlPullUtil.enter(pp, "itdOdvAssignedStop");
final String parsedName = normalizeLocationName(pp.getText());
XmlPullUtil.exit(pp, "itdOdvAssignedStop");
if (!"WGS84".equals(mapName))
throw new IllegalStateException("unknown mapName=" + mapName + " x=" + x + " y=" + y);
final Location newStation = new Location(LocationType.STATION, parsedLocationId, parsedLat, parsedLon, parsedPlace,
parsedName);
if (!stations.contains(newStation)) if (!stations.contains(newStation))
stations.add(newStation); stations.add(newStation);
} }
else XmlPullUtil.exit(pp, "itdOdvAssignedStops");
{
if (!pp.isEmptyElementTag())
{
XmlPullUtil.enter(pp, "itdOdvAssignedStop");
XmlPullUtil.exit(pp, "itdOdvAssignedStop");
}
else
{
XmlPullUtil.next(pp);
}
}
}
} }
if (ownStation != null && !stations.contains(ownStation)) if (ownStation != null && !stations.contains(ownStation))