Changeset 7915

Timestamp:

09/01/08 07:06:45 (3 months ago)

Author:

edgemaster

Message:

Fix bug where the maxExtent of baselayers was being transformed
Move adjustResolutions() to Vector layers

Files:

• sandbox/edgemaster/openlayers/examples/multiple-projections.html (modified) (1 diff)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (2 diffs)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)

sandbox/edgemaster/openlayers/examples/multiple-projections.html

@@ -60 +60 @@
-            );
-            
-goo, osmll
+ll, osmgoo
-            gml = new OpenLayers.Layer.GML("OSM", "osm/sutton_coldfield.osm", {format: OpenLayers.Format.OSM});
-            map.zoomToExtent(new OpenLayers.Bounds(-1.819072,52.549034,-1.814341,52.551582).transform(epsg4326, map.getProjectionObject()));

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

@@ -872 +872 @@
-        this.numZoomLevels = confProps.numZoomLevels;
-    },
-    
-    /**
-    * Method: adjustResolutions
-    * Attempts to adjust resolution options to that of a new base layer if
-    * originally copied from a base layer or the map object.
-    * This method is intended to be only used with non-raster layers that
-    * need to adapt when the base layer changes.
-    */
-    adjustResolutions: function(layer) {
-        var props = new Array(
-        'projection', 'units',
-        'scales', 'resolutions',
-        'maxScale', 'minScale', 
-        'maxResolution', 'minResolution',
-        'minExtent', 'maxExtent',
-        'numZoomLevels', 'maxZoomLevel'
-        );
-        
-        // This is probably ugly - we clobber derived properties
-        for(var i=0; i < props.length; i++) {
-            if((this.options[props[i]] === undefined) && (this[props[i]])) {
-                this[props[i]] = this.map.baseLayer[props[i]];
-            }
-        }
-    },
-
-    /**

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

@@ -621 +621 @@
-        return feature;
-    },
+
+    /**
+     * Method: adjustResolutions
+     * Attempts to adjust resolution options to that of a new base layer if
+     * originally copied from a base layer or the map object.
+     * This method is intended to be only used with non-raster layers that
+     * need to adapt when the base layer changes.
+     */
+    adjustResolutions: function(layer) {
+        var props = new Array(
+            'projection', 'units',
+            'scales', 'resolutions',
+            'maxScale', 'minScale', 
+            'maxResolution', 'minResolution',
+            'minExtent', 'maxExtent',
+            'numZoomLevels', 'maxZoomLevel'
+        );
+        
+        // This is probably ugly - we clobber derived properties
+        for(var i=0, len=props.length; i < len; i++) {
+            if((this.options[props[i]] === undefined) && (this[props[i]])) {
+                var blProp = this.map.baseLayer[props[i]];
+                if(blProp.clone && (typeof blProp.clone == 'function')) {
+                    this[props[i]] = blProp.clone();
+                } else {
+                    this[props[i]] = blProp;
+                }
+            }
+        }
+    },
-    
-    /**
@@ -640 +670 @@
-            var feature = this.features[i];
-            feature.geometry.transform(source, dest);
-        }
-        if(this.maxExtent != null) {
-            this.maxExtent.transform(source, dest);
-        }
-        this.projection = dest;

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

@@ -1046 +1046 @@
-                        // trust the projection property all the time as it is
-                        // used as a shortcut for externalProjection
- = 0; l < this.layers.length
+=0, len=this.layers.length; l < len
-                            if(this.layers[l].transform && (typeof this.layers[l].transform == 'function')) {
-                                this.layers[l].transform(oldProjection, newProjection);