Changeset 7689

Timestamp:

08/04/08 06:38:01 (4 months ago)

Author:

crschmidt

Message:

"Format.GeoJSON does not parse features with null geometries", r=elemoine
(Closes #1145)

Files:

• trunk/openlayers/lib/OpenLayers/Format/GeoJSON.js (modified) (2 diffs)
• trunk/openlayers/tests/Format/GeoJSON.html (modified) (2 diffs)

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

@@ -205 +205 @@
-     */
-    parseGeometry: function(obj) {
+        if (obj == null) {
+            return null;
+        }
-        var geometry;
-        if(obj.type == "GeometryCollection") {
@@ -533 +536 @@
-         */
-        'geometry': function(geometry) {
+            if (geometry == null) {
+                return null;
+            }
-            if (this.internalProjection && this.externalProjection) {
-                geometry = geometry.clone();

trunk/openlayers/tests/Format/GeoJSON.html

@@ -5 +5 @@
-
-    var poly_content = '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Polygon", "coordinates": [[[-131.484375, -5.9765625], [-112.5, -58.0078125], [-32.34375, -50.2734375], [-114.609375, 52.3828125], [-167.34375, -35.5078125], [-146.953125, -57.3046875], [-139.921875, -34.1015625], [-131.484375, -5.9765625]]]}, "type": "Feature", "id": 562, "properties": {"strokeColor": "red", "title": "Feature 2", "author": "Your Name Here"}}]}'; 
+    var null_geom_feature = '{"type":"Feature","id":573,"properties":{"strokeColor":"blue","title":"Feature 5","author":"Your Name Here"},"geometry":null}';
-    var point_feature = '{"geometry": {"type": "Point", "coordinates": [94.21875, 72.94921875]}, "type": "Feature", "id": 573, "properties": {"strokeColor": "blue", "title": "Feature 5", "author": "Your Name Here"}}'
-    var line_feature = '{"type": "FeatureCollection", "features": [{"geometry": {"type": "LineString", "coordinates": [[-27.0703125, 59.4140625], [-77.6953125, 20.7421875], [30.5859375, -36.2109375], [67.1484375, 34.8046875]]}, "type": "Feature", "id": 559, "properties": {"strokeColor": "red", "title": "Feature 1", "author": "Your Name Here"}}]}';
@@ -22 +23 @@
-    }
-
+    function test_Format_GeoJSON_null_geom(t) {
+        t.plan(2);
+        var f = new OpenLayers.Format.GeoJSON();
+        var fs = f.read(null_geom_feature);
+        t.ok(fs[0].geometry == null, "Reading feature with null geom works okay");
+        t.eq(f.write(fs[0]), null_geom_feature, "round trip null okay"); 
+
+    }   
-    function test_Format_GeoJSON_valid_type(t) { 
-        t.plan(14);