Changeset 12745 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-09-05T21:48:18+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - deprecate LatLon#toStringCSV

removes last references of LatLon to CoordinateFormat classes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/LatLon.java (modified) (1 diff)
• gui/dialogs/InspectPrimitiveDataText.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -422 +422 @@
      * @param separator values separator
      * @return String in the format {@code "1.23456[separator]2.34567"}
-     */
+     * @deprecated method removed without replacment
+     */
+    @Deprecated
     public String toStringCSV(String separator) {
         return Utils.join(separator, Arrays.asList(

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.Arrays;
 import java.util.List;
 
@@ -10 +11 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -18 +21 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -159 +163 @@
         } else if (o instanceof Way) {
             addBbox(o);
-            add(tr("Centroid: "), Main.getProjection().eastNorth2latlon(
-                    Geometry.getCentroid(((Way) o).getNodes())).toStringCSV(", "));
+            add(tr("Centroid: "),
+                    toStringCSV(", ", Main.getProjection().eastNorth2latlon(
+                            Geometry.getCentroid(((Way) o).getNodes()))));
             addWayNodes((Way) o);
         } else if (o instanceof Relation) {
@@ -198 +203 @@
                     Double.toString(bottomRigth.east()), ", ",
                     Double.toString(topLeft.north()));
-            add(tr("Center of bounding box: "), bbox.getCenter().toStringCSV(", "));
+            add(tr("Center of bounding box: "), toStringCSV(", ", bbox.getCenter()));
         }
     }
@@ -233 +238 @@
     }
 
+    /**
+     * Returns lat/lon coordinate in human-readable format separated by {@code separator}.
+     * @param separator values separator
+     * @param ll the lat/lon
+     * @return String in the format {@code "1.23456[separator]2.34567"}
+     */
+    private static String toStringCSV(String separator, ILatLon ll) {
+        return Utils.join(separator, Arrays.asList(
+                DecimalDegreesCoordinateFormat.INSTANCE.latToString(ll),
+                DecimalDegreesCoordinateFormat.INSTANCE.lonToString(ll)
+        ));
+    }
+
     @Override
     public String toString() {