Merge branch 'dev' into 'main'

Dev

See merge request !42

javascript/buffer.js

@@ -18,9 +18,9 @@ function makeBuffer() {
 
         if (document.getElementById("bufferCheck").checked) {
             var dissolved = turf.dissolve(buffer);
-            var newLayer = L.geoJSON(dissolved);
+            var newLayer = L.geoJSON(dissolved, {style: getStyle()});
         } else {
-            var newLayer = L.geoJSON(buffer);
+            var newLayer = L.geoJSON(buffer, {style: getStyle()});
         }
         
         overlayMaps[name] = newLayer;

javascript/difference.js

@@ -14,7 +14,7 @@ function difference() {
 
     try {
         var difference = turf.difference(multiPolygon1, multiPolygon2);
-        var newLayer = L.geoJSON(difference);
+        var newLayer = L.geoJSON(difference, {style: getStyle()});
         
         overlayMaps[name] = newLayer;
 

javascript/dissolve.js

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

javascript/geoJSON.js

@@ -72,11 +72,6 @@ var TC = {
 var test1 = L.geoJSON(U, {style: getStyle()});
 var test2 = L.geoJSON(TC, {style: getStyle()});
 
-//addMapLayer(test1, U);
-//addMapLayer(test2, TC);
-//test1.addData(U);
-//test2.addData(TC);
-
 // Det jeg skal ha med i ferdig versjon:
 
 var Arealdekke = L.geoJSON(null, {style: getStyle()});

javascript/intersect.js

@@ -14,7 +14,7 @@ function intersection() {
     
     try {
         var intersection = turf.intersect(multiPolygon1, multiPolygon2);
-        var newLayer = new L.GeoJSON(intersection);
+        var newLayer = new L.GeoJSON(intersection, {style: getStyle()});
         
         overlayMaps[name] = newLayer;
 

javascript/union.js

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