Changeset 8251 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-04-23T19:06:39+02:00 (9 years ago)

Author:

simon04

Message:

see #10217 - MapCSS rotation: add grad and turn units

File:

• trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -43 +43 @@
         final Pattern radiansPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(rad)?");
         final Pattern degreesPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(deg|°)");
+        final Pattern gradianPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(grad)");
+        final Pattern turnPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(turn)");
         final double value;
         Matcher matcher;
@@ -49 +51 @@
         } else if ((matcher = degreesPattern.matcher(string)).matches()) {
             value = Math.toRadians(Double.parseDouble(matcher.group(1)));
+        } else if ((matcher = gradianPattern.matcher(string)).matches()) {
+            value = Double.parseDouble(matcher.group(1)) / 200 * Math.PI;
+        } else if ((matcher = turnPattern.matcher(string)).matches()) {
+            value = Double.parseDouble(matcher.group(1)) * 2 * Math.PI;
         } else {
             try {