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

Timestamp:

2020-01-26T19:45:25+01:00 (4 years ago)

Author:

simon04

Message:

fix #13813 - Advanced object info: use consistent coordinates/bbox format

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java (modified) (5 diffs)

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;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 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.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.AbstractCoordinateFormat;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.ProjectedCoordinateFormat;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -168 +173 @@
         } else if (o instanceof IWay) {
             addBbox(o);
-            add(tr("Centroid: "),
-                    toStringCSV(", ", ProjectionRegistry.getProjection().eastNorth2latlon(
-                            Geometry.getCentroid(((IWay<?>) o).getNodes()))));
+            add(tr("Centroid: "), toStringCSV(false,
+                    ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getCentroid(((IWay<?>) o).getNodes()))));
             addWayNodes((IWay<?>) o);
         } else if (o instanceof IRelation) {
@@ -200 +204 @@
         BBox bbox = o.getBBox();
         if (bbox != null) {
-            add(tr("Bounding box: "), bbox.toStringCSV(", "));
-            EastNorth bottomRigth = bbox.getBottomRight().getEastNorth(ProjectionRegistry.getProjection());
-            EastNorth topLeft = bbox.getTopLeft().getEastNorth(ProjectionRegistry.getProjection());
-            add(tr("Bounding box (projected): "),
-                    Double.toString(topLeft.east()), ", ",
-                    Double.toString(bottomRigth.north()), ", ",
-                    Double.toString(bottomRigth.east()), ", ",
-                    Double.toString(topLeft.north()));
-            add(tr("Center of bounding box: "), toStringCSV(", ", bbox.getCenter()));
+            final LatLon bottomRight = bbox.getBottomRight();
+            final LatLon topLeft = bbox.getTopLeft();
+            add(tr("Bounding box: "), toStringCSV(false, bottomRight, topLeft));
+            add(tr("Bounding box (projected): "), toStringCSV(true, bottomRight, topLeft));
+            add(tr("Center of bounding box: "), toStringCSV(false, bbox.getCenter()));
         }
     }
@@ -214 +214 @@
     void addCoordinates(INode n) {
         if (n.isLatLonKnown()) {
-            add(tr("Coordinates:"), " ",
-                    Double.toString(n.lat()), ", ",
-                    Double.toString(n.lon()));
-            EastNorth en = n.getEastNorth();
-            add(tr("Coordinates (projected): "),
-                    Double.toString(en.east()), ", ",
-                    Double.toString(en.north()));
+            add(tr("Coordinates:"), " ", toStringCSV(false, n));
+            add(tr("Coordinates (projected): "), toStringCSV(true, n));
             Pair<Integer, Hemisphere> utmZone = TransverseMercator.locateUtmZone(n.getCoor());
             String utmLabel = tr("UTM Zone");
@@ -248 +243 @@
 
     /**
-     * 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"}
+     * Returns the coordinates in human-readable format.
+     * @param projected whether to use projected coordinates
+     * @param coordinates the coordinates to format
+     * @return String in the format {@code "1.23456, 2.34567"}
      */
-    private static String toStringCSV(String separator, ILatLon ll) {
-        return String.join(separator,
-                DecimalDegreesCoordinateFormat.INSTANCE.latToString(ll),
-                DecimalDegreesCoordinateFormat.INSTANCE.lonToString(ll)
-        );
+    private static String toStringCSV(boolean projected, ILatLon... coordinates) {
+        final AbstractCoordinateFormat format = projected
+                ? ProjectedCoordinateFormat.INSTANCE
+                : DecimalDegreesCoordinateFormat.INSTANCE;
+        return Arrays.stream(coordinates)
+                .flatMap(ll -> Stream.of(format.latToString(ll), format.lonToString(ll)))
+                .collect(Collectors.joining(", "));
     }