Merge pull request makinacorpus#146 from rukayaj/master

leplatrem · leplatrem · commit 2a76b4f01142 · 2016-02-21T12:13:41.000+01:00
Fixing typeerror (geojson.geometry is undefined)
diff --git a/leaflet/static/leaflet/leaflet.forms.js b/leaflet/static/leaflet/leaflet.forms.js
@@ -35,7 +35,7 @@ L.FieldStore = L.Class.extend({
         }
 
         var geojson = geom.toGeoJSON();
-        var is_geometrycollection = (geojson.geometry.type == 'GeometryCollection');
+        var is_geometrycollection = (geojson.geometry && geojson.geometry.type == 'GeometryCollection');
         if (is_multi && is_generic && !is_geometrycollection) {
             var flat = {type: 'GeometryCollection', geometries: []};
             for (var i=0; i < geojson.features.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ L.FieldStore = L.Class.extend({`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`var geojson = geom.toGeoJSON();`
`38`		`- var is_geometrycollection = (geojson.geometry.type == 'GeometryCollection');`
	`38`	`+ var is_geometrycollection = (geojson.geometry && geojson.geometry.type == 'GeometryCollection');`
`39`	`39`	`if (is_multi && is_generic && !is_geometrycollection) {`
`40`	`40`	`var flat = {type: 'GeometryCollection', geometries: []};`
`41`	`41`	`for (var i=0; i < geojson.features.length; i++) {`