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

Timestamp:

2018-11-20T21:18:32+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16965 - ignore punctuation characters in tagging preset selector

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -127 +127 @@
         }
 
+        private static String simplifyString(String s) {
+            return Utils.deAccent(s).toLowerCase(Locale.ENGLISH).replaceAll("\\p{Punct}", "");
+        }
+
         private static int isMatching(Collection<String> values, String... searchString) {
             int sum = 0;
-            List<String> deaccentedValues = values.stream().map(
-                    s -> Utils.deAccent(s).toLowerCase(Locale.ENGLISH)).collect(Collectors.toList());
+            List<String> deaccentedValues = values.stream()
+                    .map(PresetClassification::simplifyString).collect(Collectors.toList());
             for (String word: searchString) {
                 boolean found = false;
                 boolean foundFirst = false;
-                String deaccentedWord = Utils.deAccent(word);
+                String deaccentedWord = simplifyString(word);
                 for (String value: deaccentedValues) {
                     int index = value.indexOf(deaccentedWord);