Changeset 19092 in josm

Timestamp:

2024-05-31T21:52:43+02:00 (8 months ago)

Author:

stoecker

Message:

fix #23702, see #23621 - improve length unit conversion

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -1188 +1188 @@
      * Convert a length unit to meters
      * <p>
-     * Tries to convert a length unit to meter value or returns a - when impossible
+     * Tries to convert a length unit to meter value or returns {@code null} when impossible
      * @param s arbitrary string representing a length
      * @return the length converted to meters
@@ -1201 +1201 @@
             Logging.debug(e);
         }
-        return "-";
+        return null;
     }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -91 +91 @@
     private static final Pattern REMOVE_DIACRITICS = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
-    private static final Pattern PATTERN_LENGTH = Pattern.compile("^(\\d+(?:\\.\\d+)?)(cm|mm|m|ft|in|'|\")?$");
-    private static final Pattern PATTERN_LENGTH2 = Pattern.compile("^(\\d+(?:\\.\\d+)?)(ft|')(\\d+(?:\\.\\d+)?)(in|\")?$");
+    private static final Pattern PATTERN_LENGTH = Pattern.compile("^(-?\\d+(?:\\.\\d+)?)(cm|mi|mm|m|ft|km|nmi|in|'|\")?$");
+    private static final Pattern PATTERN_LENGTH2 = Pattern.compile("^(-?)(\\d+(?:\\.\\d+)?)(ft|')(\\d+(?:\\.\\d+)?)(in|\")?$");
 
     private static final String DEFAULT_STRIP = "\uFEFF\u200B";
@@ -2078 +2078 @@
             else if ("mm".equals(m.group(2)))
                 v *= 0.001;
+            else if ("km".equals(m.group(2)))
+                v *= 1000.0;
+            else if ("nmi".equals(m.group(2)))
+                v *= 1852.0;
+            else if ("mi".equals(m.group(2)))
+                v *= 1609.344;
             else if ("ft".equals(m.group(2)) || "'".equals(m.group(2)))
                 v *= 0.3048;
@@ -2086 +2092 @@
             m = PATTERN_LENGTH2.matcher(s);
             if (m.matches()) {
-                return Double.valueOf(m.group(1))*0.3048+Double.valueOf(m.group(3))*0.0254;
+                /* NOTE: we assume -a'b" means -(a'+b") and not (-a')+b" - because of such issues SI units have been invented
+                   and have been adapted by the majority of the world */
+                return (Double.valueOf(m.group(2))*0.3048+Double.valueOf(m.group(4))*0.0254)*(m.group(1).isEmpty()?1.0:-1.0);
             }
         }

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -563 +563 @@
         assertEquals(1.5, Utils.unitToMeter("150cm"));
         assertEquals(1.6, Utils.unitToMeter("1600.0mm"));
+        assertEquals(1700, Utils.unitToMeter("1.7km"));
+        assertEquals(-1800, Utils.unitToMeter("-1.8km"));
         assertEquals(3.048, Utils.unitToMeter("10ft"));
         assertEquals(6.096, Utils.unitToMeter("20'"));
         assertEquals(2.54, Utils.unitToMeter("100in"));
         assertEquals(5.08, Utils.unitToMeter("200\""));
+        assertEquals(1852, Utils.unitToMeter("1nmi"));
+        assertEquals(1609.344, Utils.unitToMeter("1mi"));
         assertEquals(3.0734, Utils.unitToMeter("10ft1in"));
         assertEquals(6.1468, Utils.unitToMeter("20'2\""));
+        assertEquals(-6.1468, Utils.unitToMeter("-20'2\""));
         assertThrows(IllegalArgumentException.class, () -> Utils.unitToMeter("Hallo"));
     }