Changeset 7247 in josm for trunk/src/org

Timestamp:

2014-06-14T08:31:19+02:00 (10 years ago)

Author:

akks

Message:

see #7991: patch by AlfonZ - minor fix to segment collapsion in extrude mode

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -22 +22 @@
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -56 +55 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -180 +178 @@
     private ReferenceSegment dualAlignSegment1, dualAlignSegment2;
     /** {@code true}, if new segment was collapsed */
-    private boolean dualAlignSegmentCollapsed;
+    private boolean dualAlignSegmentCollapsed = false;
     // Dual alignment UI stuff
     private final DualAlignChangeAction dualAlignChangeAction;
@@ -548 +546 @@
             moveCommand = null;
             mode = Mode.select;
+            dualAlignSegmentCollapsed = false;
             updateStatusLine();
             Main.map.mapView.repaint();
@@ -590 +589 @@
         wnew.addNode(selectedSegment.getSecondNode());
         wnew.addNode(third);
-        if (newN1en.distance(newN2en)>1e-6) {
-            wnew.addNode(fourth); // rectangle can degrade to triangle for dual alignment
+        if (!dualAlignSegmentCollapsed) {
+            // rectangle can degrade to triangle for dual alignment after collapsing
+            wnew.addNode(fourth);
         }
         // ... and close the way
@@ -597 +597 @@
         // undo support
         cmds.add(new AddCommand(third));
-        cmds.add(new AddCommand(fourth));
+        if (!dualAlignSegmentCollapsed) {
+            cmds.add(new AddCommand(fourth));
+        }
         cmds.add(new AddCommand(wnew));
         Command c = new SequenceCommand(tr("Extrude Way"), cmds);