Changeset 16154 in josm

Timestamp:

2020-03-16T22:10:18+01:00 (5 years ago)

Author:

Don-vip

Message:

see #17533 - see #18455 - partial revert of r15640, causing untagged nodes to be skipped entirely

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (1 diff)
• tests/ConditionalKeys.java (modified) (1 diff)
• tests/OpeningHourTest.java (modified) (1 diff)
• tests/TagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -116 +116 @@
         public TagTest(String name) {
             super(name);
-        }
-
-        @Override
-        public boolean isPrimitiveUsable(OsmPrimitive p) {
-            return super.isPrimitiveUsable(p) && p.isTagged();
         }
 

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

@@ -247 +247 @@
     @Override
     public void check(OsmPrimitive p) {
-        errors.addAll(validatePrimitive(p));
+        if (p.isTagged()) {
+            errors.addAll(validatePrimitive(p));
+        }
     }
 }

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

@@ -109 +109 @@
     @Override
     public void check(final OsmPrimitive p) {
-        for (String key : KEYS_TO_CHECK) {
-            errors.addAll(checkOpeningHourSyntax(key, p.get(key), p, Locale.getDefault()));
+        if (p.isTagged()) {
+            for (String key : KEYS_TO_CHECK) {
+                errors.addAll(checkOpeningHourSyntax(key, p.get(key), p, Locale.getDefault()));
+            }
         }
     }

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

@@ -616 +616 @@
     @Override
     public void check(OsmPrimitive p) {
+        if (!p.isTagged())
+            return;
+
         // Just a collection to know if a primitive has been already marked with error
         MultiMap<OsmPrimitive, String> withErrors = new MultiMap<>();