cursor-key panning, and fix "infinite drag" bug

diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index e248dde829d3e6e6459d34bf08d4fd7de0cc739e..8d4f1bfa52f59527af794fb6dabd9864f9266e5c 100755 (executable)
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -180,6 +180,12 @@ package net.systemeD.halcyon {
                        this.dispatchEvent(new MapEvent(MapEvent.NUDGE_BACKGROUND, { x: x, y: y }));
                }
 
+               private function moveMap(dx:Number,dy:Number):void {
+                       updateCoords(x+dx,y+dy);
+                       updateEntityUIs(false, false);
+                       download();
+               }
+
                // Co-ordinate conversion functions
 
                public function latp2coord(a:Number):Number     { return -(a-basey)*scalefactor; }
@@ -397,11 +403,7 @@ package net.systemeD.halcyon {
                }
         
                public function mouseUpHandler(event:MouseEvent=null):void {
-                       if (dragstate==DRAGGING) {
-                               updateCoords(x,y);
-                               updateEntityUIs(false, false);
-                               download();
-                       }
+                       if (dragstate==DRAGGING) { moveMap(0,0); }
                        dragstate=NOT_DRAGGING;
                }
         
@@ -436,9 +438,15 @@ package net.systemeD.halcyon {
                
                public function keyUpHandler(event:KeyboardEvent):void {
                        addDebug("pressed "+event.keyCode);
-                       if (event.keyCode==33) { zoomIn(); }                    // Page Up - zoom in
-                       if (event.keyCode==34) { zoomOut(); }                   // Page Down - zoom out
-//                     if (event.keyCode==76) { reportPosition(); }    // L - report lat/long
+                       switch (event.keyCode) {
+                               case 33:        zoomIn(); break;                                        // Page Up - zoom in
+                               case 34:        zoomOut(); break;                                       // Page Down - zoom out
+                               case 37:        moveMap(mapwidth/2,0); break;           // left cursor
+                               case 38:        moveMap(0,mapheight/2); break;          // up cursor
+                               case 39:        moveMap(-mapwidth/2,0); break;          // right cursor
+                               case 40:        moveMap(0,-mapheight/2); break;         // down cursor
+//                             case 76:        reportPosition(); break;                        // L - report lat/long
+                       }
                }
 
                public function connectionError(err:Object=null): void {

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index c05602656183675ac5cc7f638ca035b4c10d1e79..f37f434bccdef0fb7b2e1620a702bcef5446116c 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -94,6 +94,8 @@ package net.systemeD.potlatch2.controller {
                                }
                        } else if ( event.type == MouseEvent.MOUSE_UP && focus == null && map.dragstate!=map.DRAGGING) {
                                return (this is NoSelection) ? null : new NoSelection();
+                       } else if ( event.type == MouseEvent.MOUSE_UP && focus && map.dragstate==map.DRAGGING) {
+                               map.mouseUpHandler();   // in case the end-drag is over an EntityUI
                        } else if ( event.type == MouseEvent.ROLL_OVER ) {
                                controller.map.setHighlight(focus, { hover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT ) {