this should speed up redraw - need to add registerPOI support for vector background...

diff --git a/net/systemeD/halcyon/MapPaint.as b/net/systemeD/halcyon/MapPaint.as
index 79d781506fb0693cfe4e910b600e58924bee971c..b2e3697125f87112b98f39c0fcc8e1d375705792 100644 (file)
--- a/net/systemeD/halcyon/MapPaint.as
+++ b/net/systemeD/halcyon/MapPaint.as
@@ -112,7 +112,7 @@ package net.systemeD.halcyon {
                }
 
                public function updateEntityUIs(o:Object, redraw:Boolean, remove:Boolean):void {
                }
 
                public function updateEntityUIs(o:Object, redraw:Boolean, remove:Boolean):void {

-                       var way:Way, node:Node;
+                       var way:Way, poi:Node;

 
                        for each (way in o.waysInside) {
                                if (!wayuis[way.id]) { createWayUI(way); }
 
                        for each (way in o.waysInside) {
                                if (!wayuis[way.id]) { createWayUI(way); }


@@ -129,17 +129,17 @@ package net.systemeD.halcyon {
                                }
                        }
 
                                }
                        }
 

-                       for each (node in o.nodesInside) {
-                               if (!nodeuis[node.id]) { createNodeUI(node); }
-                               else if (redraw) { nodeuis[node.id].redraw(); }
+                       for each (poi in o.poisInside) {
+                               if (!nodeuis[poi.id]) { createNodeUI(poi); }
+                               else if (redraw) { nodeuis[poi.id].redraw(); }

                        }
 
                        if (remove) {
                        }
 
                        if (remove) {

-                               for each (node in o.nodesOutside) { 
-                                       if (nodeuis[node.id] && !nodeuis[node.id].purgable) {
-                                               if (redraw) { nodeuis[node.id].redraw(); }
+                               for each (poi in o.poisOutside) { 
+                                       if (nodeuis[poi.id] && !nodeuis[poi.id].purgable) {
+                                               if (redraw) { nodeuis[poi.id].redraw(); }

                                        } else {
                                        } else {

-                                               deleteNodeUI(node);
+                                               deleteNodeUI(poi);

                                        }
                                }
                        }
                                        }
                                }
                        }

diff --git a/net/systemeD/halcyon/VectorLayer.as b/net/systemeD/halcyon/VectorLayer.as
index b4f6a5ca52548807cbdb33a5064b6faa06c6fe2b..e97a1cf6cee2a0863b470741705c6d552f380d82 100644 (file)
--- a/net/systemeD/halcyon/VectorLayer.as
+++ b/net/systemeD/halcyon/VectorLayer.as
@@ -52,14 +52,15 @@ package net.systemeD.halcyon {
                public function getObjectsByBbox(left:Number, right:Number, top:Number, bottom:Number):Object {
                        // ** FIXME: this is just copied-and-pasted from Connection.as, which really isn't very
                        // good practice. Is there a more elegant way of doing it?
                public function getObjectsByBbox(left:Number, right:Number, top:Number, bottom:Number):Object {
                        // ** FIXME: this is just copied-and-pasted from Connection.as, which really isn't very
                        // good practice. Is there a more elegant way of doing it?

-                       var o:Object = { nodesInside: [], nodesOutside: [], waysInside: [], waysOutside: [] };
+                       var o:Object = { poisInside: [], poisOutside: [], waysInside: [], waysOutside: [] };

                        for each (var way:Way in ways) {
                                if (way.within(left,right,top,bottom)) { o.waysInside.push(way); }
                                                                  else { o.waysOutside.push(way); }
                        }
                        for each (var way:Way in ways) {
                                if (way.within(left,right,top,bottom)) { o.waysInside.push(way); }
                                                                  else { o.waysOutside.push(way); }
                        }

-                       for each (var node:Node in nodes) {
-                               if (node.within(left,right,top,bottom)) { o.nodesInside.push(node); }
-                                                                  else { o.nodesOutside.push(node); }
+                       // ** FIXME: this needs to do POIs, not nodes (i.e. we need registerPOI for vector layers too)
+                       for each (var poi:Node in nodes) {
+                               if (poi.within(left,right,top,bottom)) { o.poisInside.push(poi); }
+                                                                  else { o.poisOutside.push(poi); }

                        }
                        return o;
                }
                        }
                        return o;
                }

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index e4e2c6c4cb7c2979809360178a765a39196acd51..799985fdc417161124c4339b77dacee33a093e1c 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -289,14 +289,14 @@ package net.systemeD.halcyon.connection {
         }
 
                public function getObjectsByBbox(left:Number, right:Number, top:Number, bottom:Number):Object {
         }
 
                public function getObjectsByBbox(left:Number, right:Number, top:Number, bottom:Number):Object {

-                       var o:Object = { nodesInside: [], nodesOutside: [], waysInside: [], waysOutside: [] };
+                       var o:Object = { poisInside: [], poisOutside: [], waysInside: [], waysOutside: [] };

                        for each (var way:Way in ways) {
                                if (way.within(left,right,top,bottom)) { o.waysInside.push(way); }
                                                                  else { o.waysOutside.push(way); }
                        }
                        for each (var way:Way in ways) {
                                if (way.within(left,right,top,bottom)) { o.waysInside.push(way); }
                                                                  else { o.waysOutside.push(way); }
                        }

-                       for each (var node:Node in nodes) {
-                               if (node.within(left,right,top,bottom)) { o.nodesInside.push(node); }
-                                                                  else { o.nodesOutside.push(node); }
+                       for each (var poi:Node in pois) {
+                               if (poi.within(left,right,top,bottom)) { o.poisInside.push(poi); }
+                                                                 else { o.poisOutside.push(poi); }

                        }
                        return o;
                }
                        }
                        return o;
                }