Very basic map event support, plus calculate area centroids correctly.

diff --git a/halcyon.mxml b/halcyon.mxml
index dd09029d814ae9d29b59f793820862119c8e33bf..23d8a7290fe4b5eab433a5cd04b46be462ee69dc 100755 (executable)
--- a/halcyon.mxml
+++ b/halcyon.mxml
@@ -8,7 +8,7 @@
 
     <mx:HDividedBox width="100%" height="100%">
 
 
     <mx:HDividedBox width="100%" height="100%">
 

-      <mx:VBox height="100%">
+      <mx:VBox height="50%">

         <mx:Button label="+" click="theMap.zoomIn();"/>
         <mx:Button label="-" click="theMap.zoomOut();"/>
       </mx:VBox>
         <mx:Button label="+" click="theMap.zoomIn();"/>
         <mx:Button label="-" click="theMap.zoomOut();"/>
       </mx:VBox>


@@ -23,6 +23,7 @@
                import flash.display.Sprite;
                import mx.core.IChildList;
         import mx.containers.Canvas;
                import flash.display.Sprite;
                import mx.core.IChildList;
         import mx.containers.Canvas;

+               import mx.core.Application;

 
         public var theMap:Map;
 
 
         public var theMap:Map;
 


@@ -35,10 +36,6 @@
             var b:Canvas = new Canvas();
             b.height=200; b.width=200;
             b.setStyle("backgroundColor", 0xFFFFEA);
             var b:Canvas = new Canvas();
             b.height=200; b.width=200;
             b.setStyle("backgroundColor", 0xFFFFEA);

-                       //var b:Sprite=new Sprite();
-                       //b.graphics.beginFill(0xFFFFEA,100);
-                       //b.graphics.drawRect(0,0,200,200);
-                       //b.graphics.endFill();

                        _root.addChild(b);
 
                        // add map
                        _root.addChild(b);
 
                        // add map


@@ -71,6 +68,13 @@
                        // keyboard event attached to stage
                        stage.addEventListener(KeyboardEvent.KEY_UP, theMap.keyUpHandler);
 
                        // keyboard event attached to stage
                        stage.addEventListener(KeyboardEvent.KEY_UP, theMap.keyUpHandler);
 

+                       // example listener event
+                       var myListenerObj:Object = new Object();
+                       myListenerObj.mapHandler=function(event:MapEvent):void {
+                               Globals.vars.debug.appendText("Download event fired - "+event.minlat+","+event.minlon+"\n");
+                       };
+                       theMap.addEventListener(MapEvent.DOWNLOAD, myListenerObj.mapHandler);
+

                        // add debug field
                        var t:TextField=new TextField();
                        t.width=400; t.height=100; t.border=true; 
                        // add debug field
                        var t:TextField=new TextField();
                        t.width=400; t.height=100; t.border=true; 

diff --git a/net/systemeD/halcyon/Map.as b/net/systemeD/halcyon/Map.as
index d6a1413c526edcf3a5472d8628293e0146dd4280..e2023068da662b34e9ce4ac7eee4daf63a8dff81 100755 (executable)
--- a/net/systemeD/halcyon/Map.as
+++ b/net/systemeD/halcyon/Map.as
@@ -168,8 +168,7 @@ package net.systemeD.halcyon {
                // (typically from whichways, but will want to add more connections)
 
                public function download():void {
                // (typically from whichways, but will want to add more connections)
 
                public function download():void {

-                       var e:MapEvent = new MapEvent("download",edge_l,edge_r,edge_t,edge_b);
-                       this.dispatchEvent(e);
+                       this.dispatchEvent(new MapEvent(MapEvent.DOWNLOAD,edge_l,edge_r,edge_t,edge_b));

                        
                        if (edge_l>=bigedge_l && edge_r<=bigedge_r &&
                                edge_b>=bigedge_b && edge_t<=bigedge_t) { return; }     // we have already loaded this area, so ignore
                        
                        if (edge_l>=bigedge_l && edge_r<=bigedge_r &&
                                edge_b>=bigedge_b && edge_t<=bigedge_t) { return; }     // we have already loaded this area, so ignore

diff --git a/net/systemeD/halcyon/MapEvent.as b/net/systemeD/halcyon/MapEvent.as
new file mode 100644 (file)
index 0000000..87262d3
--- /dev/null
+++ b/net/systemeD/halcyon/MapEvent.as
@@ -0,0 +1,19 @@
+package net.systemeD.halcyon {
+
+    import flash.events.Event;
+
+    public class MapEvent extends Event {
+
+               public static const DOWNLOAD:String = "download";
+               public var minlon:Number, maxlon:Number, maxlat:Number, minlat:Number;
+
+        public function MapEvent(eventname:String, minlon:Number, maxlon:Number, maxlat:Number, minlat:Number) {
+            super(eventname);
+            this.minlat = minlat;
+            this.minlon = minlon;
+            this.maxlat = maxlat;
+            this.maxlon = maxlon;
+        }
+    }
+
+}

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 15490bdf3c81c4687287e6992bb758b36981702f..e1f20d1bf44299a7a05e81ca61e98ed3bb69fea2 100755 (executable)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -55,23 +55,23 @@ package net.systemeD.halcyon {
                        pathlength=0;
                        patharea=0;
                        
                        pathlength=0;
                        patharea=0;
                        

+                       lx = way.getNode(way.length-1).lon;
+                       ly = way.getNode(way.length-1).latp;

                        for ( var i:uint = 0; i < way.length; i++ ) {
                 var node:Node = way.getNode(i);
                 var latp:Number = node.latp;
                 var lon:Number  = node.lon;
                        for ( var i:uint = 0; i < way.length; i++ ) {
                 var node:Node = way.getNode(i);
                 var latp:Number = node.latp;
                 var lon:Number  = node.lon;

-                               if ( !isNaN(lx) ) {
-                    pathlength += Math.sqrt( Math.pow(lon-lx,2)+Math.pow(latp-ly,2) );
-                                       patharea += lx*latp-lon*ly;
-                                       sc = (lx*latp-lon*ly); 
-                                       cx += (lx+lon)*sc;
-                                       cy += (ly+latp)*sc;
-                }
+                               if ( i>0 ) { pathlength += Math.sqrt( Math.pow(lon-lx,2)+Math.pow(latp-ly,2) ); }
+                               sc = (lx*latp-lon*ly)*map.scalefactor;
+                               cx += (lx+lon)*sc;
+                               cy += (ly+latp)*sc;
+                               patharea += sc;

                                lx=lon; ly=latp;
                        }
 
                        pathlength*=map.scalefactor;
                                lx=lon; ly=latp;
                        }
 
                        pathlength*=map.scalefactor;

-                       patharea*=map.scalefactor/2;
-                       if (patharea>0 && way.isArea()) {
+                       patharea/=2;
+                       if (patharea!=0 && way.isArea()) {

                                centroid_x=map.lon2coord(cx/patharea/6);
                                centroid_y=map.latp2coord(cy/patharea/6);
                        } else if (pathlength>0) {
                                centroid_x=map.lon2coord(cx/patharea/6);
                                centroid_y=map.latp2coord(cy/patharea/6);
                        } else if (pathlength>0) {

diff --git a/net/systemeD/halcyon/connection/Way.as b/net/systemeD/halcyon/connection/Way.as
index f26d5b6419acce472440285b7d6838324fde8551..ec37b0ff18e6ad5e6d05642340d261e0ccd49b41 100644 (file)
--- a/net/systemeD/halcyon/connection/Way.as
+++ b/net/systemeD/halcyon/connection/Way.as
@@ -35,7 +35,7 @@ package net.systemeD.halcyon.connection {
         }
 
                public function isArea():Boolean {
         }
 
                public function isArea():Boolean {

-                       return nodes[0]==nodes[nodes.length-1] && nodes.length>2;
+                       return (nodes[0].id==nodes[nodes.length-1].id  && nodes.length>2);

                }
     }
 
                }
     }