Changeset 9891 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2008-08-16T00:59:39+02:00 (16 years ago)

Author:

stoecker

Message:

use tagged of OsmPrimitive

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• tests/UntaggedNode.java (modified) (2 diffs)
• tests/UntaggedWay.java (modified) (2 diffs)
• util/Util.java (modified) (1 diff)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.validator.Severity;
 import org.openstreetmap.josm.plugins.validator.Test;
-import org.openstreetmap.josm.plugins.validator.util.Util;
 import org.openstreetmap.josm.plugins.validator.TestError;
 
@@ -70 +69 @@
         public void visit(Node n)
         {
-                if(!n.incomplete && !n.deleted && Util.countDataTags(n) == 0)
+                if(!n.incomplete && !n.deleted && !n.tagged)
                         emptyNodes.add(n);
         }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.validator.Test;
 import org.openstreetmap.josm.plugins.validator.TestError;
-import org.openstreetmap.josm.plugins.validator.util.Util;
 
 /**
@@ -80 +79 @@
                 }
 
-                if(Util.countDataTags(w) == 0)
+                if(!w.tagged)
                 {
                         errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java

@@ -28 +28 @@
 public class Util
 {
-        /** Tags without informational contents */
-        private static final String[] noDataTags = new String[] { "created_by", "converted_by", "source" };
-        public static int countDataTags(OsmPrimitive osm)
-        {
-                int numTags = 0;
-                Map<String, String> tags = osm.keys;
-                if(tags != null)
-                {
-                        numTags = tags.size();
-                        for(String tag : noDataTags)
-                                if(tags.containsKey(tag))
-                                        --numTags;
-                }
-                return numTags;
-        }
-
         /**
          * Returns the plugin's directory of the plugin