Merge branch 'master' into refactor-interactor-actions

package.json

@@ -64,7 +64,7 @@
     "sinon": "1.17.3",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "vgl": "0.3.8",
+    "vgl": "0.3.9",
     "webpack": "^1.12.14",
     "webpack-dev-server": "^1.14.1",
     "xmlbuilder": "^8.2.2"

src/jsonReader.js

@@ -133,6 +133,13 @@ var jsonReader = function (arg) {
     features.forEach(function (feature) {
       Array.prototype.push.apply(normalized, m_this._feature(feature));
     });
+
+    // remove features with empty geometries
+    normalized = normalized.filter(function (feature) {
+      return feature.geometry &&
+        feature.geometry.coordinates &&
+        feature.geometry.coordinates.length;
+    });
     return normalized;
   };
 

tests/cases/geojsonReader.js

@@ -213,6 +213,31 @@ describe('geojsonReader', function () {
           coordinates: [1, 1]
         }
       }]);
+
+      it('empty geometry', function () {
+        expect(reader._featureArray({
+          type: 'FeatureCollection',
+          features: [{
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: []
+            }
+          }, {
+            type: 'Feature',
+            geometry: {
+              type: 'LineString',
+              coordinates: []
+            }
+          }, {
+            type: 'Feature',
+            geometry: {
+              type: 'Polygon',
+              coordinates: []
+            }
+          }]
+        })).toEqual([]);
+      });
     });
 
     describe('Errors', function () {