Attempt at resolving mapbox#55 : allow serialization and deserializat…

…ion of null feature geometry (mapbox#94)

decode.js

@@ -39,7 +39,9 @@ function readFeatureCollection(pbf, obj) {
 
 function readFeature(pbf, feature) {
     feature.type = 'Feature';
-    return pbf.readMessage(readFeatureField, feature);
+    var f = pbf.readMessage(readFeatureField, feature);
+    if (!f.hasOwnProperty('geometry')) f.geometry = null;
+    return f;
 }
 
 function readGeometry(pbf, geom) {

encode.js

@@ -47,7 +47,7 @@ function analyze(obj) {
         for (i = 0; i < obj.features.length; i++) analyze(obj.features[i]);
 
     } else if (obj.type === 'Feature') {
-        analyze(obj.geometry);
+        if (obj.geometry !== null) analyze(obj.geometry);
         for (key in obj.properties) saveKey(key);
 
     } else if (obj.type === 'Point') analyzePoint(obj.coordinates);
@@ -98,7 +98,7 @@ function writeFeatureCollection(obj, pbf) {
 }
 
 function writeFeature(feature, pbf) {
-    pbf.writeMessage(1, writeGeometry, feature.geometry);
+    if (feature.geometry !== null) pbf.writeMessage(1, writeGeometry, feature.geometry);
 
     if (feature.id !== undefined) {
         if (typeof feature.id === 'number' && feature.id % 1 === 0) pbf.writeSVarintField(12, feature.id);

test/fixtures/issue55.json

@@ -0,0 +1,25 @@
+{
+"type": "FeatureCollection", "features": 
+  [{
+    "type": "Feature",
+    "properties": {"miles hiked  ": 12},
+    "geometry": {
+      "type": "LineString",
+      "coordinates": [
+        [-1.1, 2.1],
+        [2, -999.9]
+      ]
+    }
+  },{
+    "type": "Feature",
+    "properties": {"  profit": -999.9},
+    "geometry": null
+  },{
+    "type": "Feature",
+    "properties": {"miles hiked  ": 13.1},
+    "geometry": {
+      "type": "Point",
+      "coordinates": [0.0001, -0.0001]
+    }
+  }]
+}

test/validate.test.js

@@ -15,6 +15,7 @@ for (var name in geojsonFixtures) {
 test('roundtrip issue', roundtripTest(getJSON('issue62.json')));
 
 test('roundtrip custom properties', roundtripTest(getJSON('props.json')));
+test('roundtrip issue55', roundtripTest(getJSON('issue55.json')));
 test('roundtrip issue90', roundtripTest(getJSON('issue90.json')));
 test('roundtrip single-ring MultiPolygon', roundtripTest(getJSON('single-multipoly.json')));