don't leave name hanging around when moving nodes; ignore drawExcept/drawOnly for...

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 214544301e25c2a00b513d425dc74f6014e2335a..d3853a7106589b1c89744cf84b2d7760dac85dcc 100644 (file)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -252,7 +252,8 @@ package net.systemeD.halcyon {
                        }
 
                        // Do we have to draw all nodes in the way?
-                       if (isNaN(drawOnly)) {
+                       var hasFills:Boolean=styleList.hasFills();
+                       if (isNaN(drawOnly) || hasFills) {
                                indexStart=0; indexEnd=Way(entity).length; 
                        } else {
                                indexStart=Math.max(0,drawOnly-1);
@@ -289,7 +290,7 @@ package net.systemeD.halcyon {
                                        }
 
                                        // Fill
-                                       if ((!isNaN(s.fill_color) || s.fill_image) && entity.findParentRelationsOfType('multipolygon','inner').length==0) {
+                                       if ((!isNaN(s.fill_color) || s.fill_image) && entity.findParentRelationsOfType('multipolygon','inner').length==0 && isNaN(drawExcept)) {
                                                fill=new Shape(); addToLayer(fill,FILLSPRITE);
                                                fill.graphics.moveTo(x0,y0);
                                                if (s.fill_image) { new WayBitmapFiller(this,fill.graphics,s); }
@@ -311,7 +312,7 @@ package net.systemeD.halcyon {
                                        }
                                }
                                
-                               if (styleList.textStyles[sublayer]) {
+                               if (styleList.textStyles[sublayer] && isNaN(drawExcept)) {
                                        var t:TextStyle=styleList.textStyles[sublayer];
                                        interactive||=t.interactive;
                                        roadname=new Sprite(); addToLayer(roadname,NAMESPRITE);

diff --git a/net/systemeD/halcyon/styleparser/StyleList.as b/net/systemeD/halcyon/styleparser/StyleList.as
index b098a89ddff6154095eed09e1c615783b2fa47ff..7b4435e987a4435e488c6410674d26b8e52e3d2d 100644 (file)
--- a/net/systemeD/halcyon/styleparser/StyleList.as
+++ b/net/systemeD/halcyon/styleparser/StyleList.as
@@ -25,6 +25,13 @@ package net.systemeD.halcyon.styleparser {
                        return ( hasShapeStyles() || hasTextStyles() || hasPointStyles() || hasShieldStyles() );
                }
 
+               public function hasFills():Boolean {
+                       for each (var ss:ShapeStyle in shapeStyles) {
+                               if (!isNaN(ss.fill_color) || ss.fill_image) return true;
+                       }
+                       return false;
+               }
+
                public function layerOverride():Number {
                        for each (var ss:ShapeStyle in shapeStyles) {
                                if (ss['layer']) return ss['layer'];