From c875481d7d8fbcc2255167aeb5d576f67bd01a97 Mon Sep 17 00:00:00 2001
From: jshjelse <jshjelse@stud.ntnu.no>
Date: Tue, 3 Oct 2023 10:45:35 +0200
Subject: [PATCH] Ferdig!
---
javascript/buffer.js | 4 ++--
javascript/difference.js | 2 +-
javascript/dissolve.js | 2 +-
javascript/geoJSON.js | 5 -----
javascript/intersect.js | 2 +-
javascript/union.js | 2 +-
6 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/javascript/buffer.js b/javascript/buffer.js
index f8bc8e2..63abc67 100644
--- a/javascript/buffer.js
+++ b/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;
diff --git a/javascript/difference.js b/javascript/difference.js
index 2574e2d..6be0cad 100644
--- a/javascript/difference.js
+++ b/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;
diff --git a/javascript/dissolve.js b/javascript/dissolve.js
index 53e36a0..d96954c 100644
--- a/javascript/dissolve.js
+++ b/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;
diff --git a/javascript/geoJSON.js b/javascript/geoJSON.js
index dc3abf4..f75cd9c 100644
--- a/javascript/geoJSON.js
+++ b/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()});
diff --git a/javascript/intersect.js b/javascript/intersect.js
index 0d5aa42..d403852 100644
--- a/javascript/intersect.js
+++ b/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;
diff --git a/javascript/union.js b/javascript/union.js
index e3ae366..0237cc4 100644
--- a/javascript/union.js
+++ b/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;
--
GitLab