Changeset 5565 in josm for trunk

Timestamp:

2012-11-04T13:19:13+01:00 (12 years ago)

Author:

Don-vip

Message:

see #8153 - fix area computation

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (1 diff)

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

@@ -1244 +1244 @@
          */
         public String getAreaText(double area) {
-            return getDistText(area)+"\u00b2"; // square
+            double a = area / (aValue*aValue);
+            if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && a > bValue / aValue) {
+                double b = area / (bValue*bValue);
+                return String.format(Locale.US, "%." + (b<10 ? 2 : 1) + "f %s", b, bName+"\u00b2");
+            } else if (a < 0.01)
+                return "< 0.01 " + aName;
+            else
+                return String.format(Locale.US, "%." + (a<10 ? 2 : 1) + "f %s", a, aName+"\u00b2");
         }
     }