Ticket #1062: geojson.4.patch

tests/Format/test_GeoJSON.html

@@ -184 +184 @@
-        t.eq(types, {'Point':15, 'Polygon': 2, 'LineString':2}, "Correct number of each type"); 
-    }
-
+    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);
-

lib/OpenLayers/Format/GeoJSON.js

@@ -447 +447 @@
-                    if(geojson.type == null) {
-                        geojson.type = "FeatureCollection";
-                        if(element.layer && element.layer.projection) {
-
+geojson.crs = 
-                        }
-                    } else if(geojson.type != "FeatureCollection") {
-                        OpenLayers.Console.error("FeatureCollection only supports collections of features: " + element);
@@ -469 +469 @@
-        } else if (obj instanceof OpenLayers.Feature.Vector) {
-            geojson = this.extract.feature.apply(this, [obj]);
-            if(obj.layer && obj.layer.projection) {
-
+geojson.crs = 
-            }
-        }
-        return OpenLayers.Format.JSON.prototype.write.apply(this,
@@ -479 +479 @@
-    /**
-     * 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": {
-                       "urn": "urn:ogc:def:crs:OGC:1.3:CRS84"
-                   }
-               };
-           } else {    
-geojson.
+
-                   "type": "EPSG",
-                   "properties": {
-                       "code": code 
@@ -500 +508 @@
-               };
-           }    
-       }
+       return crs;
-    },
-    
-    /**