Changeset 25137 in osm for applications/editors/josm/plugins/measurement/src/org

Timestamp:

2011-01-25T11:13:50+01:00 (14 years ago)

Author:

upliner

Message:

measurement plugin: use LatLon.greatCircleDistance() instead of plugin's distance function

Location:

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement

Files:

• MeasurementDialog.java (modified) (4 diffs)
• MeasurementLayer.java (modified) (3 diffs)

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

@@ -104 +104 @@
         final MeasurementDialog dlg = this;
 
-        DataSet.selListeners.add(new SelectionChangedListener() {
+        DataSet.addSelectionListener(new SelectionChangedListener() {
+            @Override
             public void selectionChanged(Collection<? extends OsmPrimitive> arg0) {
                 double length = 0.0;
@@ -117 +118 @@
                             lastNode = n;
                         } else {
-                            length += MeasurementLayer.calcDistance(lastNode.getCoor(), n.getCoor());
+                            length += lastNode.getCoor().greatCircleDistance(n.getCoor());
                             segAngle = MeasurementLayer.angleBetween(lastNode.getCoor(), n.getCoor());
                             lastNode = n;
@@ -126 +127 @@
                         for(Node n: w.getNodes()) {
                             if(lastN != null) {
-                                length += MeasurementLayer.calcDistance(lastN.getCoor(), n.getCoor());
+                                length += lastN.getCoor().greatCircleDistance(n.getCoor());
                                 //http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/
                                 area += (MeasurementLayer.calcX(n.getCoor()) * MeasurementLayer.calcY(lastN.getCoor()))
@@ -148 +149 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e)
     {

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

@@ -144 +144 @@
     }
 
-    public static double calcDistance(LatLon p1, LatLon p2){
-        double lat1, lon1, lat2, lon2;
-        double dlon, dlat;
-
-        lat1 = p1.lat() * Math.PI / 180.0;
-        lon1 = p1.lon() * Math.PI / 180.0;
-        lat2 = p2.lat() * Math.PI / 180.0;
-        lon2 = p2.lon() * Math.PI / 180.0;
-
-        dlon = lon2 - lon1;
-        dlat = lat2 - lat1;
-
-        double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
-        return 6367000 * c;
-    }
-
     public static double calcX(LatLon p1){
         double lat1, lon1, lat2, lon2;
@@ -196 +179 @@
 
     public static double calcDistance(WayPoint p1, WayPoint p2){
-        return calcDistance(p1.getCoor(), p2.getCoor());
+        return p1.getCoor().greatCircleDistance(p2.getCoor());
     }
 
@@ -260 +243 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Box panel = Box.createVerticalBox();