public class DrawWay extends SelectedWay {
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) {
+ 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);
- if ( event.type == MouseEvent.CLICK ) {
- if ( focus == null ) {
+ var focus:Entity = getTopLevelFocusEntity(entity);
+
+ if ( event.type == MouseEvent.MOUSE_UP ) {
+ if ( entity == null ) {
node = createAndAddNode(event);
resetElastic(node);
- } else if ( focus is Node ) {
- appendNode(focus as Node);
- } else if ( focus is Way ) {
+ lastClick=node;
+ } else if ( entity is 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(focus).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.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 });
+ controller.map.setHighlight(selectedWay, { showNodes: true });
+ // ** this call to setHighlight(selectedWay) is necessary in case the hovered way (blue nodes)
+ // shares any nodes with the selected way (red nodes): if they do, they'll be wiped out by the
+ // first call.
+ // Ultimately we should fix this by referring to 'way :selected nodes' instead of 'nodes :selectedway'.
+ // But this will do for now.
+ // We could do with an optional way of calling WayUI.redraw to only do the nodes, which would be a
+ // useful optimisation.
}
return this;
}
override public function processKeyboardEvent(event:KeyboardEvent):ControllerState {
- if ( event.keyCode == 13 || event.keyCode == 27 )
- 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 {
projects / potlatch2.git / blobdiff