+/- tooltips with current zoom level

diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index ab36a734c2f952af299e6b1f0d2efeb617ea5b26..6e83556ff63feeafca2262680d415db84f041e3f 100755 (executable)
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -133,7 +133,10 @@ package net.systemeD.halcyon {
                                paint.ruleset=new RuleSet(MINSCALE,MAXSCALE,redraw,redrawPOIs);
                                paint.ruleset.loadFromCSS(styleurl);
                        }
                                paint.ruleset=new RuleSet(MINSCALE,MAXSCALE,redraw,redrawPOIs);
                                paint.ruleset.loadFromCSS(styleurl);
                        }

-                       if (startscale>0) { scale=startscale; }
+                       if (startscale>0) {
+                               scale=startscale;
+                               this.dispatchEvent(new MapEvent(MapEvent.SCALE, {scale:scale}));
+                       }

 
                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
                        baselon    =startlon          -(mapwidth /2)/scalefactor;
 
                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
                        baselon    =startlon          -(mapwidth /2)/scalefactor;


@@ -332,6 +335,7 @@ package net.systemeD.halcyon {
                private function changeScale(newscale:uint):void {
                        addDebug("new scale "+newscale);
                        scale=newscale;
                private function changeScale(newscale:uint):void {
                        addDebug("new scale "+newscale);
                        scale=newscale;

+                       this.dispatchEvent(new MapEvent(MapEvent.SCALE, {scale:scale}));

                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
                        updateCoordsFromLatLon((edge_t+edge_b)/2,(edge_l+edge_r)/2);    // recentre
                        tileset.changeScale(scale);
                        scalefactor=MASTERSCALE/Math.pow(2,13-scale);
                        updateCoordsFromLatLon((edge_t+edge_b)/2,(edge_l+edge_r)/2);    // recentre
                        tileset.changeScale(scale);

diff --git a/net/systemeD/halcyon/MapEvent.as b/net/systemeD/halcyon/MapEvent.as
index b0f090fbe22b4172e6ff8b0b197cc47238e0b70c..cb125f5355eedca32914af0c932001422ea9586b 100644 (file)
--- a/net/systemeD/halcyon/MapEvent.as
+++ b/net/systemeD/halcyon/MapEvent.as
@@ -7,6 +7,7 @@ package net.systemeD.halcyon {
                public static const DOWNLOAD:String = "download";
                public static const RESIZE:String = "resize";
                public static const MOVE:String = "move";
                public static const DOWNLOAD:String = "download";
                public static const RESIZE:String = "resize";
                public static const MOVE:String = "move";

+               public static const SCALE:String = "scale";

                public static const NUDGE_BACKGROUND:String = "nudge_background";
                public static const ERROR:String = "error";
 
                public static const NUDGE_BACKGROUND:String = "nudge_background";
                public static const ERROR:String = "error";
 

diff --git a/potlatch2.mxml b/potlatch2.mxml
index ff05912b0194afee3c9138d64af68eadcd0451f1..79735e54ee4b0838ee17c9c59f646c2594f45472 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -59,9 +59,9 @@
             top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
         </mx:Canvas>
         <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
             top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
         </mx:Canvas>
         <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"

-            rollOverEffect="glowImage" rollOutEffect="unglowImage"/>
+            rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom in - currently z'+getScale()}" />

         <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
         <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"

-            rollOverEffect="glowImage" rollOutEffect="unglowImage"/>
+            rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom out - currently z'+getScale()}" />

         <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
             enabled="false" borderThickness="0"
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
         <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
             enabled="false" borderThickness="0"
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>


@@ -155,6 +155,7 @@
                        _root.addChild(yahoo);
                        _root.addChild(theMap);
             theMap.updateSize(w,h);
                        _root.addChild(yahoo);
                        _root.addChild(theMap);
             theMap.updateSize(w,h);

+                       theMap.addEventListener(MapEvent.SCALE, scaleHandler);

 
                        // add mask for map
                        var s:Sprite=new Sprite();
 
                        // add mask for map
                        var s:Sprite=new Sprite();


@@ -366,6 +367,14 @@
                        obj.flush();
                }
 
                        obj.flush();
                }
 

+               private function scaleHandler(event:MapEvent):void {
+                       dispatchEvent(new Event("rescale"));
+               }
+               
+               [Bindable(event="rescale")]
+               private function getScale():String {
+                       return String(theMap.scale);
+               }

 
         private function dragEnterHandler(event:DragEvent):void {
             // Get the drop target component from the event object.
 
         private function dragEnterHandler(event:DragEvent):void {
             // Get the drop target component from the event object.