Changeset 4819

Timestamp:

10/04/07 14:11:15 (1 year ago)

Author:

crschmidt

Message:

The createCRSObject stuff never really worked. Unfortunately, the tests didn't
catch it because they were all minimal unit tests -- so they never hooked
up features to layers with projections. This fixes the createCRSObject
function, including updated documentation, and includes tests for regression.
(Pullup #1062)

Files:

• trunk/openlayers/lib/OpenLayers/Format/GeoJSON.js (modified) (5 diffs)
• trunk/openlayers/tests/Format/test_GeoJSON.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Format/GeoJSON.js

@@ -448 +448 @@
-                        geojson.type = "FeatureCollection";
-                        if(element.layer && element.layer.projection) {
-
+geojson.crs = 
-                        }
-                    } else if(geojson.type != "FeatureCollection") {
@@ -470 +470 @@
-            geojson = this.extract.feature.apply(this, [obj]);
-            if(obj.layer && obj.layer.projection) {
-
+geojson.crs = 
-            }
-        }
@@ -480 +480 @@
-     * Method: createCRSObject
-     * Create the CRS object for an object.
+     *
+     * Parameters:
+     * object - {<OpenLayers.Feature.Vector>} 
+     *
+     * Returns:
+     * {Object} An object which can be assigned to the crs property
+     * of a GeoJSON object.
-     */
-    createCRSObject: function(object) {
-       var proj = object.layer.projection;
+       var crs = {}
-       if (proj.match(/epsg:/i)) {
-           var code = parseInt(proj.substring(proj.indexOf(":") + 1));
-           if (code == 4326) {
-geojson.
+
-                   "type": "OGC",
-                   "properties": {
@@ -493 +501 @@
-               };
-           } else {    
-geojson.
+
-                   "type": "EPSG",
-                   "properties": {
@@ -501 +509 @@
-           }    
-       }
+       return crs;
-    },
-    

trunk/openlayers/tests/Format/test_GeoJSON.html

@@ -185 +185 @@
-    }
-
+    function test_Format_GeoJSON_writeWithCRS(t) {
+        t.plan(2)
+        var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,2));
+        feature.fid = 0;
+        var output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"OGC","properties":{"urn":"urn:ogc:def:crs:OGC:1.3:CRS84"}}}';
+        layer = new OpenLayers.Layer.Vector();
+        layer.projection = "EPSG:4326";
+        feature.layer = layer;
+        var parser = new OpenLayers.Format.GeoJSON();
+        test_out = parser.write(feature);
+        t.eq(test_out, output, "Output is equal for vector with layer in EPSG:4326 ");
+        feature.layer.projection = "EPSG:2805";
+        var output = '{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]},"crs":{"type":"EPSG","properties":{"code":2805}}}';
+        test_out = parser.write(feature);
+        t.eq(test_out, output, "Output is equal for vector with point");
+    }    
+        
-    function test_Format_GeoJSON_write(t) {
-        t.plan(10);