From b1666de16893b9b1187b4542b4de25a795796918 Mon Sep 17 00:00:00 2001
From: jshjelse <jshjelse@stud.ntnu.no>
Date: Mon, 2 Oct 2023 10:27:12 +0200
Subject: [PATCH] Justere innhenting av datalag
---
javascript/buffer.js | 10 ++++++----
javascript/dissolve.js | 7 ++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/javascript/buffer.js b/javascript/buffer.js
index a0c3476..f3a3a59 100644
--- a/javascript/buffer.js
+++ b/javascript/buffer.js
@@ -5,16 +5,18 @@ https://turfjs.org/docs/
function makeBuffer() {
var input = document.getElementById("bufferSelect").value;
- var layer = overlayMaps[input];
+ var layer = overlayMaps[input].toGeoJSON();
var distance = parseFloat(document.getElementById("bufferDistance").value);
var name = document.getElementById("bufferName").value;
try {
- var buffer = turf.buffer(layer.toGeoJSON(), distance, {units: "meters"});
+ var buffer = turf.buffer(layer, distance, {units: "meters"});
if (document.getElementById("bufferCheck").checked) {
- console.log(JSON.stringify(buffer));
- var newLayer = L.geoJSON(turf.dissolve(buffer));
+ console.log(buffer);
+ var dissolved = turf.dissolve(buffer);
+ console.log(dissolved);
+ var newLayer = L.geoJSON(dissolved);
} else {
var newLayer = L.geoJSON(buffer);
}
diff --git a/javascript/dissolve.js b/javascript/dissolve.js
index f8a9373..b7ba504 100644
--- a/javascript/dissolve.js
+++ b/javascript/dissolve.js
@@ -1,14 +1,15 @@
function dissolve() {
var input = document.getElementById("dissolveSelect").value;
- var layer = overlayMaps[input];
+ var layer = overlayMaps[input].toGeoJSON();
var name = document.getElementById("dissolveName").value;
try {
+ console.log(JSON.stringify(layer))
if (layer["type"] == "MultiPolygon") {
layer = multiPolygonToFeatureCollection(layer);
}
-
- var dissolved = turf.dissolve(layer.toGeoJSON());
+
+ var dissolved = turf.dissolve(layer);
var newLayer = L.geoJSON(dissolved);
overlayMaps[name] = newLayer;
--
GitLab