Changeset 3596 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-10-09T07:57:01+02:00 (14 years ago)

Author:

bastiK

Message:

applied #5531 (patch by Martin Ždila) - There should be way to merge nodes by averaging their position

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -88 +89 @@
      */
     public static Node selectTargetLocationNode(LinkedHashSet<Node> candidates) {
-        Node targetNode = null;
-        for (Node n : candidates) { // pick last one
-            targetNode = n;
-        }
-        return targetNode;
+        if (! Main.pref.getBoolean("merge-nodes.average-location", false)) {
+            Node targetNode = null;
+            for (final Node n : candidates) { // pick last one
+                targetNode = n;
+            }
+            return targetNode;
+        }
+
+        double lat = 0, lon = 0;
+        for (final Node n : candidates) {
+            lat += n.getCoor().lat();
+            lon += n.getCoor().lon();
+        }
+
+        return new Node(new LatLon(lat / candidates.size(), lon / candidates.size()));
     }