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

Timestamp:

2010-08-29T20:17:41+02:00 (16 years ago)

Author:

bastiK

Message:

fixed #5349 - A LOT of gpx tracks fill entire screen with popup information

File:

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

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

@@ -36 +36 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.preferences.ProjectionPreference;
 import org.openstreetmap.josm.tools.Predicate;
 
@@ -116 +117 @@
 
     public static String getDistText(double dist) {
-        SystemOfMeasurement som = SYSTEMS_OF_MEASUREMENT.get(Main.pref.get("system_of_measurement", "Metric"));
-        if (som == null) {
-            som = METRIC_SOM;
-        }
-        return som.getDistText(dist);
+        return getSystemOfMeasurement().getDistText(dist);
     }
 
@@ -718 +715 @@
     }
 
+    public static SystemOfMeasurement getSystemOfMeasurement() {
+        SystemOfMeasurement som = SYSTEMS_OF_MEASUREMENT.get(ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get());
+        if (som == null)
+            return METRIC_SOM;
+        return som;
+    }
+
     public static class SystemOfMeasurement {
         public final double aValue;