Changeset 30927 in osm for applications/editors/josm/plugins/tracer2

Timestamp:

2015-01-26T20:34:28+01:00 (10 years ago)

Author:

belecker

Message:

Fix Bug 10834: IllegalArgumentException when tracing buildings with Tracer2 plugin
To Delete a Node you need a DataSet. There for it is not possible to create a Node and Delete it afterwords.
https://josm.openstreetmap.de/ticket/10834

Location:

applications/editors/josm/plugins/tracer2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (modified) (1 diff)

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

@@ -3 +3 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Add link to wiki"/>
+    <property name="commit.message" value="Fix Bug #10834"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7001"/>

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java

@@ -153 +153 @@
         s_bAlt = alt;
         
+        boolean bAddWay = false;
+        
         calcDistance();
         getNodes(newWay);
@@ -161 +163 @@
         if (s_oWayOld == null) {
                 s_bAddNewWay = true;
-                cmds.add(new AddCommand(newWay));
+                //cmds.add(new AddCommand(newWay));
+                bAddWay = true;
                 s_oWayOld = newWay;
                 s_oWay = new Way( newWay );
@@ -195 +198 @@
                 cmds2.addAll(connectTo());
 
+                // add new Node
+                Node firstNode = null;
+                Way way = new Way(s_oWay);
+                for (Node node : s_oWay.getNodes()) {
+                        if ( node.getDataSet() != null )
+                        {
+                                way.removeNode(node);
+                        }
+                }
+                if ( way.getNodes().size() > 0 )
+            {
+                if (way.firstNode() != way.lastNode() )
+                {
+                        way.addNode(way.firstNode());
+                }
+                        for (Node node : way.getNodes())
+                        {
+                                if (firstNode == null || firstNode != node) {
+                                        cmds.add(new AddCommand(node));
+                                }
+                                if (firstNode == null) {
+                                        firstNode = node;
+                                }
+                        }
+            }
+                
+                // add new way
+                if ( bAddWay == true )
+                {
+                        cmds.add(new AddCommand(s_oWay));
+                }
+            
                 cmds.add(new ChangeCommand(s_oWayOld, trySplitWayByAnyNodes(s_oWay)));
         }
@@ -288 +323 @@
         newWay.removeNode(n1);
  //       cmds.add(new ChangeCommand(m_way, newWay));
+        
+        if (newWay.firstNode() != newWay.lastNode() )
+        {
+                newWay.addNode(newWay.firstNode());
+        }
         s_oWay = new Way(newWay);
         
-        cmds.add(new DeleteCommand(n1));
+        //cmds.add(new DeleteCommand(n1));
         return cmds;
     }

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java

@@ -320 +320 @@
                     firstNode = node;
                 }
-                commands.add(new AddCommand(node));
+                //commands.add(new AddCommand(node));
                 way.addNode(node);
             }