Changeset 805 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

18.08.2008 01:27:58 (4 years ago)

Author:

stoecker

Message:

Added virtual nodes in select mode. Closes #595.

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (9 diffs)

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

@@ -32 +32 @@
 public class NavigatableComponent extends JComponent implements Helpful {
 
-
         public static final EastNorth world = Main.proj.latlon2eastNorth(new LatLon(Projection.MAX_LAT, Projection.MAX_LON));
-
+        public static final int snapDistance = sqr(Main.pref.getInteger("node.snap-distance", 10));
+
+        private static int sqr(int a) { return a*a;}
         /**
          * The scale factor in x or y-units per pixel. This means, if scale = 10,
@@ -141 +142 @@
                         Point sp = getPoint(n.eastNorth);
                         double dist = p.distanceSq(sp);
-                        if (minDistanceSq > dist && dist < 100) {
+                        if (minDistanceSq > dist && dist < snapDistance) {
                                 minDistanceSq = p.distanceSq(sp);
                                 minPrimitive = n;
@@ -180 +181 @@
                                 double b = p.distanceSq(A);
                                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
-                                if (perDist < 100 && a < c+100 && b < c+100) {
+                                if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
                                         List<WaySegment> l;
                                         if (nearest.containsKey(perDist)) {
@@ -228 +229 @@
                 WaySegment nearestWaySeg = getNearestWaySegment(p);
                 return nearestWaySeg == null ? null : nearestWaySeg.way;
-    }
+        }
 
         /**
@@ -240 +241 @@
          * If nothing is found, return <code>null</code>.
          *
-         * @param p                              The point on screen.
-         * @return      The primitive that is nearest to the point p.
+         * @param p The point on screen.
+         * @return  The primitive that is nearest to the point p.
          */
         public OsmPrimitive getNearest(Point p) {
                 OsmPrimitive osm = getNearestNode(p);
                 if (osm == null)
+                {
                         osm = getNearestWay(p);
+                }
                 return osm;
         }
@@ -258 +261 @@
                         return Collections.emptySet();
                 return Collections.singleton(osm);
-        }
-
-        @Deprecated
-        public OsmPrimitive getNearest(Point p, boolean segmentInsteadWay) {
-                return getNearest(p);
         }
 
@@ -290 +288 @@
                                 double b = p.distanceSq(A);
                                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
-                                if (perDist < 100 && a < c+100 && b < c+100) {
+                                if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
                                         nearest.add(w);
                                                 break;
@@ -299 +297 @@
                 for (Node n : Main.ds.nodes) {
                         if (!n.deleted && !n.incomplete
-                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                                        && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
                                 nearest.add(n);
                         }
@@ -318 +316 @@
                 for (Node n : Main.ds.nodes) {
                         if (!n.deleted && !n.incomplete
-                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                                        && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
                                 nearest.add(n);
                         }