Changeset 6888

Timestamp:

04/13/08 11:20:48 (5 months ago)

Author:

edgemaster

Message:

Bringing in local changes

Files:

• sandbox/edgemaster/openlayers/lib/OpenLayers.js (modified) (1 diff)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Layer/OpenSpace.js (added)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (1 diff)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)
• sandbox/edgemaster/openlayers/lib/OpenLayers/Marker.js (modified) (1 diff)

sandbox/edgemaster/openlayers/lib/OpenLayers.js

@@ -119 +119 @@
-            "OpenLayers/Layer/TMS.js",
-            "OpenLayers/Layer/TileCache.js",
+            "OpenLayers/Layer/OpenSpace.js",
-            "OpenLayers/Popup/Anchored.js",
-            "OpenLayers/Popup/AnchoredBubble.js",

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

@@ -185 +185 @@
-        return maxExtent;
-    },
+    
+    /* APIMethod: transform
+     * Transform the Markers layer from source to dest projection. 
+     *
+     * Parameters: 
+     * source - {<OpenLayers.Projection>} Source projection. 
+     * dest   - {<OpenLayers.Projection>} Destination projection. 
+     *
+     * Returns:
+     * {<OpenLayers.Layer.Markers>} Itself, for use in chaining operations.
+     */
+    transform: function(source, dest) {
+        for(var i=0; i < this.markers.length; i++) {
+            var marker = this.markers[i];
+            marker.transform(source, dest);
+        }
+        this.redraw();
+        return this;
+    },
-
-    CLASS_NAME: "OpenLayers.Layer.Markers"

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

@@ -494 +494 @@
-    },
-    
+    /* APIMethod: transform
+     * Transform the Vector layer from source to dest projection. 
+     *
+     * Parameters: 
+     * source - {<OpenLayers.Projection>} Source projection. 
+     * dest   - {<OpenLayers.Projection>} Destination projection. 
+     *
+     * Returns:
+     * {<OpenLayers.Layer.Markers>} Itself, for use in chaining operations.
+     */
+    transform: function(source, dest) {
+        for(var i=0; i < this.features.length; i++) {
+            var feature = this.features[i];
+            feature.geometry.transform(source, dest);
+        }
+        this.redraw();
+        return this;
+    },
+    
-    /**
-     * Unselect the selected features

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

@@ -973 +973 @@
-        if (this.baseLayer) {
-            oldExtent = this.baseLayer.getExtent();
+            oldProjection = this.getProjectionObject();
-        }
-
@@ -1003 +1004 @@
-                        ? oldExtent.getCenterLonLat()
-                        : center;
+                        
+                    // Convert centre point to new layer projection - so we can
+                    // maintain roughly the same view
+                    if(!oldProjection.equals(this.getProjectionObject())) {
+                        newCenter.transform(oldProjection, this.getProjectionObject());
+                        oldExtent.transform(oldProjection, this.getProjectionObject());
+                        vectorLayers = this.getLayersBy("isVector", true);
+                        for (l = 0; l < vectorLayers.length; l++) {
+                            vectorLayers[l].transform(oldProjection, this.getProjectionObject());
+                        }
+                    }
-
-                    //the new zoom will either come from the old Extent or 

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

@@ -182 +182 @@
-    setUrl: function(url) {
-        this.icon.setUrl(url);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**