Changeset 22004 in osm for applications

Timestamp:

2010-06-25T10:38:59+02:00 (14 years ago)

Author:

stoecker

Message:

add autozoom, fix untagged node issue

Location:

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

Files:

• ValidatorDialog.java (modified) (2 diffs)
• tests/UntaggedNode.java (modified) (2 diffs)
• tests/UntaggedWay.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -34 +34 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -386 +387 @@
             if (isDblClick) {
                 Main.main.getCurrentDataSet().setSelected(sel);
+                if(Main.pref.getBoolean("validator.autozoom", false))
+                    AutoScaleAction.zoomTo(sel);
             }
         }

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

@@ -26 +26 @@
 {
     protected static int UNTAGGED_NODE = 201;
+    protected static int COMMENT_NODE = 202;
 
     /** Bag of all nodes */
@@ -68 +69 @@
         for(Node node : emptyNodes)
         {
-            errors.add( new TestError(this, Severity.OTHER, tr("Untagged and unconnected nodes"), UNTAGGED_NODE, node) );
+            if(node.hasKeys())
+                errors.add( new TestError(this, Severity.OTHER, tr("Untagged and unconnected nodes (commented)"), COMMENT_NODE, node) );
+            else
+                errors.add( new TestError(this, Severity.OTHER, tr("Untagged and unconnected nodes"), UNTAGGED_NODE, node) );
         }
         emptyNodes = null;

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

@@ -37 +37 @@
     /** Unnamed junction error */
     protected static final int UNNAMED_JUNCTION  = 305;
+    /** Untagged, but commented way error */
+    protected static final int COMMENTED_WAY = 306;
 
     private LinkedList<Way> multipolygonways;
@@ -99 +101 @@
         if(!w.isTagged() && !multipolygonways.contains(w))
         {
-            errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );
+            if(w.hasKeys())
+                errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways (commented)"), COMMENTED_WAY, w) );
+            else
+                errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );
         }