read name of assigned stops rather than nameWithPlace

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@494 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-02-12 14:51:02 +00:00
parent 9b00521836
commit 494611ad16

View file

@ -246,10 +246,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider
lon = Integer.parseInt(pp.getAttributeValue(null, "x")); lon = Integer.parseInt(pp.getAttributeValue(null, "x"));
} }
final String place = normalizeLocationName(XmlPullUtil.attr(pp, "place")); final String place = normalizeLocationName(XmlPullUtil.attr(pp, "place"));
final String name = normalizeLocationName(pp.getAttributeValue(null, "nameWithPlace"));
XmlPullUtil.enter(pp, "itdOdvAssignedStop"); XmlPullUtil.enter(pp, "itdOdvAssignedStop");
// final String name = normalizeLocationName(pp.getText()); final String name = normalizeLocationName(pp.getText());
XmlPullUtil.exit(pp, "itdOdvAssignedStop"); XmlPullUtil.exit(pp, "itdOdvAssignedStop");
return new Location(LocationType.STATION, id, lat, lon, place, name); return new Location(LocationType.STATION, id, lat, lon, place, name);
@ -858,6 +857,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider
if (XmlPullUtil.test(pp, "serverMetaInfo")) if (XmlPullUtil.test(pp, "serverMetaInfo"))
XmlPullUtil.next(pp); XmlPullUtil.next(pp);
if (XmlPullUtil.test(pp, "itdVersionInfo"))
XmlPullUtil.next(pp);
XmlPullUtil.enter(pp, "itdDepartureMonitorRequest"); XmlPullUtil.enter(pp, "itdDepartureMonitorRequest");
if (!XmlPullUtil.test(pp, "itdOdv") || !"dm".equals(XmlPullUtil.attr(pp, "usage"))) if (!XmlPullUtil.test(pp, "itdOdv") || !"dm".equals(XmlPullUtil.attr(pp, "usage")))