backport the geojson featurecollection arrays fix

runarbe · Feb 6, 2013 · 241cc7d · 241cc7d
1 parent 0dcbed8
commit 241cc7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/layer/GeoJSON.js b/src/layer/GeoJSON.js
@@ -15,13 +15,13 @@ L.GeoJSON = L.FeatureGroup.extend({
 	},
 
 	addData: function (geojson) {
-		var features = L.Util.isArray(geojson) ? geojson : geojson.features,
+		var features = L.Util.isArray(geojson) ? geojson : geojson.features,
 		    i, len;
 
 		if (features) {
 			for (i = 0, len = features.length; i < len; i++) {
 				// Only add this if geometry or geometries are set and not null
-				if (features[i].geometries || features[i].geometry) {
+				if (features[i].geometries || features[i].geometry || features[i].features) {
 					this.addData(features[i]);
 				}
 			}