Changeset 29577 in osm for applications/editors/josm/plugins/measurement/src

Timestamp:

2013-05-10T04:34:00+02:00 (12 years ago)

Author:

donvip

Message:

[josm_measurement] fix #josm5416 - area measurement with several selected closed ways (patch by Preferred)

File:

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

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

@@ -143 +143 @@
                 Way w = (Way)p;
                 Node lastN = null;
+                double wayArea = 0.0;
                 for (Node n: w.getNodes()) {
                     if (lastN != null && lastN.getCoor() != null && n.getCoor() != null) {
                         length += lastN.getCoor().greatCircleDistance(n.getCoor());
                         //http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/
-                        area += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
+                        wayArea += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
                         - (MeasurementLayer.calcY(n.getCoor()) * MeasurementLayer.calcX(lastN.getCoor()));
                         segAngle = MeasurementLayer.angleBetween(lastN.getCoor(), n.getCoor());
@@ -154 +155 @@
                 }
                 if (lastN != null && lastN == w.getNodes().iterator().next())
-                    area = Math.abs(area / 2);
+                    wayArea = Math.abs(wayArea / 2);
                 else
-                    area = 0;
+                    wayArea = 0;
+                area += wayArea;
             }
         }