Changeset 15667 in josm

Timestamp:

2020-01-09T23:42:30+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18455 - smarter error detection, should lead to less false positives

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroup.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (1 diff)

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

@@ -23 +23 @@
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.swing.JCheckBox;
@@ -35 +36 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
@@ -615 +617 @@
 
         if (checkPresetsTypes) {
-            for (TaggingPreset tp : TaggingPresets.getMatchingPresets(null, p.getKeys(), false)) {
-                TaggingPresetType presetType = TaggingPresetType.forPrimitive(p);
-                if (!tp.typeMatches(EnumSet.of(presetType))) {
+            TagMap tags = p.getKeys();
+            TaggingPresetType presetType = TaggingPresetType.forPrimitive(p);
+            EnumSet<TaggingPresetType> presetTypes = EnumSet.of(presetType);
+            Collection<TaggingPreset> matchingPresets = TaggingPresets.getMatchingPresets(null, tags, false);
+            Collection<TaggingPreset> matchingPresetsOK = matchingPresets.stream().filter(
+                    tp -> tp.typeMatches(presetTypes)).collect(Collectors.toList());
+            Collection<TaggingPreset> matchingPresetsKO = matchingPresets.stream().filter(
+                    tp -> !tp.typeMatches(presetTypes)).collect(Collectors.toList());
+
+            for (TaggingPreset tp : matchingPresetsKO) {
+                // Potential error, unless matching tags are all known by a supported preset
+                Map<String, String> matchingTags = tp.data.stream()
+                    .filter(i -> Boolean.TRUE.equals(i.matches(tags)))
+                    .filter(i -> i instanceof KeyedItem).map(i -> ((KeyedItem) i).key)
+                    .collect(Collectors.toMap(k -> k, tags::get));
+                if (matchingPresetsOK.stream().noneMatch(
+                        tp2 -> matchingTags.entrySet().stream().allMatch(
+                                e -> tp2.data.stream().anyMatch(
+                                        i -> i instanceof KeyedItem && ((KeyedItem) i).key.equals(e.getKey()))))) {
                     errors.add(TestError.builder(this, Severity.OTHER, INVALID_PRESETS_TYPE)
                             .message(tr("Object type not in preset"),

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

@@ -76 +76 @@
      * @return {@code true} if matches (positive), {@code null} if neutral, {@code false} if mismatches (negative).
      */
-    protected Boolean matches(Map<String, String> tags) {
+    public Boolean matches(Map<String, String> tags) {
         return null;
     }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroup.java

@@ -53 +53 @@
 
     @Override
-    protected Boolean matches(Map<String, String> tags) {
+    public Boolean matches(Map<String, String> tags) {
         for (Check check : checks) {
             if (Boolean.TRUE.equals(check.matches(tags))) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

@@ -191 +191 @@
 
     @Override
-    protected Boolean matches(Map<String, String> tags) {
+    public Boolean matches(Map<String, String> tags) {
         switch (MatchType.ofString(match)) {
         case NONE:

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

@@ -336 +336 @@
         assertFalse(TagChecker.containsUnusualUnicodeCharacter("name", "Hökumət Evi"));
     }
+
+    /**
+     * Detects objects with types not supported by their presets.
+     * @throws IOException in case of I/O error
+     */
+    @Test
+    public void testObjectTypeNotSupportedByPreset() throws IOException {
+        List<TestError> errors = test(OsmUtils.createPrimitive("relation waterway=river"));
+        assertEquals(1, errors.size());
+        assertEquals(TagChecker.INVALID_PRESETS_TYPE, errors.get(0).getCode());
+        errors = test(OsmUtils.createPrimitive("relation type=waterway waterway=river"));
+        assertTrue(errors.toString(), errors.isEmpty());
+    }
 }