Changeset 14075 in josm

Timestamp:

2018-08-02T22:48:59+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16550 - fix regressions in OSM -> GPX conversion

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/io/GpxWriterTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -73 +73 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Way;
@@ -747 +748 @@
                     trk.add(trkseg);
                 }
-                if (!n.isTagged()) {
+                if (!n.isTagged() || containsOnlyGpxTags(n)) {
                     doneNodes.add(n);
                 }
@@ -755 +756 @@
             gpxData.addTrack(new ImmutableGpxTrack(trk, trkAttr));
         });
+    }
+
+    private static boolean containsOnlyGpxTags(Tagged t) {
+        for (String key : t.getKeys().keySet()) {
+            if (!GpxConstants.WPT_KEYS.contains(key)) {
+                return false;
+            }
+        }
+        return true;
     }
 

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -10 +10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -81 +83 @@
 
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
-        out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
-                (hasExtensions ? String.format("    xmlns:josm=\"%s\"%n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
-                "    xmlns:xsi=\""+XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI+"\" \n" +
-                "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
+        out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"");
+        out.println((hasExtensions ? String.format("    xmlns:josm=\"%s\"%n", JOSM_EXTENSIONS_NAMESPACE_URI) : "") +
+                    "    xmlns:xsi=\""+XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI+"\"");
+        out.println("    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
         indent = "  ";
         writeMetaData();
@@ -112 +114 @@
                 if (value != null) {
                     simpleTag(key, value);
+                } else {
+                    Object val = obj.get(key);
+                    if (val instanceof Date) {
+                        simpleTag(key, DateUtils.getGpxFormat().format(val));
+                    }
                 }
             }

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Iterator;
 
 import org.junit.Before;
@@ -16 +21 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -22 +32 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -190 +203 @@
     /**
      * Unit test of {@link OsmDataLayer#toGpxData}.
-     */
-    @Test
-    public void testToGpxData() {
-        fillDataSet(ds);
-        assertNotNull(layer.toGpxData());
+     * @throws IllegalDataException never
+     */
+    @Test
+    public void testToGpxData() throws IllegalDataException {
+        ds.mergeFrom(OsmReader.parseDataSet(new ByteArrayInputStream((
+                "<?xml version='1.0' encoding='UTF-8'?>\n" +
+                "<osm version='0.6' upload='false' generator='JOSM'>\n" +
+                "  <node id='-546306' timestamp='2018-08-01T10:00:00Z' lat='47.0' lon='9.0'>\n" +
+                "    <tag k='ele' v='123' />\n" +
+                "    <tag k='time' v='2018-08-01T10:00:00Z' />\n" +
+                "  </node>\n" +
+                "  <node id='-546307' timestamp='2018-08-01T10:01:00Z' lat='47.1' lon='9.1'>\n" +
+                "    <tag k='ele' v='456' />\n" +
+                "    <tag k='time' v='2018-08-01T10:01:00Z' />\n" +
+                "  </node>\n" +
+                "  <way id='-546308'>\n" +
+                "    <nd ref='-546306' />\n" +
+                "    <nd ref='-546307' />\n" +
+                "  </way>\r\n" +
+                "</osm>").getBytes(StandardCharsets.UTF_8)), null));
+        GpxData gpx = layer.toGpxData();
+        assertNotNull(gpx);
+        // Check metadata
+        assertEquals(new Bounds(47.0, 9.0, 47.1, 9.1), gpx.recalculateBounds());
+        // Check there is no waypoint
+        assertTrue(gpx.getWaypoints().isEmpty());
+        // Check that track is correct
+        assertEquals(1, gpx.getTrackCount());
+        GpxTrack track = gpx.getTracks().iterator().next();
+        Collection<GpxTrackSegment> segments = track.getSegments();
+        assertEquals(1, segments.size());
+        Collection<WayPoint> trackpoints = segments.iterator().next().getWayPoints();
+        assertEquals(2, trackpoints.size());
+        Iterator<WayPoint> it = trackpoints.iterator();
+        DateFormat gpxFormat = DateUtils.getGpxFormat();
+        WayPoint p1 = it.next();
+        assertEquals(new LatLon(47.0, 9.0), p1.getCoor());
+        assertEquals("123", p1.get(GpxConstants.PT_ELE));
+        assertEquals("2018-08-01T10:00:00.000Z", gpxFormat.format(p1.get(GpxConstants.PT_TIME)));
+        WayPoint p2 = it.next();
+        assertEquals(new LatLon(47.1, 9.1), p2.getCoor());
+        assertEquals("456", p2.get(GpxConstants.PT_ELE));
+        assertEquals("2018-08-01T10:01:00.000Z", gpxFormat.format(p2.get(GpxConstants.PT_TIME)));
     }