Changeset 31285 in osm for applications/editors

Timestamp:

2015-06-19T21:45:15+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/measurement: compute and display selection radius (patch by willytiengo)

File:

• applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (modified) (8 diffs)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -70 +70 @@
 
     /**
+     * The measurement label for radius if the currently selected loop is a circle.
+     */
+    protected JLabel selectRadiusLabel;
+
+    /**
      * The measurement label for the segment angle, actually updated, if 2 nodes are selected
      */
@@ -119 +124 @@
         valuePanel.add(selectAreaLabel);
 
+        valuePanel.add(new JLabel(tr("Selection Radius")));
+
+        selectRadiusLabel = new JLabel(getRadiusText(0));
+        valuePanel.add(selectRadiusLabel);
+
         JLabel angle = new JLabel(tr("Angle"));
         angle.setToolTipText(tr("Angle between two selected Nodes"));
@@ -142 +152 @@
     protected String getAreaText(double v) {
         return NavigatableComponent.getSystemOfMeasurement().getAreaText(v, new DecimalFormat("#0.000"), 1e-3);
+    }
+
+    protected String getRadiusText(double v) {
+        return NavigatableComponent.getSystemOfMeasurement().getDistText(v, new DecimalFormat("#0.000"), 1e-3);
     }
 
@@ -160 +174 @@
         double segAngle = 0.0;
         double area = 0.0;
+        double radius = 0.0;
         Node lastNode = null;
         // Don't mix up way and nodes computation (fix #6872). Priority given to ways
@@ -181 +196 @@
                 Node lastN = null;
                 double wayArea = 0.0;
+                Double firstSegLength = null;
+                boolean isCircle = true;
                 for (Node n: w.getNodes()) {
                     if (lastN != null && lastN.getCoor() != null && n.getCoor() != null) {
-                        length += lastN.getCoor().greatCircleDistance(n.getCoor());
+                        final double segLength = lastN.getCoor().greatCircleDistance(n.getCoor());
+                        if (firstSegLength == null) {
+                            firstSegLength = segLength;
+                        }
+                        if (isCircle && Math.abs(firstSegLength - segLength) > 0.000001) {
+                            isCircle = false;
+                        }
+                        length += segLength;
                         //http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/
                         wayArea += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
@@ -197 +221 @@
                 area += wayArea;
             }
+            if (ways.size() == 1 && area > 0.0) {
+                radius = length / (2 * Math.PI);
+            }
         }
 
@@ -202 +229 @@
         final String angleLabel = getAngleText(segAngle);
         final String areaLabel = getAreaText(area);
+        final String radiusLabel = getRadiusText(radius);
 
         GuiHelper.runInEDT(new Runnable() {
@@ -209 +237 @@
                 segAngleLabel.setText(angleLabel);
                 selectAreaLabel.setText(areaLabel);
+                selectRadiusLabel.setText(radiusLabel);
             }
         });