Changeset 11069 in josm for trunk/src

Timestamp:

2016-10-01T22:08:48+02:00 (8 years ago)

Author:

simon04

Message:

fix #10260 - Do not switch (absolute) cardinal directions / degrees

File:

• trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -80 +79 @@
             };
         }
-
-        static IStringSwitcher compassCardinal() {
-            final List<String> cardinal = Arrays.asList(
-                    "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE",
-                    "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW");
-            return key -> {
-                final int index = cardinal.indexOf(key);
-                if (index >= 0) {
-                    return cardinal.get((index + cardinal.size() / 2) % cardinal.size());
-                }
-                return key;
-            };
-        }
-
-        static IStringSwitcher compassDegrees() {
-            return key -> {
-                if (!key.matches("\\d+")) {
-                    return key;
-                }
-                final int i = Integer.parseInt(key);
-                if (i < 0 || i > 360) {
-                    return key;
-                }
-                return Integer.toString((i + 180) % 360);
-            };
-        }
-
-        static IStringSwitcher compass() {
-            return combined(
-                    IStringSwitcher.compassCardinal(),
-                    IStringSwitcher.compassDegrees()
-            );
-        }
     }
 
@@ -188 +154 @@
             } else if (key.startsWith("direction") || key.endsWith("direction")) {
                 newValue = COMBINED_SWITCHERS.apply(value);
-                if (newValue.equals(value)) {
-                    newValue = IStringSwitcher.compass().apply(value);
-                }
             } else if (key.endsWith(":forward") || key.endsWith(":backward")) {
                 // Change key but not left/right value (fix #8518)