Changeset 388 in josm for trunk/src

Timestamp:

2007-10-14T21:54:13+02:00 (18 years ago)

Author:

gebner

Message:

When inserting node into a way segment, move it to lie on the former segment.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (6 diffs)
• data/osm/NodePair.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -14 +14 @@
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.LinkedList;
 import java.util.List;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodePair;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -111 +113 @@
                                         is.add(ws.lowerIndex);
                                 }
-                        
+
+                                Set<NodePair> segSet = new HashSet<NodePair>();
+
                                 for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
                                         Way w = insertPoint.getKey();
@@ -119 +123 @@
 
                                         pruneSuccsAndReverse(is);
+                                        for (int i : is) segSet.add(
+                                                new NodePair(w.nodes.get(i), w.nodes.get(i+1)).sort());
                                         for (int i : is) wnew.nodes.add(i + 1, n);
 
@@ -125 +131 @@
                                         reuseWays.add(wnew);
                                 }
+
+                                adjustNode(segSet, n);
                         }
                 }
@@ -215 +223 @@
                 Collections.reverse(is);
         }
+
+        private static void adjustNode(Collection<NodePair> segs, Node n) {
+                // FIXME: find intersection if more than one seg.
+                if (segs.size() >= 1) {
+                        EastNorth P = n.eastNorth;
+                        NodePair seg = segs.iterator().next();
+                        EastNorth A = seg.a.eastNorth;
+                        EastNorth B = seg.b.eastNorth;
+                        double a = P.distance(B);
+                        double b = P.distance(A);
+                        double c = A.distance(B);
+                        double q = (a - b + c) / (2*c);
+                        n.eastNorth = new EastNorth(
+                                B.east() + q * (A.east() - B.east()),
+                                B.north() + q * (A.north() - B.north()));
+                }
+        }
         
         @Override public String getModeHelpText() {

trunk/src/org/openstreetmap/josm/data/osm/NodePair.java

@@ -31 +31 @@
         }
 
-        public void sort() {
+        public NodePair sort() {
                 if (b.hashCode() < a.hashCode()) {
                         Node tmp = a;
@@ -37 +37 @@
                         b = tmp;
                 }
+                return this;
         }
 }