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

Timestamp:

2013-06-01T22:35:06+02:00 (11 years ago)

Author:

Don-vip

Message:

ParallelWayAction: handle nautical mile SoM + listen to preferences changes

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (modified) (10 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -79 +81 @@
  * @author Ole Jørgen Brønner (olejorgenb)
  */
-public class ParallelWayAction extends MapMode implements AWTEventListener, MapViewPaintable {
-
-    private static final long serialVersionUID = 1L;
+public class ParallelWayAction extends MapMode implements AWTEventListener, MapViewPaintable, PreferenceChangedListener {
 
     private enum Mode {
@@ -100 +100 @@
     private double snapDistanceImperial;
     private double snapDistanceChinese;
+    private double snapDistanceNautical;
 
     private ModifiersSpec snapModifierCombo;
@@ -119 +120 @@
     private WaySegment referenceSegment;
     private ParallelWays pWays;
-    LinkedHashSet<Way> sourceWays;
+    private LinkedHashSet<Way> sourceWays;
     private EastNorth helperLineStart;
     private EastNorth helperLineEnd;
@@ -131 +132 @@
         mv = mapFrame.mapView;
         updateModeLocalPreferences();
+        Main.pref.addPreferenceChangeListener(this);
     }
 
@@ -199 +201 @@
     private void updateModeLocalPreferences() {
         // @formatter:off
-        //snapThreshold        = Main.pref.getDouble (prefKey("snap-threshold"), 0.35); // Old preference was stored in meters, hence the new name (percent)
         snapThreshold        = Main.pref.getDouble (prefKey("snap-threshold-percent"), 0.70);
         snapDefault          = Main.pref.getBoolean(prefKey("snap-default"),      true);
@@ -207 +208 @@
         snapDistanceImperial = Main.pref.getDouble(prefKey("snap-distance-imperial"), 1);
         snapDistanceChinese  = Main.pref.getDouble(prefKey("snap-distance-chinese"), 1);
+        snapDistanceNautical = Main.pref.getDouble(prefKey("snap-distance-nautical"), 0.1);
 
         snapModifierCombo           = new ModifiersSpec(getStringPref("snap-modifier-combo",             "?sC"));
@@ -400 +402 @@
         }
 
-        //// Calculate distance to the reference line
+        // Calculate distance to the reference line
         EastNorth enp = mv.getEastNorth((int) p.getX(), (int) p.getY());
         EastNorth nearestPointOnRefLine = Geometry.closestPointToLine(referenceSegment.getFirstNode().getEastNorth(),
@@ -423 +425 @@
             } else if (som.equals(NavigatableComponent.IMPERIAL_SOM)) {
                 snapDistance = snapDistanceImperial * NavigatableComponent.IMPERIAL_SOM.aValue;
+            } else if (som.equals(NavigatableComponent.NAUTICAL_MILE_SOM)) {
+                snapDistance = snapDistanceNautical * NavigatableComponent.NAUTICAL_MILE_SOM.aValue;
             } else {
                 snapDistance = snapDistanceMetric; // Metric system by default
@@ -577 +581 @@
         return getStringPref(subKey, null);
     }
+
+    @Override
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if (e.getKey().startsWith(prefKey(""))) {
+            updateAllPreferences();
+        }
+    }
 }