Changeset 15042 in josm

Timestamp:

2019-05-03T15:38:44+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17667 - allow arrows, several valid use cases in transport

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -422 +422 @@
     }
 
-    private static boolean containsUnusualUnicodeCharacter(String key, String value) {
+    static boolean containsUnusualUnicodeCharacter(String key, String value) {
         return value != null && value.chars().anyMatch(c -> isUnusualUnicodeBlock(key, UnicodeBlock.of(c)));
     }
@@ -446 +446 @@
         // CHECKSTYLE.OFF: BooleanExpressionComplexity
         return b == UnicodeBlock.COMBINING_MARKS_FOR_SYMBOLS            // U+20D0..U+20FF
-            || b == UnicodeBlock.ARROWS                                 // U+2190..U+21FF
             || b == UnicodeBlock.MATHEMATICAL_OPERATORS                 // U+2200..U+22FF
             || b == UnicodeBlock.ENCLOSED_ALPHANUMERICS                 // U+2460..U+24FF

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -250 +250 @@
     }
 
+    /**
+     * Checks for unwanted non printing control characters
+     * @param s String to test
+     * @param assertionC assertion on the result (true/false)
+     * @param expected expected fixed value
+     */
     private static void doTestUnwantedNonprintingControlCharacters(String s, Consumer<Boolean> assertionC, String expected) {
         assertionC.accept(TagChecker.containsUnwantedNonPrintingControlCharacter(s));
@@ -296 +302 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/17667">Bug #17667</a>.
+     */
+    @Test
+    public void testTicket17667() {
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("name", "Bus 118: Berlin, Rathaus Zehlendorf => Potsdam, Drewitz Stern-Center"));
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("name", "Καρδίτσα → Λάρισα"));
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("traffic_sign", "FI:871[← Lippuautomaatti]"));
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("traffic_sign", "FI:871[↑ Nostopaikka ↑]"));
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("name", "Cinderella II - Strandvägen ↔ Hagede"));
+        assertFalse(TagChecker.containsUnusualUnicodeCharacter("name", "Tallinn — Narva"));
+    }
 }