OpenLayers OpenLayers

Changeset 5018

Show
Ignore:
Timestamp:
10/18/07 21:18:47 (1 year ago)
Author:
ahocevar
Message:

prevent feature styles from being overwritten unless a style different than the layer style is to be applied. Important fix to keep the old behavior of feature style priority over layer style

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/ahocevar/sldRenderer/lib/OpenLayers/Layer/Vector.js

    r4994 r5018  
    373373     *  
    374374     * Parameters: 
    375      * style    - {<OpenLayers.Style>} new style to apply to the layer 
     375     * style    - {<OpenLayers.Style>}, {Array of <OpenLayers.Style>} 
     376     *            new style to apply to the layer 
    376377     * features - {Array of <OpenLayers.Feature.Vector>} optional features 
    377378     *            array to apply the styles to. If not specified, the features 
    …… 
    379380     */ 
    380381    setStyle: function(style, features) { 
     382        var setFeatureStyles = false; 
    381383        if (style != this.style) { 
    382384            this.style = style; 
     385            setFeatureStyles = true; 
    383386        } 
    384387         
    …… 
    407410                    // the layer style is just a style hash; use it 
    408411                    for (var j=0; j<features.length; j++) { 
    409                         features[j].style = OpenLayers.Util.extend({}, style); 
     412                        if (!features[j].style && setFeatureStyles) { 
     413                            features[j].style = OpenLayers.Util.extend({}, style); 
     414                        } 
    410415                    } 
    411416                    break;