Make quadralaterawhatsit work on selected waynodes, too. Add Q shortcut for both.

diff --git a/net/systemeD/potlatch2/Toolbox.mxml b/net/systemeD/potlatch2/Toolbox.mxml
index 6007b5f60380eabc0a31742eeda3c9de886fed54..7b26585285d98b6ec4b361106177080c97057431 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.mxml
+++ b/net/systemeD/potlatch2/Toolbox.mxml
@@ -120,7 +120,7 @@
                        switch (op) {
                                case 'delete':                          return true;
                                case 'reverseDirection':        return controller.state.hasSelectedWays();
-                               case 'quadrilateralise':        return controller.state.hasSelectedAreas();
+                               case 'quadrilateralise':        return (controller.state.hasSelectedAreas() || controller.state.hasSelectedWayNodesInAreas());
                                case 'straighten':                      return controller.state.hasSelectedUnclosedWays();
                                case 'circularise':                     return controller.state.hasSelectedAreas();
                                case 'split':                           return (controller.state is SelectedWayNode);
@@ -226,6 +226,11 @@
                        for each (var way:Way in controller.state.selectedWays) {
                                Quadrilateralise.quadrilateralise(way, undo.push);
                        }
+            for each (var node:Node in controller.state.selectedNodes) {
+                for each (var parentWay:Way in node.parentWays) {
+                  Quadrilateralise.quadrilateralise(parentWay, undo.push);
+                }
+            }
                        MainUndoStack.getGlobalStack().addAction(undo);
                }
 

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index 060aaec76db8239ad17cf320e28260e97a4829d2..4d4e15a6d886915e992eea83fe0d31f14b12963b 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -217,6 +217,14 @@ package net.systemeD.potlatch2.controller {
                        return selectedWays;
                }
 
+        public function get selectedNodes():Array {
+            var selectedNodes:Array=[];
+            for each (var item:Entity in _selection) {
+                if (item is Node) { selectedNodes.push(item); }
+            }
+            return selectedNodes;
+        }
+
                public function hasSelectedWays():Boolean {
                        for each (var item:Entity in _selection) {
                                if (item is Way) { return true; }
@@ -238,6 +246,19 @@ package net.systemeD.potlatch2.controller {
                        return false;
                }
 
+        /** Determine whether or not any nodes are selected, and if so whether any of them belong to areas. */
+        public function hasSelectedWayNodesInAreas():Boolean {
+            for each (var item:Entity in _selection) {
+                if (item is Node) {
+                    var parentWays:Array = Node(item).parentWays;
+                    for each (var way:Entity in parentWays) {
+                        if (Way(way).isArea()) { return true; }
+                    }
+                }
+            }
+            return false;
+        }
+
                public function hasAdjoiningWays():Boolean {
                        if (_selection.length<2) { return false; }
                        var endNodes:Object={};

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index 21588816369975b448a56f927dcf6c167749feae..2940fb1171690862c5bd21a8ead2aee12d727dc5 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -5,6 +5,7 @@ package net.systemeD.potlatch2.controller {
        import flash.geom.Point;
     import net.systemeD.potlatch2.EditController;
     import net.systemeD.potlatch2.tools.Parallelise;
+    import net.systemeD.potlatch2.tools.Quadrilateralise;
     import net.systemeD.potlatch2.tools.Simplify;
     import net.systemeD.halcyon.connection.*;
        import net.systemeD.halcyon.MapPaint;
@@ -77,6 +78,7 @@ package net.systemeD.potlatch2.controller {
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
                        switch (event.keyCode) {
                                case 80:  /* P */           return new SelectedParallelWay(firstSelected as Way); 
+                               case 81:  /* Q */           Quadrilateralise.quadrilateralise(firstSelected as Way, MainUndoStack.getGlobalStack().addAction); return this;
                                case 82:  /* R */           repeatTags(firstSelected); return this;
                 case 86:  /* V */           Way(firstSelected).reverseNodes(MainUndoStack.getGlobalStack().addAction); return this;
                 case 89:  /* Y */           Simplify.simplify(firstSelected as Way, controller.map, true); return this;         

diff --git a/net/systemeD/potlatch2/controller/SelectedWayNode.as b/net/systemeD/potlatch2/controller/SelectedWayNode.as
index e5226c454909a33b7b26004dd72d3f67c6fffc7b..a7a939e989212b616301bee98710237125d82f1b 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWayNode.as
+++ b/net/systemeD/potlatch2/controller/SelectedWayNode.as
@@ -3,6 +3,7 @@ package net.systemeD.potlatch2.controller {
        import flash.ui.Keyboard;
        import flash.geom.Point;
     import net.systemeD.potlatch2.EditController;
+    import net.systemeD.potlatch2.tools.Quadrilateralise;
     import net.systemeD.halcyon.WayUI;
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.connection.actions.*;
@@ -68,6 +69,7 @@ package net.systemeD.potlatch2.controller {
                        switch (event.keyCode) {
                                case 189:                                       return removeNode();                                    // '-'
                                case 88:                                        return splitWay();                                              // 'X'
+                case 81:  /* Q */           Quadrilateralise.quadrilateralise(parentWay, MainUndoStack.getGlobalStack().addAction); return this;
                                case 82:                                        repeatTags(firstSelected); return this; // 'R'
                                case 87:                                        return new SelectedWay(parentWay);              // 'W'
                                case 191:                                       return cycleWays();                                             // '/'