Changeset 17592 in osm

Timestamp:

2009-09-12T15:19:19+02:00 (15 years ago)

Author:

guggis

Message:

see #3347: patches by singularita@…: Merging nodes, fixing duplicate nodes, unglueing ways and splitting ways is very slow with large datasets

Location:

applications/editors/josm/plugins/validator

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (1 diff)

applications/editors/josm/plugins/validator/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="2095"/>
+                <attribute name="Plugin-Mainversion" value="2098"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -491 +491 @@
                                                         new Runnable() {
                                                                 public void run() {
-                                                                        Main.main.undoRedo.add(fixCommand);
+                                                                        Main.main.undoRedo.addNoRedraw(fixCommand);
                                                                 }
                                                         }
@@ -502 +502 @@
                                 SwingUtilities.invokeAndWait(new Runnable() {
                                         public void run() {
+                                                Main.main.undoRedo.afterAdd();
                                                 Main.map.repaint();
                                                 tree.resetErrors();

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

@@ -109 +109 @@
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
         LinkedList<Node> nodes = new LinkedList<Node>(OsmPrimitive.getFilteredList(sel, Node.class));
-        MergeNodesAction mergeAction  = new MergeNodesAction();
-        Node target = mergeAction.selectTargetNode(nodes);
+        Node target = MergeNodesAction.selectTargetNode(nodes);
         if(checkAndConfirmOutlyingDeletes(nodes))
-            return mergeAction.mergeNodes(Main.main.getEditLayer(),getBackreferenceDataSet(), nodes, target);
+            return MergeNodesAction.mergeNodes(Main.main.getEditLayer(),getBackreferenceDataSet(), nodes, target);
 
         return null;// undoRedo handling done in mergeNodes