ImproveWayAccuracy, basically

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 990f43bbe946681b92ee50e37e46bcd95101cd0a..c1c3bef89b8e3cf758728b5a415f259a063be3f7 100644 (file)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -79,6 +79,7 @@ package net.systemeD.halcyon {
             recalculate();
                    redraw();
                        redrawMultis();
+                       updateHighlights();
                }
                    
                private function wayNodeRemoved(event:WayNodeEvent):void {
@@ -339,7 +340,6 @@ package net.systemeD.halcyon {
 
                        // Draw icons
                        var r:Number;
-                       var nodeSelected:int=stateClasses["nodeSelected"];
                        for (var i:uint = indexStart; i < indexEnd; i++) {
                 var node:Node = Way(entity).getNode(i);
                                var nodeStateClasses:Object={};

diff --git a/net/systemeD/potlatch2/controller/SelectedWay.as b/net/systemeD/potlatch2/controller/SelectedWay.as
index 5d23b7e5e03fb75d94e6ad8dddd40e59e2730138..1460ff06e3c02a78e88c8d3a05795c2e0ca9eec9 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedWay.as
+++ b/net/systemeD/potlatch2/controller/SelectedWay.as
@@ -49,15 +49,28 @@ package net.systemeD.potlatch2.controller {
                        var paint:MapPaint = getMapPaint(DisplayObject(event.target));
             var focus:Entity = getTopLevelFocusEntity(entity);
 
-            if ( event.type == MouseEvent.MOUSE_UP && entity is Node && event.shiftKey && !layer.isBackground ) {
+            if ( event.type == MouseEvent.MOUSE_DOWN && entity is Node && focus==firstSelected && event.shiftKey && !layer.isBackground ) {
                                // start new way
                                var way:Way = entity.connection.createWay({}, [entity], MainUndoStack.getGlobalStack().addAction);
                                return new DrawWay(way, true, false);
                        } else if ( event.type == MouseEvent.MOUSE_DOWN && entity is Way && focus==firstSelected && event.shiftKey && !layer.isBackground ) {
-                               // insert node within way (shift-click)
-                var d:DragWayNode=new DragWayNode(firstSelected as Way, -1, event, true);
+                               // shift-clicked way to insert node
+                               var d:DragWayNode=new DragWayNode(firstSelected as Way, -1, event, true);
                                d.forceDragStart();
                                return d;
+                       } else if ( event.type == MouseEvent.MOUSE_DOWN && entity is Node && focus!=firstSelected && event.shiftKey && !layer.isBackground ) {
+                               // shift-clicked POI node to insert it
+                               Way(firstSelected).insertNodeAtClosestPosition(Node(entity), false, MainUndoStack.getGlobalStack().addAction);
+                               return this;
+                       } else if ( event.type == MouseEvent.MOUSE_UP && !entity && event.shiftKey ) {
+                               // shift-clicked nearby to insert node
+                               var lat:Number = controller.map.coord2lat(event.localY);
+                               var lon:Number = controller.map.coord2lon(event.localX);
+                               var undo:CompositeUndoableAction = new CompositeUndoableAction("Insert node");
+                               var node:Node = firstSelected.connection.createNode({}, lat, lon, undo.push);
+                               Way(firstSelected).insertNodeAtClosestPosition(node, false, undo.push);
+                               MainUndoStack.getGlobalStack().addAction(undo);
+                               return this;
                        } else if ( event.type == MouseEvent.MOUSE_DOWN && event.ctrlKey && !event.altKey && entity && entity!=firstSelected) {
                                // multiple selection
                                return new SelectedMultiple([firstSelected,entity],layer);