Reverse Way direction

diff --git a/TODO.txt b/TODO.txt
index 99b2d7d03a80f11a935899e3bd97ec1f6fb9f0b9..3025e7c3b921d1112fca987a78353afa367c8e5d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -15,7 +15,6 @@ Potlatch 2: main outstanding issues
 == Core geometry ==
 
 * Undo/redo
 == Core geometry ==
 
 * Undo/redo

-* Reverse way direction

 * Deleting a way with junction nodes doesn't redraw them
 
 
 * Deleting a way with junction nodes doesn't redraw them
 
 

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index ab69170ceedf2aa86bc8b27c827690ec295035f5..d6887d813339abbee3dfa59f69d17a29d2a35f97 100755 (executable)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -34,6 +34,7 @@ package net.systemeD.halcyon {
             way.addEventListener(Connection.TAG_CHANGED, wayTagChanged);
             way.addEventListener(Connection.WAY_NODE_ADDED, wayNodeAdded);
             way.addEventListener(Connection.WAY_NODE_REMOVED, wayNodeRemoved);
             way.addEventListener(Connection.TAG_CHANGED, wayTagChanged);
             way.addEventListener(Connection.WAY_NODE_ADDED, wayNodeAdded);
             way.addEventListener(Connection.WAY_NODE_REMOVED, wayNodeRemoved);

+            way.addEventListener(Connection.WAY_REORDERED, wayReordered);

                        way.addEventListener(Connection.WAY_DELETED, wayDeleted);
                        way.addEventListener(Connection.ADDED_TO_RELATION, wayRelationAdded);
                        way.addEventListener(Connection.REMOVED_FROM_RELATION, wayRelationRemoved);
                        way.addEventListener(Connection.WAY_DELETED, wayDeleted);
                        way.addEventListener(Connection.ADDED_TO_RELATION, wayRelationAdded);
                        way.addEventListener(Connection.REMOVED_FROM_RELATION, wayRelationRemoved);


@@ -88,6 +89,10 @@ package net.systemeD.halcyon {
                private function wayDeleted(event:EntityEvent):void {
                        redraw();
                }
                private function wayDeleted(event:EntityEvent):void {
                        redraw();
                }

+        
+        private function wayReordered(event:EntityEvent):void {
+            redraw();
+        }

 
                private function init():void {
                        recalculate();
 
                private function init():void {
                        recalculate();

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 507900892bd604bad7ab258861a13f9723654c5c..1eb4971261564cd72675c86ff0616a7b03c3bbf1 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -67,6 +67,7 @@ package net.systemeD.halcyon.connection {
         public static var NODE_MOVED:String = "node_moved";
         public static var WAY_NODE_ADDED:String = "way_node_added";
         public static var WAY_NODE_REMOVED:String = "way_node_removed";
         public static var NODE_MOVED:String = "node_moved";
         public static var WAY_NODE_ADDED:String = "way_node_added";
         public static var WAY_NODE_REMOVED:String = "way_node_removed";

+        public static var WAY_REORDERED:String = "way_reordered";

                public static var NODE_DELETED:String = "node_deleted";
                public static var WAY_DELETED:String = "way_deleted";
                public static var RELATION_DELETED:String = "relation_deleted";
                public static var NODE_DELETED:String = "node_deleted";
                public static var WAY_DELETED:String = "way_deleted";
                public static var RELATION_DELETED:String = "relation_deleted";

diff --git a/net/systemeD/halcyon/connection/Way.as b/net/systemeD/halcyon/connection/Way.as
index b587702afd7d7f7585bbd992f27e27c79e322472..7ecfd7be6abacb91ecb55a1b3be3d119f80e622f 100644 (file)
--- a/net/systemeD/halcyon/connection/Way.as
+++ b/net/systemeD/halcyon/connection/Way.as
@@ -96,7 +96,9 @@ package net.systemeD.halcyon.connection {
                        }
                }
 
                        }
                }
 

-
+        public function reverseNodes(performAction:Function):void {
+            performAction(new ReverseNodesAction(this, nodes));
+        }

 
         /**
          * Finds the 1st way segment which intersects the projected
 
         /**
          * Finds the 1st way segment which intersects the projected

diff --git a/net/systemeD/halcyon/connection/actions/ReverseNodesAction.as b/net/systemeD/halcyon/connection/actions/ReverseNodesAction.as
new file mode 100644 (file)
index 0000000..5b9102b
--- /dev/null
+++ b/net/systemeD/halcyon/connection/actions/ReverseNodesAction.as
@@ -0,0 +1,28 @@
+package net.systemeD.halcyon.connection.actions {
+
+    import net.systemeD.halcyon.connection.*;
+    
+    public class ReverseNodesAction extends UndoableEntityAction {
+    
+        private var nodeList:Array;
+    
+        public function ReverseNodesAction(way:Way, nodeList:Array) {
+            super(way, "Reverse");
+            this.nodeList = nodeList;
+        }
+        
+        public override function doAction():uint {
+            nodeList.reverse();
+            markDirty();
+            entity.dispatchEvent(new EntityEvent(Connection.WAY_REORDERED, entity));
+            return SUCCESS;
+        }
+        
+        public override function undoAction():uint {
+            nodeList.reverse();
+            markClean();
+            entity.dispatchEvent(new EntityEvent(Connection.WAY_REORDERED, entity));
+            return SUCCESS;
+        }
+    }
+}
\ No newline at end of file

diff --git a/net/systemeD/potlatch2/Toolbox.as b/net/systemeD/potlatch2/Toolbox.as
index a1252de1e358739b852fdf2e3c9a5ab2a2002ffd..485c71694273fe4e8a886a1ff7dfb51fd38d658f 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.as
+++ b/net/systemeD/potlatch2/Toolbox.as
@@ -64,6 +64,12 @@ package net.systemeD.potlatch2 {
                                controller.setState(new NoSelection());
                        }
                }
                                controller.setState(new NoSelection());
                        }
                }

+        
+        public function doReverseDirection():void {
+            if (entity is Way) { 
+                Way(entity).reverseNodes(MainUndoStack.getGlobalStack().addAction);
+            }
+        }

 
                public function doQuadrilateralise():void {
                        if (entity is Way) {
 
                public function doQuadrilateralise():void {
                        if (entity is Way) {

diff --git a/potlatch2.mxml b/potlatch2.mxml
index d5dfc98e619b947352e02cc0756d6951630eb6de..78995cdec5f5c29e6045efc904472e79f5f2b14f 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -66,6 +66,7 @@
                                click='toolbox.doDelete();' 
                                width="28" height="28" textAlign="left" paddingLeft="6" paddingRight="0" />
                <mx:Button icon="@Embed('embedded/direction.svg')" 
                                click='toolbox.doDelete();' 
                                width="28" height="28" textAlign="left" paddingLeft="6" paddingRight="0" />
                <mx:Button icon="@Embed('embedded/direction.svg')" 

+                click='toolbox.doReverseDirection();'

                                width="28" height="28" textAlign="left" paddingLeft="8" paddingRight="0" />
                <mx:Button icon="@Embed('embedded/straighten.svg')" 
                                click='toolbox.doStraighten();' 
                                width="28" height="28" textAlign="left" paddingLeft="8" paddingRight="0" />
                <mx:Button icon="@Embed('embedded/straighten.svg')" 
                                click='toolbox.doStraighten();'