Changeset 34331 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2018-06-20T19:25:48+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm16402 - Cannot read kml with complex ExtendedData section

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (modified) (6 diffs)
• test/data/regress/16402 (added)
• test/data/regress/16402/MapsMe-new.kml (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.io.ProjectionPatterns;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -50 +51 @@
     public static final String KML_EXT_TRACK = "Track";
     public static final String KML_EXT_COORD = "coord";
+    public static final String KML_EXT_LANG = "lang";
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -104 +106 @@
         Relation relation = null;
         String role = "";
+        String previousName = null;
         Map<String, String> tags = new HashMap<>();
         while (parser.hasNext()) {
@@ -115 +118 @@
                     }
                 } else if (parser.getLocalName().equals(KML_NAME)) {
-                    tags.put(KML_NAME, parser.getElementText());
+                    try {
+                        tags.put(KML_NAME, parser.getElementText());
+                    } catch (XMLStreamException e) {
+                        Logging.trace(e);
+                    }
                 } else if (parser.getLocalName().equals(KML_SIMPLE_DATA)) {
                     String key = parser.getAttributeValue(null, "name");
@@ -151 +158 @@
                 } else if (parser.getLocalName().equals(KML_WHEN)) {
                     when = DateUtils.tsFromString(parser.getElementText().trim());
-                }
+                } else if (parser.getLocalName().equals(KML_EXT_LANG)) {
+                    if (KML_NAME.equals(previousName)) {
+                        tags.put(KML_NAME, parser.getElementText());
+                    }
+                }
+                previousName = parser.getLocalName();
             } else if (event == XMLStreamConstants.END_ELEMENT) {
                 if (parser.getLocalName().equals(KML_PLACEMARK)) {
@@ -158 +170 @@
                     list.add(node);
                 } else if (parser.getLocalName().equals(KML_LINE_STRING)
-                        || parser.getLocalName().equals(KML_EXT_TRACK) 
+                        || parser.getLocalName().equals(KML_EXT_TRACK)
                         || parser.getLocalName().equals(KML_LINEAR_RING)) {
                     if (way != null && wayNodes != null)

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

@@ -41 +41 @@
 
     /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/16402">#16402</a>
+     * @throws Exception if an error occurs during reading
+     */
+    @Test
+    public void testTicket16402() throws Exception {
+        try (InputStream is = TestUtils.getRegressionDataStream(16402, "MapsMe-new.kml")) {
+            NonRegFunctionalTests.testGeneric("#16402", KmlReader.parseDataSet(is, null));
+        }
+    }
+
+    /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12694">#12694</a>
      * @throws Exception if an error occurs during reading