From b7048d47365ee98f5550ae0ae51dea2aa8b75cc3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Tue, 21 Feb 2017 16:31:00 +0100
Subject: [PATCH] AbstractEfaProvider: Ignore <itdMapItemList> inside
 <odvNameElem>.

---
 .../src/de/schildbach/pte/AbstractEfaProvider.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 55eed3b5..7ad26b24 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -769,7 +769,16 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
         final String streetName = XmlPullUtil.optAttr(pp, "streetName", null);
         final Point coord = processCoordAttr(pp);
 
-        final String nameElem = normalizeLocationName(XmlPullUtil.valueTag(pp, "odvNameElem"));
+        XmlPullUtil.enter(pp, "odvNameElem");
+        XmlPullUtil.optSkip(pp, "itdMapItemList");
+        final String nameElem;
+        if (pp.getEventType() == XmlPullParser.TEXT) {
+            nameElem = normalizeLocationName(pp.getText());
+            pp.next();
+        } else {
+            nameElem = null;
+        }
+        XmlPullUtil.exit(pp, "odvNameElem");
 
         final LocationType locationType;
         final String place;