Optimise rendering speed by a factor of lots.

diff --git a/net/systemeD/halcyon/MapPaint.as b/net/systemeD/halcyon/MapPaint.as
index 6dc75b40aa7f9fb1365f9fdc03224e877b25be3a..80166863c55d909ba783aeb61b3cad79eeeed77d 100644 (file)
--- a/net/systemeD/halcyon/MapPaint.as
+++ b/net/systemeD/halcyon/MapPaint.as
@@ -188,7 +188,7 @@ package net.systemeD.halcyon {
                        }
 
                        for each (poi in o.poisInside) {
-                               if (!nodeuis[poi.id]) { createNodeUI(poi); }
+                               if (!nodeuis[poi.id]) { createNodeUI(poi,true); }
                                else if (redraw) { nodeuis[poi.id].redraw(); }
                        }
 
@@ -263,11 +263,12 @@ package net.systemeD.halcyon {
                }
 
                /** Make a UI object representing a node. */
-               public function createNodeUI(node:Node,rotation:Number=0,layer:int=NO_LAYER,stateClasses:Object=null):NodeUI {
+               public function createNodeUI(node:Node,isPOI:Boolean,rotation:Number=0,layer:int=NO_LAYER,stateClasses:Object=null):NodeUI {
                        if (!nodeuis[node.id]) {
-                               nodeuis[node.id]=new NodeUI(node,this,rotation,layer,stateClasses);
+                               nodeuis[node.id]=new NodeUI(node,this,isPOI,rotation,layer,stateClasses);
                                node.addEventListener(Connection.NODE_DELETED, nodeDeleted);
                        } else {
+                               nodeuis[node.id].isPOI=isPOI;
                                for (var state:String in stateClasses) {
                                        nodeuis[node.id].setStateClass(state,stateClasses[state]);
                                }
@@ -348,15 +349,14 @@ package net.systemeD.halcyon {
                /** Redraw all entities */
                public function redraw():void {
                        for each (var w:WayUI in wayuis) { w.recalculate(); w.invalidateStyleList(); w.redraw(); }
-                       /* sometimes (e.g. in Map.setStyle) Mappaint.redrawPOIs() is called immediately afterwards anyway. FIXME? */
-                       for each (var p:NodeUI in nodeuis) { p.invalidateStyleList(); p.redraw(); }
-            for each (var m:MarkerUI in markeruis) { m.invalidateStyleList(); m.redraw(); }
+                       for each (var p:NodeUI in nodeuis) { if (p.isPOI) { p.invalidateStyleList(); p.redraw(); } }
+                       for each (var m:MarkerUI in markeruis) { m.invalidateStyleList(); m.redraw(); }
                }
 
                /** Redraw nodes and markers only */
                public function redrawPOIs():void {
-                       for each (var p:NodeUI in nodeuis) { p.invalidateStyleList(); p.redraw(); }
-            for each (var m:MarkerUI in markeruis) { m.invalidateStyleList(); m.redraw(); }
+                       for each (var p:NodeUI in nodeuis) { if (p.isPOI) { p.invalidateStyleList(); p.redraw(); } }
+                       for each (var m:MarkerUI in markeruis) { m.invalidateStyleList(); m.redraw(); }
                }
                
                /** Redraw a single entity if it exists */
@@ -393,7 +393,7 @@ package net.systemeD.halcyon {
         private function newPOICreatedListener(event:EntityEvent):void {
             var node:Node = event.entity as Node;
                        if (!node.within(map.edge_l, map.edge_r, map.edge_t, map.edge_b)) { return; }
-                       createNodeUI(node);
+                       createNodeUI(node,true);
         }
 
         private function newMarkerCreatedListener(event:EntityEvent):void {

diff --git a/net/systemeD/halcyon/NodeUI.as b/net/systemeD/halcyon/NodeUI.as
index 4ad2c591754057a5edac1e55b416c91f3d2b20ee..11bcc02fdd8a2daec449d3d49e43220927235333 100644 (file)
--- a/net/systemeD/halcyon/NodeUI.as
+++ b/net/systemeD/halcyon/NodeUI.as
@@ -16,6 +16,7 @@ package net.systemeD.halcyon {
        public class NodeUI extends EntityUI {
                
                public var loaded:Boolean=false;
+               public var isPOI:Boolean;
                private var iconnames:Object={};                        // name of icon on each subpart
                private var heading:Number=0;                           // heading within way
                private var rotation:Number=0;                          // rotation applied to this POI
@@ -27,9 +28,10 @@ package net.systemeD.halcyon {
                 * @param heading Optional angle.
                 * @param layer Which layer on the MapPaint object it sits on. @default Top layer
                 * @param stateClasses A settings object definining the initial state of the node (eg, highlighted, hover...) */
-               public function NodeUI(node:Node, paint:MapPaint, heading:Number=0, layer:int=NO_LAYER, stateClasses:Object=null) {
+               public function NodeUI(node:Node, paint:MapPaint, isPOI:Boolean, heading:Number=0, layer:int=NO_LAYER, stateClasses:Object=null) {
                        super(node,paint);
                        if (layer==NO_LAYER) { this.layer=paint.maxlayer; } else { this.layer=layer; }
+                       this.isPOI=isPOI;
                        this.heading = heading;
                        if (stateClasses) {
                                for (var state:String in stateClasses) {
@@ -77,7 +79,7 @@ package net.systemeD.halcyon {
                        tags=applyStateClasses(tags);
                        if (entity.status) { tags['_status']=entity.status; }
                        if (!styleList || !styleList.isValidAt(paint.map.scale)) {
-                               styleList=paint.ruleset.getStyles(entity,tags,paint.map.scale); 
+                               styleList=paint.ruleset.getStyles(entity,tags,paint.map.scale,isPOI); 
                        }
 
                        var suggestedLayer:Number=styleList.layerOverride();

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index ed9156ffb61d53e1f97b3c83502bccfc3ff211e3..a7e101dfc2850b4fecbdc7cc91ef85eabd9c9cd1 100644 (file)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -347,7 +347,7 @@ package net.systemeD.halcyon {
 //                                  else { nodetags['_heading']=(heading[i]+heading[i-1])/2; }
                                // ** FIXME - heading isn't currently applied
                                nodeStateClasses['junction']=(node.numParentWays>1);
-                               paint.createNodeUI(node,r,layer,nodeStateClasses);
+                               paint.createNodeUI(node,false,r,layer,nodeStateClasses);
                        }
                        if (!drawn) { return false; } // If not visible, no hitzone.
                        

diff --git a/net/systemeD/halcyon/styleparser/RuleSet.as b/net/systemeD/halcyon/styleparser/RuleSet.as
index de8d3dd711bdd04ab42727546169d279b60c2913..9c16687e3c322284f7e10ddc594575f03990bf54 100644 (file)
--- a/net/systemeD/halcyon/styleparser/RuleSet.as
+++ b/net/systemeD/halcyon/styleparser/RuleSet.as
@@ -235,12 +235,17 @@ package net.systemeD.halcyon.styleparser {
                }
 
                /** Create a StyleList for an Entity, by creating a blank StyleList, then running each StyleChooser over it.
+                   Optionally, styleUntagged can be set to false, to abort (and return a blank StyleList) if the tag hash is empty.
                        @see net.systemeD.halcyon.styleparser.StyleList */
 
-               public function getStyles(obj:Entity, tags:Object, zoom:uint):StyleList {
+               public function getStyles(obj:Entity, tags:Object, zoom:uint, styleUntagged:Boolean=true):StyleList {
                        var sl:StyleList=new StyleList();
-                       for each (var sc:StyleChooser in choosers) {
-                               sc.updateStyles(obj,tags,sl,zoom);
+                       var tagged:Boolean=styleUntagged;
+                       for (var k:String in tags) { tagged=true; break; }
+                       if (tagged) {
+                               for each (var sc:StyleChooser in choosers) {
+                                       sc.updateStyles(obj,tags,sl,zoom);
+                               }
                        }
                        return sl;
                }