allow layers to be overridden in MapCSS; this means we can bring selected nodes to...

diff --git a/net/systemeD/halcyon/NodeUI.as b/net/systemeD/halcyon/NodeUI.as
index 5ea002a0df32025b071f7d607ef652114e15ef9d..bf4f631fabd15d7d1a54c391bc722170ee4a32fd 100644 (file)
--- a/net/systemeD/halcyon/NodeUI.as
+++ b/net/systemeD/halcyon/NodeUI.as
@@ -56,6 +56,9 @@ package net.systemeD.halcyon {
                                styleList=paint.ruleset.getStyles(entity,tags,paint.map.scale); 
                        }
 
+                       var suggestedLayer:Number=styleList.layerOverride();
+                       if (!isNaN(suggestedLayer)) { layer=suggestedLayer; }
+
                        var inWay:Boolean=entity.hasParentWays;
                        var hasStyles:Boolean=styleList.hasStyles();
                        

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 6930e42762625831d4b110ac9b390ead20172971..c4f853e3ddb3b3342579964d109c074d4073b72d 100755 (executable)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -196,10 +196,6 @@ package net.systemeD.halcyon {
                        if (Way(entity).isArea()) { tags[':area']='yes'; }
             if (entity.isUneditedTiger() && Globals.vars.highlightTiger) { tags[':tiger']='yes'; }
 
-                       // Which layer?
-                       layer=0;
-                       if (tags['layer']) { layer=Math.min(Math.max(tags['layer'],paint.minlayer),paint.maxlayer); }
-
                        // Keep track of maximum stroke width for hitzone
                        var maxwidth:Number=4;
 
@@ -208,6 +204,13 @@ package net.systemeD.halcyon {
                                styleList=paint.ruleset.getStyles(entity, tags, paint.map.scale);
                        }
 
+                       // Which layer?
+                       layer=styleList.layerOverride();
+                       if (isNaN(layer)) {
+                               layer=0;
+                               if (tags['layer']) { layer=Math.min(Math.max(tags['layer'],paint.minlayer),paint.maxlayer); }
+                       }
+
                        // Iterate through each sublayer, drawing any styles on that layer
                        var drawn:Boolean;
                        var multis:Array=entity.findParentRelationsOfType('multipolygon','outer');

diff --git a/net/systemeD/halcyon/styleparser/ShapeStyle.as b/net/systemeD/halcyon/styleparser/ShapeStyle.as
index 72711dd8a0d033df3cc2e93e3dddffe141bb6799..03411fc0b3cc2934f72fee12794aad8d98dc6c34 100644 (file)
--- a/net/systemeD/halcyon/styleparser/ShapeStyle.as
+++ b/net/systemeD/halcyon/styleparser/ShapeStyle.as
@@ -21,11 +21,13 @@ package net.systemeD.halcyon.styleparser {
                public var casing_opacity:Number;
                public var casing_dashes:Array=[];
                
+               public var layer:Number;                                // optional layer override (usually set by OSM tag)
+               
                override public function get properties():Array {
                        return [
                                'width','color','opacity','dashes','linecap','linejoin','line_style',
                                'fill_color','fill_opacity','fill_image',
-                               'casing_width','casing_color','casing_opacity','casing_dashes'
+                               'casing_width','casing_color','casing_opacity','casing_dashes','layer'
                        ];
                }
                

diff --git a/net/systemeD/halcyon/styleparser/StyleList.as b/net/systemeD/halcyon/styleparser/StyleList.as
index a5ac01cd3c689d04c94141bff143c6458b044243..86a05012c7be4f98d9b2e55f7895292bd94be704 100755 (executable)
--- a/net/systemeD/halcyon/styleparser/StyleList.as
+++ b/net/systemeD/halcyon/styleparser/StyleList.as
@@ -22,6 +22,13 @@ package net.systemeD.halcyon.styleparser {
                public function hasStyles():Boolean {
                        return ( hasShapeStyles() || hasTextStyles() || hasPointStyles() || hasShieldStyles() );
                }
+
+               public function layerOverride():Number {
+                       for each (var ss:ShapeStyle in shapeStyles) {
+                               if (ss['layer']) return ss['layer'];
+                       }
+                       return NaN;
+               }
                
                public function addSublayer(s:Number):void {
                        if (sublayers.indexOf(s)==-1) { sublayers.push(s); }

diff --git a/resources/potlatch.css b/resources/potlatch.css
index 3d3d9a2726ae8a4a1ccc51351d101c02f422df1b..d8d2c615485990f292fe43ec174a4c2342ba2162 100644 (file)
--- a/resources/potlatch.css
+++ b/resources/potlatch.css
@@ -263,13 +263,13 @@ way :tiger { casing-color: #ff00ff;}
 relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
 
 node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
-node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; }
+node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
 node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
 node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; }
-node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;}
-node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; }
-node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; }
+node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
+node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
+node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
+node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
 
 /* Descendant selectors provide an easy way to style relations: this example means "any way
    which is part of a relation whose type=route". */