Changeset 14525 in josm for trunk/src/org

Timestamp:

2018-12-08T22:01:44+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #17088 - False positive in test "Missing name:* translation"

File:

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

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.HashSet;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -34 +37 @@
     protected static final int NAME_TRANSLATION_MISSING = 1502;
     private static final Pattern NAME_SPLIT_PATTERN = Pattern.compile(" - ");
+
+    private static final List<String> EXCLUSIONS = Arrays.asList(
+            "name:botanical",
+            "name:etymology:wikidata",
+            "name:full",
+            "name:genitive",
+            "name:left",
+            "name:prefix",
+            "name:right",
+            "name:source"
+            );
 
     /**
@@ -64 +78 @@
     @Override
     public void check(OsmPrimitive p) {
-        Set<String> names = new HashSet<>();
-
-        p.getKeys().forEach((key, n) -> {
-            if (n != null && key.startsWith("name:") && !"name:etymology:wikidata".equals(key)) {
-                names.add(n);
-            }
-        });
+        Set<String> names = p.getKeys().entrySet().stream()
+                .filter(e -> e.getValue() != null && e.getKey().startsWith("name:") && !EXCLUSIONS.contains(e.getKey()))
+                .map(Entry::getValue)
+                .collect(Collectors.toSet());
 
         if (names.isEmpty()) return;