Changeset 13836 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2018-05-26T00:47:08+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #13889 - Make preset searchs ignore accents

File:

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

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

@@ -7 +7 @@
 
 import java.awt.geom.Point2D;
-import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25 +24 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -35 +35 @@
 
     protected static final int SIMILAR_NAMED = 701;
-
-    private static final Pattern REMOVE_DIACRITICS = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
 
     /** All ways, grouped by cells */
@@ -207 +205 @@
         // check if only the case differs, so we don't consider large distance as different strings
         if (distance > 2 && name.length() == name2.length()) {
-            similar = deAccent(name).equalsIgnoreCase(deAccent(name2));
+            similar = Utils.deAccent(name).equalsIgnoreCase(Utils.deAccent(name2));
         }
 
@@ -225 +223 @@
 
     /**
-     * Removes diacritics (accents) from string.
-     * @param str string
-     * @return {@code str} without any diacritic (accent)
-     * @since 12283
-     */
-    public static String deAccent(String str) {
-        // https://stackoverflow.com/a/1215117/2257172
-        return REMOVE_DIACRITICS.matcher(Normalizer.normalize(str, Normalizer.Form.NFD)).replaceAll("");
-    }
-
-    /**
      * A normalization that is applied to names before testing them
      */