Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (revision 34330) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (revision 34331) @@ -30,4 +30,5 @@ 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,4 +51,5 @@ 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,4 +106,5 @@ Relation relation = null; String role = ""; + String previousName = null; Map tags = new HashMap<>(); while (parser.hasNext()) { @@ -115,5 +118,9 @@ } } 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,5 +158,10 @@ } 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,5 +170,5 @@ 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) Index: /applications/editors/josm/plugins/opendata/test/data/regress/16402/MapsMe-new.kml =================================================================== --- /applications/editors/josm/plugins/opendata/test/data/regress/16402/MapsMe-new.kml (revision 34331) +++ /applications/editors/josm/plugins/opendata/test/data/regress/16402/MapsMe-new.kml (revision 34331) @@ -0,0 +1,947 @@ + + + + + + + + + + + + Мои Метки + 1 + + + Мои Метки + + + + + + 2018-06-16T05:32:32Z + Private + + + Eingang + 2018-06-16T03:00:04Z + #placemark-red + 37.727709,55.617287 + + + + + + + entrance + + 18 + + + + 2:65-128/lpbw + + 2018-06-16T03:00:42Z + #placemark-red + 37.727302,55.617241 + + + + + + + + entrance + + + 2:65-128/lpbw + + 18 + + + + 1:1-36/ltbw + + 2018-06-16T03:02:06Z + #placemark-red + 37.726842,55.617982 + + + Неизвестное место + + + + + + 1:1-36/ltbw + + 18 + + + + 2:37-72/ltbwrtb + + 2018-06-16T03:02:40Z + #placemark-red + 37.726662,55.618152 + + + + + + + + highway-service + + + 2:37-72/ltbwrtb + + 18 + + + + 3:73-108/lw + + 2018-06-16T03:03:24Z + #placemark-red + 37.726481,55.618348 + + + + + + + + highway-service + + + 3:73-108/lw + + 18 + + + + 4:109-144/rw + + 2018-06-16T03:03:52Z + #placemark-red + 37.726305,55.618485 + + + + + + + + highway-service + + + 4:109-144/rw + + 18 + + + + 5:145-179/rw + + 2018-06-16T03:04:27Z + #placemark-red + 37.726154,55.618609 + + + + + + + + highway-service + + + 5:145-179/rw + + 18 + + + + 6:180-215/rw + + 2018-06-16T03:04:48Z + #placemark-red + 37.725983,55.618758 + + + + + + + + highway-service + + + 6:180-215/rw + + 18 + + + + 7:216-251/rtblw + + 2018-06-16T03:05:25Z + #placemark-red + 37.725683,55.618804 + + + Неизвестное место + + + + + + 7:216-251/rtblw + + 19 + + + + 8:252-287/rw + + 2018-06-16T03:06:00Z + #placemark-red + 37.72558,55.618905 + + + Неизвестное место + + + + + + 8:252-287/rw + + 19 + + + + 9:288-322/rw + + 2018-06-16T03:06:26Z + #placemark-red + 37.725478,55.619006 + + + + + + + + highway-service + + + 9:288-322/rw + + 19 + + + + 20:323-358/rw + + 2018-06-16T03:06:55Z + #placemark-red + 37.725394,55.619085 + + + + + + + + highway-service + + + 20:323-358/rw + + 19 + + + + 11:359-394/rw + + 2018-06-16T03:07:27Z + #placemark-red + 37.725305,55.619177 + + + + + + + + highway-service + + + 11:359-394/rw + + 19 + + + + 12:395-430/rw + + 2018-06-16T03:07:48Z + #placemark-red + 37.725123,55.619342 + + + + + + + + highway-service + + + 12:395-430/rw + + 19 + + + + 1:1-36/lw + + 2018-06-16T03:09:16Z + #placemark-red + 37.724146,55.619814 + + + + + + + + highway-service + + + 1:1-36/lw + + 19 + + + + 2:37-72/rw + + 2018-06-16T03:09:49Z + #placemark-red + 37.723986,55.619842 + + + + + + + + highway-service + + + 2:37-72/rw + + 19 + + + + 3:73-107/rw + + 2018-06-16T03:10:17Z + #placemark-red + 37.723839,55.61987 + + + + + + + + highway-service + + + 3:73-107/rw + + 19 + + + + 4:108-143/rw + + 2018-06-16T03:10:44Z + #placemark-red + 37.723636,55.619897 + + + + + + + + highway-service + + + 4:108-143/rw + + 19 + + + + 5:144-179/rw + + 2018-06-16T03:11:11Z + #placemark-red + 37.723449,55.619928 + + + + + + + + highway-service + + + 5:144-179/rw + + 19 + + + + 6:180-215/rw + + 2018-06-16T03:11:35Z + #placemark-red + 37.723249,55.619957 + + + + + + + + highway-service + + + 6:180-215/rw + + 19 + + + + 7:216-251/lw + + 2018-06-16T03:13:05Z + #placemark-red + 37.722097,55.620029 + + + + + + + + highway-service + + + 7:216-251/lw + + 19 + + + + 8:252-287/lw + + 2018-06-16T03:13:58Z + #placemark-red + 37.72191,55.619983 + + + Неизвестное место + + + + + + 8:252-287/lw + + 19 + + + + 9:288-323/lw + + 2018-06-16T03:14:26Z + #placemark-red + 37.721696,55.619955 + + + + + + + + highway-service + + + 9:288-323/lw + + 19 + + + + 10:324-359/lw + + 2018-06-16T03:14:51Z + #placemark-red + 37.721513,55.619945 + + + + + + + + highway-service + + + 10:324-359/lw + + 19 + + + + Service substation 1 level + + 2018-06-16T03:16:41Z + #placemark-red + 37.720441,55.619906 + + + Неизвестное место + + + + + + Service substation 1 level + + 19 + + + + 1:169-228/ltrw + + 2018-06-16T03:49:55Z + #placemark-red + 37.736095,55.623574 + + + Неизвестное место + + + + + + 1:169-228/ltrw + + 19 + + + + 1:1-48/lpw + + 2018-06-16T03:52:30Z + #placemark-red + 37.735686,55.62467 + + + + + + + + entrance + + + 1:1-48/lpw + + 18 + + + + 2:49-96/lwp + + 2018-06-16T03:53:06Z + #placemark-red + 37.735319,55.624665 + + + + + + + + entrance + + + 2:49-96/lwp + + 18 + + + + 3:97-142/lpw + + 2018-06-16T03:53:55Z + #placemark-red + 37.734949,55.624659 + + + + + + + + entrance + + + 3:97-142/lpw + + 18 + + + + 4:143-190/lwp + + 2018-06-16T03:54:25Z + #placemark-red + 37.734579,55.624653 + + + + + + + + entrance + + + 4:143-190/lwp + + 18 + + + + 5:191-238/lpw + + 2018-06-16T03:54:45Z + #placemark-red + 37.734208,55.624647 + + + + + + + + entrance + + + 5:191-238/lpw + + 18 + + + + 6:239-284lpw + + 2018-06-16T03:55:13Z + #placemark-red + 37.733841,55.624641 + + + + + + + + entrance + + + 6:239-284lpw + + 18 + + + + 7:285-332/lpw + + 2018-06-16T03:55:55Z + #placemark-red + 37.733479,55.624638 + + + + + + + + entrance + + + 7:285-332/lpw + + 18 + + + + 8:333-380/lpw + + 2018-06-16T03:56:21Z + #placemark-red + 37.733101,55.624629 + + + 8 + + + + + + entrance + + + 8:333-380/lpw + + 18 + + + + 1:1-48 + + 2018-06-16T03:58:13Z + #placemark-red + 37.733919,55.625108 + + + Неизвестное место + + + + + + 1:1-48 + + 19 + + + + 1:1-44/rw + + 2018-06-16T04:02:07Z + #placemark-red + 37.735342,55.625566 + + + Неизвестное место + + + + + + 1:1-44/rw + + 19 + + + + Сервис 1 + + 2018-06-16T04:04:59Z + #placemark-red + 37.735937,55.625487 + + + Неизвестное место + + + + + + Сервис 1 + + 18 + + + + 1:112-222/лпв + + 2018-06-16T04:06:59Z + #placemark-red + 37.737367,55.625499 + + + Неизвестное место + + + + + + 1:112-222/лпв + + 18 + + + + 1:223-333/лп + + 2018-06-16T04:08:22Z + #placemark-red + 37.73776,55.625903 + + + + + + + + highway-service + + + 1:223-333/лп + + 19 + + + + 1:1-48/lwp 2:49-96/lp 3:97-144/lp 4:145-190/lpw 5:191-238/lpw 6:239-286/lpw + + 2018-06-16T04:11:40Z + #placemark-red + 37.741062,55.625708 + + + Неизвестное место + + + + + + 1:1-48/lwp 2:49-96/lp 3:97-144/lp 4:145-190/lpw 5:191-238/lpw 6:239-286/lpw + + 18 + + + + 1:1-36/lt + + 2018-06-16T04:14:21Z + #placemark-red + 37.74114,55.624155 + + + Неизвестное место + + + + + + 1:1-36/lt + + 18 + + + + 2:97-207/rtw + + 2018-06-16T04:15:42Z + #placemark-red + 37.741765,55.623742 + + + + + + + + highway-service + + + 2:97-207/rtw + + 19 + + + + Ulmus shersh + + 2018-06-16T04:18:47Z + #placemark-red + 37.742801,55.622454 + + + Неизвестное место + + + + + + Ulmus shersh + + 19 + + + + Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 34330) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 34331) @@ -41,4 +41,15 @@ /** + * Non-regression test for ticket #16402 + * @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 #12694 * @throws Exception if an error occurs during reading