Changeset 33677 in osm for applications/editors

Timestamp:

2017-09-26T19:41:00+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15363 - circle arc broken

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java

@@ -160 +160 @@
         Node[] anchorNodes = {n1, n2, n3};
         //// "Fuse" the arc with all target ways
-        fuseArc(anchorNodes, arcNodes, targetWays, cmds);
+        fuseArc(ds, anchorNodes, arcNodes, targetWays, cmds);
 
         return cmds;
     }
 
-    private static void fuseArc(Node[] anchorNodes, List<Node> arcNodes, Set<Way> targetWays, Collection<Command> cmds) {
+    private static void fuseArc(DataSet ds, Node[] anchorNodes, List<Node> arcNodes, Set<Way> targetWays, Collection<Command> cmds) {
 
         for (Way originalTw : targetWays) {
@@ -212 +212 @@
             }
             if (didChangeTw)
-                cmds.add(new ChangeCommand(originalTw, tw));
+                cmds.add(new ChangeCommand(ds, originalTw, tw));
         }
     }
@@ -242 +242 @@
         double sUnder = (x1 - x2) * (y3 - y1) - (y2 - y1) * (x1 - x3);
 
-        assert (sUnder == 0);
+        assert (sUnder != 0);
 
         s /= sUnder;