Changeset 5435

Timestamp:

12/15/07 16:45:51 (1 year ago)

Author:

crschmidt

Message:

GeoJSON should parse and serialize GeometryCollections as a Geometry.Collection
object. (Closes #1067)

Files:

• trunk/openlayers/examples/geojson.html (added)
• trunk/openlayers/lib/OpenLayers/Format/GeoJSON.js (modified) (12 diffs)
• trunk/openlayers/tests/Format/test_GeoJSON.html (modified) (5 diffs)

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

@@ -41 +41 @@
-     * json - {String} A GeoJSON string
-     * type - {String} Optional string that determines the structure of
-
-GeometryCollection", and "FeatureCollection".  If absent or null,
-a default of 
+ and
+FeatureCollection".  If absent or null, a default of
+
-     * filter - {Function} A function which will be called for every key and
-     *     value at every level of the final result. Each value will be
@@ -57 +57 @@
-     *     <OpenLayers.Geometry>.  If type is "Feature", the input json must
-     *     represent a single feature, and the return will be an
-
-
-
+
-     */
-    read: function(json, type, filter) {
@@ -92 +90 @@
-                    }
-                    break;
-                case "GeometryCollection":
-                    results = [];
-                    for(var i=0; i<obj.geometries.length; ++i) {
-                        try {
-                            results.push(this.parseGeometry(obj.geometries[i]));
-                        } catch(err) {
-                            results = null;
-                            OpenLayers.Console.error(err);
-                        }
-                    }
-                    break;
-                case "FeatureCollection":
-                    // for type FeatureCollection, we allow input to be any type
@@ -125 +112 @@
-                            }
-                            break;
-                        case "GeometryCollection":
-                            for(var i=0; i<obj.geometries.length; ++i) {
-                                try {
-                                    var geom = this.parseGeometry(obj.geometries[i]);
-                                    results.push(new OpenLayers.Feature.Vector(geom));
-                                } catch(err) {
-                                    results = null;
-                                    OpenLayers.Console.error(err);
-                                }
-                            }
-                            break;
-                        default:
-                            try {
@@ -162 +138 @@
-        switch(type) {
-            case "Geometry":
-
-
-
+
+
+
+
-                    // unsupported geometry type
-                    OpenLayers.Console.error("Unsupported geometry type: " +
@@ -177 +154 @@
-                break;
-            default:
-GeometryCollection and Feature,
+Feature
-                if(obj.type == type) {
-                    valid = true;
@@ -227 +204 @@
-    parseGeometry: function(obj) {
-        var geometry;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        return geometry;
@@ -419 +412 @@
-    /**
-     * APIMethod: write
-
-
+
-     *
-     * Parameters:
-     * obj - {Object} An <OpenLayers.Feature.Vector>, <OpenLayers.Geometry>,
-either features or geometri
+featur
-     * pretty - {Boolean} Structure the output with newlines and indentation.
-     *     Default is false.
@@ -430 +422 @@
-     * Returns:
-     * {String} The GeoJSON string representation of the input geometry,
-array of geometries, 
+
-     */
-    write: function(obj, pretty) {
@@ -437 +429 @@
-        };
-        if(obj instanceof Array) {
-
-
-
-
-
-
+
+
+
+
-                var element = obj[i];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            geojson = this.extract.geometry.apply(this, [obj]);
-        } else if (obj instanceof OpenLayers.Feature.Vector) {
@@ -551 +529 @@
-            var geometryType = geometry.CLASS_NAME.split('.')[2];
-            var data = this.extract[geometryType.toLowerCase()].apply(this, [geometry]);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         * Return an array of coordinates from a point.
-         *
@@ -663 +651 @@
-            }
-            return array;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    },

trunk/openlayers/tests/Format/test_GeoJSON.html

@@ -23 +23 @@
-
-    function test_Format_GeoJSON_valid_type(t) { 
-3
+4
-
-        OpenLayers.Console.error = function(error) { window.global_error = error; }
-
+, "GeometryCollection"
-        for (var i = 0; i < types.length; i++) {
-            t.ok(parser.isValidType({'type':types[i]}, "Geometry"), "Geometry with type " + types[i] + " is valid");
@@ -141 +141 @@
-
-    // This test is from the geom_collection example on geojson spec.
-geom_
-7
+
+10
-
-       var geomcol = {
@@ -159 +159 @@
-           ]
-        };
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -264 +304 @@
-                ]), 
-                '{"type":"Polygon","coordinates":[[[1,2],[3,4],[5,6],[1,2]]]}'
+            ],
+            [
+                new OpenLayers.Geometry.Collection([
+                    new OpenLayers.Geometry.Polygon([
+                        new OpenLayers.Geometry.LinearRing([
+                            new OpenLayers.Geometry.Point(1,2), 
+                            new OpenLayers.Geometry.Point(3,4), 
+                            new OpenLayers.Geometry.Point(5,6)
+                        ])
+                    ]), 
+                    new OpenLayers.Geometry.LineString([
+                        new OpenLayers.Geometry.Point(1,2), 
+                        new OpenLayers.Geometry.Point(3,4)
+                    ]),
+                    new OpenLayers.Geometry.Point(1,2)
+                ]),
+                '{"type":"GeometryCollection","geometries":[{"type":"Polygon","coordinates":[[[1,2],[3,4],[5,6],[1,2]]]},{"type":"LineString","coordinates":[[1,2],[3,4]]},{"type":"Point","coordinates":[1,2]}]}'
-            ]
-        ];
@@ -272 +329 @@
-        serialize_tests.push([multipolygon, '{"type":"MultiPolygon","coordinates":[[[[1,2],[3,4],[5,6],[1,2]]],[[[1,2],[3,4],[5,6],[1,2]]]]}']);
-        serialize_tests.push([ [ serialize_tests[0][0] ], '{"type":"FeatureCollection","features":[{"type":"Feature","id":0,"properties":{},"geometry":{"type":"Point","coordinates":[1,2]}}]}' ]);
-        serialize_tests.push([ [ serialize_tests[1][0], serialize_tests[2][0] ], '{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1,2]},{"type":"MultiPoint","coordinates":[[1,2]]}]}' ]);
-        for (var i = 0; i < serialize_tests.length; i++) {
-            var input = serialize_tests[i][0];