Unify selection ControllerStates so they can work on either background or editable...

[potlatch2.git] / net / systemeD / potlatch2 / EditController.as

diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as
index 492077c68676d9822c276adf37de08fcff6f1bf7..6afad6e065998ee386e8f868f29b8005dd0e9cb2 100644 (file)
--- a/net/systemeD/potlatch2/EditController.as
+++ b/net/systemeD/potlatch2/EditController.as
@@ -163,13 +163,15 @@ package net.systemeD.potlatch2 {
                /** Given what is currently selected (or not), find the matching ControllerState. */
                public function findStateForSelection(sel:Array):ControllerState {
                        if (sel.length==0) { return new NoSelection(); }
                /** Given what is currently selected (or not), find the matching ControllerState. */
                public function findStateForSelection(sel:Array):ControllerState {
                        if (sel.length==0) { return new NoSelection(); }

-                       else if (sel.length>1) { return new SelectedMultiple(sel); }
-                       else if (sel[0] is Way) { return new SelectedWay(sel[0]); }
+                       var layer:MapPaint=_map.getLayerForEntity(sel[0]);
+                       
+                       if (sel.length>1) { return new SelectedMultiple(sel, layer); }
+                       else if (sel[0] is Way) { return new SelectedWay(sel[0], layer); }

                        else if (sel[0] is Node && Node(sel[0]).hasParentWays) {
                                var way:Way=sel[0].parentWays[0] as Way;
                                return new SelectedWayNode(way, way.indexOfNode(sel[0] as Node));
                        } else {
                        else if (sel[0] is Node && Node(sel[0]).hasParentWays) {
                                var way:Way=sel[0].parentWays[0] as Way;
                                return new SelectedWayNode(way, way.indexOfNode(sel[0] as Node));
                        } else {

-                               return new SelectedPOINode(sel[0] as Node);
+                               return new SelectedPOINode(sel[0] as Node, layer);

                        }
                }
 
                        }
                }