Changeset 23561 in osm for applications/editors/josm/plugins/routing/src

Timestamp:

2010-10-11T22:03:42+02:00 (14 years ago)

Author:

jttt

Message:

Update to latest josm

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing

Files:

• RoutingLayer.java (modified) (2 diffs)
• gui/RoutingPreferenceDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java

@@ -131 +131 @@
     public final Node getNearestHighwayNode(Point p) {
         Node nearest = null;
+        int snapDistance = NavigatableComponent.PROP_SNAP_DISTANCE.get();
         double minDist = 0;
         for (Way w : dataLayer.data.getWays()) {
@@ -139 +140 @@
                 Point P = Main.map.mapView.getPoint(n);
                 double dist = p.distanceSq(P);
-                if (dist < NavigatableComponent.snapDistance) {
+                if (dist < snapDistance) {
                     if ((nearest == null) || (dist < minDist)) {
                         nearest = n;

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java

@@ -28 +28 @@
 
 package com.innovant.josm.plugin.routing.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.ComponentOrientation;
@@ -51 +53 @@
 import javax.swing.table.DefaultTableModel;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import org.apache.log4j.Logger;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -61 +60 @@
 
 import com.innovant.josm.jrt.osm.OsmWayTypes;
-import com.innovant.josm.plugin.routing.RoutingPlugin;
 
 public class RoutingPreferenceDialog implements PreferenceSetting {