Changeset 33791 in osm for applications/editors/josm/plugins

Timestamp:

2017-11-06T00:58:05+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm11804 - import tracks from KML/KMZ files

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (modified) (6 diffs)

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.date.DateUtils;
 
 public class KmlReader extends AbstractReader {
@@ -45 +46 @@
     public static final String KML_LINEAR_RING = "LinearRing";
     public static final String KML_COORDINATES = "coordinates";
+    public static final String KML_WHEN = "when";
+
+    public static final String KML_EXT_TRACK = "Track";
+    public static final String KML_EXT_COORD = "coord";
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -93 +98 @@
     private void parsePlaceMark(DataSet ds) throws XMLStreamException {
         List<OsmPrimitive> list = new ArrayList<>();
+        long when = 0;
         Way way = null;
         Node node = null;
@@ -127 +133 @@
                         relation.addMember(new RelationMember(role, way));
                     }
-                } else if (parser.getLocalName().equals(KML_LINE_STRING)) {
+                } else if (parser.getLocalName().equals(KML_LINE_STRING) || parser.getLocalName().equals(KML_EXT_TRACK)) {
                     ds.addPrimitive(way = new Way());
                     list.add(way);
@@ -133 +139 @@
                     String[] tab = parser.getElementText().trim().split("\\s");
                     for (int i = 0; i < tab.length; i++) {
-                        String[] values = tab[i].split(",");
-                        if (values.length >= 2) {
-                            LatLon ll = new LatLon(Double.valueOf(values[1]), Double.valueOf(values[0])).getRoundedToOsmPrecision();
-                            node = nodes.get(ll);
-                            if (node == null) {
-                                ds.addPrimitive(node = new Node(ll));
-                                nodes.put(ll, node);
-                                if (values.length > 2 && !values[2].equals("0")) {
-                                    node.put("ele", values[2]);
-                                }
-                            }
-                            if (way != null) {
-                                way.addNode(node);
-                            }
-                        }
+                        node = parseNode(ds, way, node, tab[i].split(","));
                     }
+                } else if (parser.getLocalName().equals(KML_EXT_COORD)) {
+                    node = parseNode(ds, way, node, parser.getElementText().trim().split("\\s"));
+                    if (node != null && when > 0) {
+                        node.setRawTimestamp((int) when);
+                    }
+                } else if (parser.getLocalName().equals(KML_WHEN)) {
+                    when = DateUtils.tsFromString(parser.getElementText().trim());
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -164 +163 @@
         }
     }
+
+    private Node parseNode(DataSet ds, Way way, Node node, String[] values) {
+        if (values.length >= 2) {
+            LatLon ll = new LatLon(Double.valueOf(values[1]), Double.valueOf(values[0])).getRoundedToOsmPrecision();
+            node = nodes.get(ll);
+            if (node == null) {
+                ds.addPrimitive(node = new Node(ll));
+                nodes.put(ll, node);
+                if (values.length > 2 && !values[2].equals("0")) {
+                    node.put("ele", values[2]);
+                }
+            }
+            if (way != null) {
+                way.addNode(node);
+            }
+        }
+        return node;
+    }
 }