Changeset 16663 in josm for trunk

Timestamp:

2020-06-17T00:05:03+02:00 (4 years ago)

Author:

simon04

Message:

OsmWriter: fix max_lat/max_lon in <changeset>

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmWriterTest.java (modified) (3 diffs)

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

@@ -313 +313 @@
         }
         if (cs.getMax() != null) {
-            out.print(" max_lon='"+ DecimalDegreesCoordinateFormat.INSTANCE.lonToString(cs.getMin()) +'\'');
-            out.print(" max_lat='"+ DecimalDegreesCoordinateFormat.INSTANCE.latToString(cs.getMin()) +'\'');
+            out.print(" max_lon='"+ DecimalDegreesCoordinateFormat.INSTANCE.lonToString(cs.getMax()) +'\'');
+            out.print(" max_lat='"+ DecimalDegreesCoordinateFormat.INSTANCE.latToString(cs.getMax()) +'\'');
         }
         out.println(">");

trunk/test/unit/org/openstreetmap/josm/io/OsmWriterTest.java

@@ -9 +9 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -16 +17 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DownloadPolicy;
 import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.UploadPolicy;
+import org.openstreetmap.josm.data.osm.User;
 
 /**
@@ -91 +95 @@
                         .replaceAll("\n", ""));
     }
+
+    /**
+     * Unit test of {@link OsmWriter#visit(Changeset)}.
+     * @throws IOException if an I/O error occurs
+     */
+    @Test
+    public void testChangeset() throws IOException {
+        Changeset cs = new Changeset();
+        cs.setUser(User.getAnonymous());
+        cs.setId(38038262);
+        cs.setMin(new LatLon(12., 34.));
+        cs.setMax(new LatLon(56., 78.));
+        try (StringWriter stringWriter = new StringWriter();
+             OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(stringWriter), true, OsmWriter.DEFAULT_API_VERSION)) {
+            osmWriter.visit(cs);
+            assertEquals("  <changeset id='38038262' user='&lt;anonymous&gt;' uid='-1' open='false' " +
+                            "min_lon='34.0' min_lat='12.0' max_lon='78.0' max_lat='56.0'>\n  </changeset>\n",
+                    stringWriter.toString().replace("\r", ""));
+        }
+    }
 }