slight refactoring of controller states
[potlatch2.git] / net / systemeD / potlatch2 / controller / DrawWay.as
index 0e6ff89719ceee9f0d513e2d60e43f6534a2d7c6..5517952892add180c2b9ad4ed5314556a88c19ca 100644 (file)
@@ -10,38 +10,66 @@ package net.systemeD.potlatch2.controller {
                private var elastic:Elastic;
                private var editEnd:Boolean;
                private var leaveNodeSelected:Boolean;
+               private var lastClick:Entity=null;
+               private var lastClickTime:Date;
                
                public function DrawWay(way:Way, editEnd:Boolean, leaveNodeSelected:Boolean) {
                        super(way);
                        this.editEnd = editEnd;
                        this.leaveNodeSelected = leaveNodeSelected;
+                       if (way.length==1 && way.getNode(0).parentWays.length==1) {
+                               // drawing new way, so keep track of click in case creating a POI
+                               lastClick=way.getNode(0);
+                               lastClickTime=new Date();
+                       }
                }
                
                override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        var mouse:Point;
                        var node:Node;
-                       var focus:Entity = NoSelection.getTopLevelFocusEntity(entity);
+                       var focus:Entity = getTopLevelFocusEntity(entity);
 
                        if ( event.type == MouseEvent.MOUSE_UP ) {
                                if ( entity == null ) {
                                        node = createAndAddNode(event);
                                        resetElastic(node);
+                                       lastClick=node;
                                } else if ( entity is Node ) {
-                                       appendNode(entity as Node);
-                                       controller.map.setHighlight(focus, { showNodesHover: false });
-                                       controller.map.setHighlight(selectedWay, { showNodes: true });
-                                       resetElastic(entity as Node);
+                                       if (entity==lastClick && (new Date().getTime()-lastClickTime.getTime())<1000) {
+                                               if (selectedWay.length==1 && selectedWay.getNode(0).parentWays.length==1) {
+                                                       // double-click to create new POI
+                                                       node=selectedWay.getNode(0);
+                                                       stopDrawing();
+                                                       controller.connection.registerPOI(node);
+                                                       return new SelectedPOINode(node);
+                                               } else {
+                                                       // double-click at end of way
+                                                       return stopDrawing();
+                                               }
+                                       } else {
+                                               appendNode(entity as Node, MainUndoStack.getGlobalStack().addAction);
+                                               controller.map.setHighlight(focus, { showNodesHover: false });
+                                               controller.map.setHighlight(selectedWay, { showNodes: true });
+                                               resetElastic(entity as Node);
+                                               lastClick=entity;
+                                               if (selectedWay.getNode(0)==selectedWay.getNode(selectedWay.length-1)) {
+                                                       return new SelectedWay(selectedWay);
+                                               }
+                                       }
                                } else if ( entity is Way ) {
                                        node = createAndAddNode(event);
-                                       Way(entity).insertNodeAtClosestPosition(node, true);
+                                       Way(entity).insertNodeAtClosestPosition(node, true,
+                                           MainUndoStack.getGlobalStack().addAction);
                                        resetElastic(node);
+                                       lastClick=node;
                                }
+                               lastClickTime=new Date();
                        } else if ( event.type == MouseEvent.MOUSE_MOVE ) {
                                mouse = new Point(
                                                  controller.map.coord2lon(event.localX),
                                                  controller.map.coord2latp(event.localY));
                                elastic.end = mouse;
-                       } else if ( event.type == MouseEvent.MOUSE_OVER && focus!=selectedWay) {
+                       } else if ( event.type == MouseEvent.ROLL_OVER && focus!=selectedWay) {
                                controller.map.setHighlight(focus, { showNodesHover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT  && focus!=selectedWay) {
                                controller.map.setHighlight(focus, { showNodesHover: false });
@@ -65,28 +93,41 @@ package net.systemeD.potlatch2.controller {
                }
 
                override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
-                       if ( event.keyCode == 13 || event.keyCode == 27 ) {
-                               if ( leaveNodeSelected ) 
-                                   return new SelectedWayNode(selectedWay, selectedWay.getNode(editEnd ? selectedWay.length - 1 : 0));
-                               else
-                                   return new SelectedWay(selectedWay);
+                       if ( event.keyCode == 13 || event.keyCode == 27 ) { return stopDrawing(); }
+                       return this;
+               }
+               
+               protected function stopDrawing():ControllerState {
+                       if ( selectedWay.length<2) {
+                               controller.map.setHighlight(selectedWay, { showNodes: false });
+                               selectedWay.remove(MainUndoStack.getGlobalStack().addAction);
+                               // delete controller.map.ways[selectedWay.id];
+                               return new NoSelection();
+                       } else if ( leaveNodeSelected ) {
+                           return new SelectedWayNode(selectedWay, selectedWay.getNode(editEnd ? selectedWay.length - 1 : 0));
+                       } else {
+                           return new SelectedWay(selectedWay);
                        }
                        return this;
                }
 
                public function createAndAddNode(event:MouseEvent):Node {
+                   var undo:CompositeUndoableAction = new CompositeUndoableAction("Add node");
+                   
                        var lat:Number = controller.map.coord2lat(event.localY);
                        var lon:Number = controller.map.coord2lon(event.localX);
-                       var node:Node = controller.connection.createNode({}, lat, lon);
-                       appendNode(node);
+                       var node:Node = controller.connection.createNode({}, lat, lon, undo.push);
+                       appendNode(node, undo.push);
+                       
+                       MainUndoStack.getGlobalStack().addAction(undo);
                        return node;
                }
                
-               protected function appendNode(node:Node):void {
+               protected function appendNode(node:Node, performAction:Function):void {
                        if ( editEnd )
-                               selectedWay.appendNode(node);
+                               selectedWay.appendNode(node, performAction);
                        else
-                               selectedWay.insertNode(0, node);
+                               selectedWay.insertNode(0, node, performAction);
                }
                
                override public function enterState():void {