From 9dd0bf1ebf5599f55b0b3d939dfdb165f189d678 Mon Sep 17 00:00:00 2001
From: jshjelse <jshjelse@stud.ntnu.no>
Date: Thu, 28 Sep 2023 19:08:44 +0200
Subject: [PATCH] Fix

---
 javascript/geoJSON.js             | 13 ++++++++-----
 javascript/leafletLayerControl.js | 11 +++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/javascript/geoJSON.js b/javascript/geoJSON.js
index 6466df2..ff9600e 100644
--- a/javascript/geoJSON.js
+++ b/javascript/geoJSON.js
@@ -71,7 +71,10 @@ var layer1 = L.geoJSON(U);
 var layer2 = L.geoJSON(TC);
 */
 
-layer = L.geoJSON().addTo(map);
+layer_Arealdekke = L.geoJSON().addTo(map);
+layer_Bygg_f = L.geoJSON().addTo(map);
+layer_Bygg_l = L.geoJSON().addTo(map);
+layer_Samferdsel = L.geoJSON().addTo(map);
 
 /*
 fetch("javascript/exampleData/Universities.geojson").then(function(response) {
@@ -90,25 +93,25 @@ fetch("javascript/exampleData/TrainingCenters.geojson").then(function(response)
 fetch("javascript/exampleData/Arealdekke_klippa.geojson").then(function(response) {
     return response.json();
 }).then(function(data) {
-    layer.addData(data);
+    layer_Arealdekke.addData(data);
 })
 
 fetch("javascript/exampleData/Bygg&Anlegg_f_klippa.geojson").then(function(response) {
     return response.json();
 }).then(function(data) {
-    layer.addData(data);
+    layer_Bygg_f.addData(data);
 })
 
 fetch("javascript/exampleData/Bygg&Anlegg_l_klippa.geojson").then(function(response) {
     return response.json();
 }).then(function(data) {
-    layer.addData(data);
+    layer_Bygg_l.addData(data);
 })
 
 fetch("javascript/exampleData/Samferdsel_klippa.geojson").then(function(response) {
     return response.json();
 }).then(function(data) {
-    layer.addData(data);
+    layer_Samferdsel.addData(data);
 })
 
 // Hvordan slå av og på et lag:
diff --git a/javascript/leafletLayerControl.js b/javascript/leafletLayerControl.js
index 48e90f0..5358039 100644
--- a/javascript/leafletLayerControl.js
+++ b/javascript/leafletLayerControl.js
@@ -5,12 +5,18 @@ var baselayers = {
     "Satellite": googleSat
 }
 
-var controller = L.control.layers(baselayers).addTo(map);
+var overlayMaps = {
+    "Arealdekke": layer_Arealdekke,
+    "Byggning (f)": layer_Bygg_f,
+    "Byggning (l)": layer_Bygg_l,
+    "Samferdsel": layer_Samferdsel
+}
 
-var overlayMaps = [layer1, layer2];
+var controller = L.control.layers(baselayers, overlayMaps).addTo(map);
 
 // Test:
 
+/*
 for (const i = 0; i < length(overlayMaps); i++) {
     var checkbox = document.createElement("div");
     checkbox.innerHTML += "<input type='checkbox' onchange='handleLayer(layer)' />";
@@ -36,6 +42,7 @@ function handleLayer(layer) {
         map.addLayer(layer);
       }
 }
+*/
 
 /*var htmlObject = controller.getContainer();
 
-- 
GitLab