Make Markers selectable again.

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 4b2dbe410fe9f7f56bf2d6d22576a37ee8f2f072..3e762ff5e854182083c5640ea0c032f94c83d9d4 100644 (file)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -293,7 +293,6 @@ package net.systemeD.halcyon.connection {
             }
             var marker:Marker = markers[id];
             if (marker == null) {
             }
             var marker:Marker = markers[id];
             if (marker == null) {

-              trace("new marker");

               marker = new Marker(this, id, 0, tags, true, lat, lon);
               markers[id]=marker;
               sendEvent(new EntityEvent(NEW_MARKER, marker),false);
               marker = new Marker(this, id, 0, tags, true, lat, lon);
               markers[id]=marker;
               sendEvent(new EntityEvent(NEW_MARKER, marker),false);

diff --git a/net/systemeD/potlatch2/controller/SelectedMarker.as b/net/systemeD/potlatch2/controller/SelectedMarker.as
index 2af2441fdbac663b99640497dcb46bac2bd589ba..f1c9129cd775b063d301ed47a6d5f5942b23cdec 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedMarker.as
+++ b/net/systemeD/potlatch2/controller/SelectedMarker.as
@@ -34,7 +34,7 @@ package net.systemeD.potlatch2.controller {
 
         override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        if (event.type==MouseEvent.MOUSE_MOVE) { return this; }
 
         override public function processMouseEvent(event:MouseEvent, entity:Entity):ControllerState {
                        if (event.type==MouseEvent.MOUSE_MOVE) { return this; }

-            if (event.type==MouseEvent.MOUSE_UP) { return this; }
+            if ( (event.type==MouseEvent.MOUSE_UP || event.type==MouseEvent.CLICK) && entity==initMarker ) { return this; }

                        var cs:ControllerState = sharedMouseEvents(event, entity);
                        return cs ? cs : this;
         }
                        var cs:ControllerState = sharedMouseEvents(event, entity);
                        return cs ? cs : this;
         }