Merge branch '18-fiks-problematikk-med-polygon-format' into 'main'

Test #1

Closes #18

See merge request !32

javascript/buffer.js

@@ -13,6 +13,7 @@ function makeBuffer() {
         var buffer = turf.buffer(layer.toGeoJSON(), distance, {units: "meters"});
         
         if (document.getElementById("bufferCheck").checked) {
+            console.log(JSON.stringify(buffer));
             var newLayer = L.geoJSON(turf.dissolve(buffer));
         } else {
             var newLayer = L.geoJSON(buffer);

javascript/dissolve.js

@@ -4,6 +4,10 @@ function dissolve() {
     var name = document.getElementById("dissolveName").value;
     
     try {
+        if (layer["type"] == "MultiPolygon") {
+            layer = multiPolygonToFeatureCollection(layer);
+        }
+        
         var dissolved = turf.dissolve(layer.toGeoJSON());
         var newLayer = L.geoJSON(dissolved);
 

javascript/turfFormatConverter.js

@@ -5,12 +5,26 @@ konvertere mellom feature collections og format godtatt av turf
 
 function featureCollectionToMultiPolygon(layer) { // layer er her et GeoJSON-lag
     if (layer["type"] == "FeatureCollection") {
-        var liste = [];
+        var coords = [];
         var features = layer["features"]
 
         for (var i = 0; i < features.length; i++) {
-            liste.push(features[i]["geometry"]["coordinates"]);
+            coords.push(features[i]["geometry"]["coordinates"]);
         }
-        return liste;
+        return coords;
     }
-}
\ No newline at end of file
+}
+
+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);
+    }
+}