Changeset 386 in josm for trunk

Timestamp:

2007-10-14T21:02:49+02:00 (17 years ago)

Author:

gebner

Message:

Allow splitting multiple way segments connecting the same nodes.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (4 diffs)

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

@@ -99 +99 @@
                                 // Insert the node into all the nearby way segments
                                 List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint());
+                                System.out.println(wss);
                                 Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
                                 for (WaySegment ws : wss) {

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -8 +8 @@
 import java.util.List;
 import java.util.ArrayList;
+import java.util.LinkedList;
 
 import javax.swing.JComponent;
@@ -154 +155 @@
          */
         public final List<WaySegment> getNearestWaySegments(Point p) {
-                TreeMap<Double, WaySegment> nearest = new TreeMap<Double, WaySegment>();
+                TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
                 for (Way w : Main.ds.ways) {
                         if (w.deleted)
@@ -175 +176 @@
                                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
                                 if (perDist < 100 && a < c+100 && b < c+100) {
-                                        nearest.put(perDist, new WaySegment(w, i));
+                                        List<WaySegment> l;
+                                        if (nearest.containsKey(perDist)) {
+                                                l = nearest.get(perDist);
+                                        } else {
+                                                l = new LinkedList<WaySegment>();
+                                                nearest.put(perDist, l);
+                                        }
+                                        l.add(new WaySegment(w, i));
                                 }
 
@@ -181 +189 @@
                         }
                 }
-                return new ArrayList<WaySegment>(nearest.values());
+                ArrayList<WaySegment> nearestList = new ArrayList<WaySegment>();
+                for (List<WaySegment> wss : nearest.values()) {
+                        nearestList.addAll(wss);
+                }
+                return nearestList;
         }