OpenLayers OpenLayers

Changeset 8367

Show
Ignore:
Timestamp:
11/14/08 20:00:30 (2 months ago)
Author:
edgemaster
Message:

Fix bug in Layer/adjustResolutions(), causing it to fail under Google and other similar layers.
Fix comment typo in Map/setBaseLayer()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/edgemaster/openlayers/lib/OpenLayers/Layer.js

    r7917 r8367  
    889889        'numZoomLevels', 'maxZoomLevel' 
    890890        ); 
     891        var baseLayer = this.map.baseLayer; 
     892        var prop; 
    891893         
    892894        // This is probably ugly - we clobber derived properties 
    893895        for(var i=0, len=props.length; i < len; i++) { 
    894             if((this.options[props[i]] === undefined) && (this[props[i]])) { 
    895                 var blProp = this.map.baseLayer[props[i]]; 
     896            prop = props[i]; 
     897            if((this.options[prop] === undefined) && (this[prop]) && (baseLayer[prop])) { 
     898                var blProp = baseLayer[prop]; 
    896899                if(blProp.clone && (typeof blProp.clone == 'function')) { 
    897                     this[props[i]] = blProp.clone(); 
     900                    this[prop] = blProp.clone(); 
    898901                } else { 
    899                     this[props[i]] = blProp; 
     902                    this[prop] = blProp; 
    900903                } 
    901904            } 

  • sandbox/edgemaster/openlayers/lib/OpenLayers/Map.js

    r7915 r8367  
    995995        if (newBaseLayer != this.baseLayer) { 
    996996           
    997             // is newBaseLayer an already loaded layer?m 
     997            // is newBaseLayer an already loaded layer? 
    998998            if (OpenLayers.Util.indexOf(this.layers, newBaseLayer) != -1) { 
    999999