Ferdig

javascript/difference.js

@@ -6,14 +6,16 @@ function difference() {
     var name = document.getElementById("differenceName").value;
 
     // Må konverteres fra feature collection til multipolygon:
-    var coords1 = featureCollectionToMultiPolygon(layer1);
-    var coords2 = featureCollectionToMultiPolygon(layer2);
-    
-    var multiPolygon1 = turf.multiPolygon(coords1);
-    var multiPolygon2 = turf.multiPolygon(coords2);
+    var multiPolygon1 = featureCollectionToMultiPolygon(layer1);
+    var multiPolygon2 = featureCollectionToMultiPolygon(layer2);
 
     try {
         var difference = turf.difference(multiPolygon1, multiPolygon2);
+        
+        if (isMultiPolygon(difference)) {
+            difference = multiPolygonToFeatureCollection(difference);
+        }
+        
         var newLayer = L.geoJSON(difference, {style: getStyle()});
         
         overlayMaps[name] = newLayer;

javascript/dissolve.js

@@ -6,7 +6,7 @@ function dissolve() {
     try {
         var dissolved = turf.dissolve(layer);
         var newLayer = L.geoJSON(dissolved, {style: getStyle()});
-
+        
         overlayMaps[name] = newLayer;
 
         updateSidebar();

javascript/intersect.js

@@ -6,14 +6,16 @@ function intersection() {
     var name = document.getElementById("intersectionName").value;
     
     // Må konverteres fra feature collection til multipolygon:
-    var coords1 = featureCollectionToMultiPolygon(layer1);
-    var coords2 = featureCollectionToMultiPolygon(layer2);
-    
-    var multiPolygon1 = turf.multiPolygon(coords1);
-    var multiPolygon2 = turf.multiPolygon(coords2);
+    var multiPolygon1 = featureCollectionToMultiPolygon(layer1);
+    var multiPolygon2 = featureCollectionToMultiPolygon(layer2);
     
     try {
         var intersection = turf.intersect(multiPolygon1, multiPolygon2);
+        
+        if (isMultiPolygon(intersection)) {
+            intersection = multiPolygonToFeatureCollection(intersection);
+        }
+
         var newLayer = new L.GeoJSON(intersection, {style: getStyle()});
         
         overlayMaps[name] = newLayer;

javascript/turfFormatConverter.js

@@ -11,22 +11,25 @@ function featureCollectionToMultiPolygon(layer) { // layer er her et GeoJSON-lag
         for (var i = 0; i < features.length; i++) {
             coords.push(features[i]["geometry"]["coordinates"]);
         }
-        return coords;
+        return turf.multiPolygon(coords);
     }
 }
 
-/*
+function isMultiPolygon(layer) {
+    if (layer["geometry"]["type"] == "MultiPolygon") {
+        return true;
+    }
+    return false;
+}
+
 function multiPolygonToFeatureCollection(layer) {
-    if (layer["type"] == "MultiPolygon") {
-        var features = [];
-        for (var i = 0; i < layer["coordinates"].length; i++) {
-            var geometry = {
-                "type": "Polygon",
-                "coordinates": layer["geometry"][i]
-            }
-            coords.push(geometry);
-        }
-        return turf.featureCollection(features);
+    var features = [];
+    for (var i = 0; i < layer["geometry"]["coordinates"].length; i++) {
+        var geometry = {
+            "type": "Polygon",
+            "coordinates": layer["geometry"]["coordinates"][i]
+        };
+        features.push(turf.feature(geometry));
     }
+    return turf.featureCollection(features);
 }
-*/

javascript/union.js

@@ -14,6 +14,11 @@ function union() {
 
     try {
         var union = turf.union(multiPolygon1, multiPolygon2);
+
+        if (isMultiPolygon(union)) {
+            union = multiPolygonToFeatureCollection(union);
+        }
+
         var newLayer = L.geoJSON(union, {style: getStyle()});
 
         overlayMaps[name] = newLayer;