Ticket #1035: projections.3.patch

tests/Layer/test_WMS.html

@@ -236 +236 @@
-        t.eq(str,
-             tUrl + "?" + OpenLayers.Util.getParameterString(tParams),
-             "getFullRequestString() adds SRS value");
-
+
+
-        tLayer.projection = "none";
+        map.addLayer(tLayer);
-        str = tLayer.getFullRequestString();
-        delete tParams['SRS'];
-        t.eq(str,

tests/list-tests.html

@@ -87 +87 @@
-    <li>Handler/test_Path.html</li>
-    <li>Handler/test_Polygon.html</li>
-    <li>Handler/test_RegularPolygon.html</li>
+    <li>test_Projection.html</li>
-    <li>Renderer/test_Elements.html</li>
-    <li>Renderer/test_SVG.html</li>
-    <li>Renderer/test_VML.html</li>

lib/OpenLayers/Layer.js

@@ -126 +126 @@
-
-    /**
-     * APIProperty: projection
-
-
-
+
+
+
+
+
-     */
-    projection: null,    
-    
@@ -267 +269 @@
-        if (this.map != null) {
-            this.map.removeLayer(this, setNewBaseLayer);
-        }
+        this.projection = null;
-        this.map = null;
-        this.name = null;
-        this.div = null;
@@ -410 +413 @@
-            //  been set
-            this.maxExtent = this.maxExtent || this.map.maxExtent;
-            this.projection = this.projection || this.map.projection;
-            this.units = this.units || this.map.units;
-            
+            if (this.projection && typeof this.projection == "string") {
+                this.projection = new OpenLayers.Projection(this.projection);
+            }
+            
+            // Check the projection to see if we can get units -- if not, refer
+            // to properties.
+            this.units = this.projection.getUnits() ||
+                         this.units || this.map.units;
+            
-            this.initResolutions();
-            
-            if (!this.isBaseLayer) {

lib/OpenLayers/Format/GeoJSON.js

@@ -488 +488 @@
-     * of a GeoJSON object.
-     */
-    createCRSObject: function(object) {
-
+.toString()
-       var crs = {};
-       if (proj.match(/epsg:/i)) {
-           var code = parseInt(proj.substring(proj.indexOf(":") + 1));

lib/OpenLayers/Map.js

@@ -1391 +1391 @@
-    
-    /**
-     * APIMethod: getProjection
+     * This method returns a string representing the projection. In 
+     *     the case of projection support, this will be the srsCode which
+     *     is loaded -- otherwise it will simply be the string value that
+     *     was passed to the projection at startup.
+     *
+     * FIXME: In 3.0, we will remove getProjectionObject, and instead
+     *     return a Projection object from this function. 
-     * 
-     * Returns:
-of the base layer.
+string from the base layer or null. 
-     */
-    getProjection: function() {
+        var projection = this.getProjectionObject();
+        return projection ? projection.getCode() : null;
+    },
+    
+    /**
+     * APIMethod: getProjectionObject
+     * Returns the projection obect from the baselayer.
+     *
+     * Returns:
+     * {<OpenLayers.Projection>} The Projection of the base layer.
+     */
+    getProjectionObject: function() {
-        var projection = null;
-        if (this.baseLayer != null) {
-            projection = this.baseLayer.projection;

lib/OpenLayers/Layer/WMS.js

@@ -211 +211 @@
-     * {String} 
-     */
-    getFullRequestString:function(newParams, altUrl) {
-
- == "none") ? null : projection
+Code
+Code == "none") ? null : projectionCode
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);

lib/OpenLayers/Layer/WFS.js

@@ -376 +376 @@
-     * altUrl - {String} Use this as the url instead of the layer's url
-     */
-    getFullRequestString:function(newParams, altUrl) {
-
- == "none") ? null : projection
+Code
+Code == "none") ? null : projectionCode
-
-        return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
-                                                    this, arguments);

lib/OpenLayers.js

@@ -175 +175 @@
-            "OpenLayers/Layer/WFS.js",
-            "OpenLayers/Control/MouseToolbar.js",
-            "OpenLayers/Control/NavToolbar.js",
-
+
+
-        ); // etc.
-
-