From 494611ad168e6cb5181be3b4ce6e6ca259bf679e Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sat, 12 Feb 2011 14:51:02 +0000 Subject: [PATCH] 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 --- src/de/schildbach/pte/AbstractEfaProvider.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 66781f5f..bd3cbbfd 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -246,10 +246,9 @@ public abstract class AbstractEfaProvider implements NetworkProvider lon = Integer.parseInt(pp.getAttributeValue(null, "x")); } final String place = normalizeLocationName(XmlPullUtil.attr(pp, "place")); - final String name = normalizeLocationName(pp.getAttributeValue(null, "nameWithPlace")); XmlPullUtil.enter(pp, "itdOdvAssignedStop"); - // final String name = normalizeLocationName(pp.getText()); + final String name = normalizeLocationName(pp.getText()); XmlPullUtil.exit(pp, "itdOdvAssignedStop"); 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")) XmlPullUtil.next(pp); + if (XmlPullUtil.test(pp, "itdVersionInfo")) + XmlPullUtil.next(pp); + XmlPullUtil.enter(pp, "itdDepartureMonitorRequest"); if (!XmlPullUtil.test(pp, "itdOdv") || !"dm".equals(XmlPullUtil.attr(pp, "usage")))