Changeset 14948 in josm for trunk/src/org

Timestamp:

2019-04-01T15:49:19+02:00 (6 years ago)

Author:

Don-vip

Message:

see #17546 - detect uses of "IPA Extensions" Unicode block (U+0250..U+02AF => International Phonetic Alphabet)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (5 diffs)

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

@@ -9 +9 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.lang.Character.UnicodeBlock;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -165 +166 @@
     protected static final int MULTIPLE_SPACES          = 1214;
     protected static final int MISSPELLED_VALUE_NO_FIX  = 1215;
+    protected static final int UNUSUAL_UNICODE_CHAR_VALUE = 1216;
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -381 +383 @@
      */
     private static boolean containsNonPrintingControlCharacter(String s) {
-        if (s == null)
-            return false;
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            if ((isAsciiControlChar(c) && !isNewLineChar(c)) || isBidiControlChar(c))
-                return true;
-        }
-        return false;
-    }
-
-    private static boolean isAsciiControlChar(char c) {
+        return s != null && s.chars().anyMatch(c -> (isAsciiControlChar(c) && !isNewLineChar(c)) || isBidiControlChar(c));
+    }
+
+    private static boolean isAsciiControlChar(int c) {
         return c < 0x20 || c == 0x7F;
     }
 
-    private static boolean isNewLineChar(char c) {
+    private static boolean isNewLineChar(int c) {
         return c == 0x0a || c == 0x0d;
     }
 
-    private static boolean isBidiControlChar(char c) {
+    private static boolean isBidiControlChar(int c) {
         /* check for range 0x200c to 0x200f (ZWNJ, ZWJ, LRM, RLM) or
                            0x202a to 0x202e (LRE, RLE, PDF, LRO, RLO) */
@@ -407 +402 @@
     static String removeNonPrintingControlCharacters(String s) {
         return NON_PRINTING_CONTROL_CHARACTERS.matcher(s).replaceAll("");
+    }
+
+    private static boolean containsUnusualUnicodeCharacter(String s) {
+        return s != null && s.chars().anyMatch(c -> isUnusualUnicodeBlock(UnicodeBlock.of(c)));
+    }
+
+    private static boolean isUnusualUnicodeBlock(UnicodeBlock b) {
+        return b == UnicodeBlock.IPA_EXTENSIONS;
     }
 
@@ -545 +548 @@
                     .build());
             withErrors.put(p, "ICV");
+        }
+        if ((containsUnusualUnicodeCharacter(value)) && !withErrors.contains(p, "UUCV")) {
+            errors.add(TestError.builder(this, Severity.WARNING, UNUSUAL_UNICODE_CHAR_VALUE)
+                    .message(tr("Tag value contains unusual Unicode character"), s, key)
+                    .primitives(p)
+                    .build());
+            withErrors.put(p, "UUCV");
         }
         if ((value.length() > Tagged.MAX_TAG_LENGTH) && !withErrors.contains(p, "LV")) {