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

Timestamp:

2013-12-30T10:17:44+01:00 (11 years ago)

Author:

simon04

Message:

fix #9494 - Advanced object info: add "Center of bounding box", and for ways "Centroid"

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/TransformNodesCommand.java (modified) (1 diff)
• data/coor/LatLon.java (modified) (2 diffs)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (3 diffs)
• tools/Geometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

@@ -128 +128 @@
      * Get the center of the nodes under modification.
      * It's just the barycenter.
+     * @see {@link org.openstreetmap.josm.tools.Geometry#getCentroid(java.util.List)}
      */
     public EastNorth getNodesCenter() {

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

@@ -14 +14 @@
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.util.Arrays;
 import java.util.Locale;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -314 +316 @@
     }
 
+    /**
+     * Returns this lat/lon pair in human-readable format separated by {@code separator}.
+     * @return String in the format {@code "1.23456[separator]2.34567"}
+     */
+    public String toStringCSV(String separator) {
+        return Utils.join(separator, Arrays.asList(
+                latToString(CoordinateFormat.DECIMAL_DEGREES),
+                lonToString(CoordinateFormat.DECIMAL_DEGREES)
+        ));
+    }
+
     public LatLon interpolate(LatLon ll2, double proportion) {
         return new LatLon(this.lat() + proportion * (ll2.lat() - this.lat()),

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

@@ -48 +48 @@
 import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -241 +242 @@
             } else if (o instanceof Way) {
                 addBbox(o);
+                add(tr("Centroid: "), Main.getProjection().eastNorth2latlon(
+                        Geometry.getCentroid(((Way) o).getNodes())).toStringCSV(", "));
                 addWayNodes((Way) o);
             } else if (o instanceof Relation) {
@@ -278 +281 @@
                         Double.toString(bottomRigth.east()), ", ",
                         Double.toString(topLeft.north()));
+                add(tr("Center of bounding box: "), bbox.getCenter().toStringCSV(", "));
             }
         }

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -660 +660 @@
 
     /**
-     * Compute the centroid of nodes
+     * Compute the centroid/barycenter of nodes
      * @param nodes Nodes for which the centroid is wanted
      * @return the centroid of nodes