Changeset 12735 in josm for trunk/src/org/openstreetmap/josm/io/OsmWriter.java

Timestamp:

2017-09-05T17:58:01+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - move CoordinateFormat code out of LatLon class

File:

• trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) (3 diffs)

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.DataSource;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -194 +194 @@
         for (DataSource s : ds.getDataSources()) {
             out.println("  <bounds minlat='"
-                    + s.bounds.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES)
+                    + DecimalDegreesCoordinateFormat.INSTANCE.latToString(s.bounds.getMin())
                     +"' minlon='"
-                    + s.bounds.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES)
+                    + DecimalDegreesCoordinateFormat.INSTANCE.lonToString(s.bounds.getMin())
                     +"' maxlat='"
-                    + s.bounds.getMax().latToString(CoordinateFormat.DECIMAL_DEGREES)
+                    + DecimalDegreesCoordinateFormat.INSTANCE.latToString(s.bounds.getMax())
                     +"' maxlon='"
-                    + s.bounds.getMax().lonToString(CoordinateFormat.DECIMAL_DEGREES)
+                    + DecimalDegreesCoordinateFormat.INSTANCE.lonToString(s.bounds.getMax())
                     +"' origin='"+XmlWriter.encode(s.origin)+"' />");
         }
@@ -273 +273 @@
         out.print(" open='"+ (cs.isOpen() ? "true" : "false") +'\'');
         if (cs.getMin() != null) {
-            out.print(" min_lon='"+ cs.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES) +'\'');
-            out.print(" min_lat='"+ cs.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES) +'\'');
+            out.print(" min_lon='"+ DecimalDegreesCoordinateFormat.INSTANCE.lonToString(cs.getMin()) +'\'');
+            out.print(" min_lat='"+ DecimalDegreesCoordinateFormat.INSTANCE.latToString(cs.getMin()) +'\'');
         }
         if (cs.getMax() != null) {
-            out.print(" max_lon='"+ cs.getMin().lonToString(CoordinateFormat.DECIMAL_DEGREES) +'\'');
-            out.print(" max_lat='"+ cs.getMin().latToString(CoordinateFormat.DECIMAL_DEGREES) +'\'');
+            out.print(" max_lon='"+ DecimalDegreesCoordinateFormat.INSTANCE.lonToString(cs.getMin()) +'\'');
+            out.print(" max_lat='"+ DecimalDegreesCoordinateFormat.INSTANCE.latToString(cs.getMin()) +'\'');
         }
         out.println(">");