From b03af2149cafb5c0fb3a670a2c2157fcefc8e41c Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 21 Apr 2024 11:40:04 +0200
Subject: [PATCH] Tweaking map

---
 assets/js/sections/wab.js | 66 ++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/assets/js/sections/wab.js b/assets/js/sections/wab.js
index fda61e918..c44bea1df 100644
--- a/assets/js/sections/wab.js
+++ b/assets/js/sections/wab.js
@@ -18,7 +18,7 @@ $('#band').change(function(){
 var wab_squares = $.ajax({
 	url: base_url+"assets/js/sections/wab_geojson.js",
 	dataType: "json",
-	success: console.log("WAB data successfully loaded."),
+	success: '',
 	error: function(xhr) {
 		alert(xhr.statusText)
 	}
@@ -123,7 +123,7 @@ function wabmap(data) {
 		fullscreenControlOptions: {
 			position: 'topleft'
 		},
-	}).setView([51.5074, -1], 9);
+	}).setView([52, -1], 9);
 
 	var confirmedcount = 0;
 	var workedcount = 0;
@@ -133,26 +133,26 @@ function wabmap(data) {
 	}).addTo(map);
 
 	// Add requested external GeoJSON to map
-	var kywab_squares = L.geoJSON(wab_squares.responseJSON, {
+	var geo_wab_squares = L.geoJSON(wab_squares.responseJSON, {
 		style: function(feature) {
-				if (feature.properties && feature.properties.name) {
-						if (data[feature.properties.name] == 'C') {
-							confirmedcount++;
-							return {
-								fillColor: 'green',
-								fill: true,
-								fillOpacity: 0.8,
-							};
-						}
-						if (data[feature.properties.name] == 'W') {
-							workedcount++;
-							return {
-								fillColor: 'orange',
-								fill: true,
-								fillOpacity: 0.8,
-							};
-						}
+			if (feature.properties && feature.properties.name) {
+				if (data[feature.properties.name] == 'C') {
+					confirmedcount++;
+					return {
+						fillColor: 'green',
+						fill: true,
+						fillOpacity: 0.8,
+					};
 				}
+				if (data[feature.properties.name] == 'W') {
+					workedcount++;
+					return {
+						fillColor: 'orange',
+						fill: true,
+						fillOpacity: 0.8,
+					};
+				}
+			}
 		},
 		pointToLayer: function(feature, latlng) {
 			if (feature.properties && feature.properties.name) {
@@ -162,10 +162,12 @@ function wabmap(data) {
 					html: feature.properties.name
 				});
 
-				// Create a marker at the location of the point
-				return L.marker(latlng, {
+				var sqmarker = L.marker(latlng, {
 					icon: labelIcon
 				});
+
+				// Create a marker at the location of the point
+				return sqmarker;
 			}
 		},
 		onEachFeature: function(feature, layer) {
@@ -178,15 +180,15 @@ function wabmap(data) {
 	// Function to update labels based on zoom level
 	function updateLabels() {
 		var currentZoom = map.getZoom();
-		kywab_squares.eachLayer(function(layer) {
-			if (currentZoom >= 8) {
-				// Show labels if zoom level is 10 or higher
-				layer.getElement().style.display = 'block';
-			} else {
-				// Hide labels if zoom level is less than 10
-				layer.getElement().style.display = 'none';
-			}
-		});
+		if (currentZoom >= 9) {
+			$('.leaflet-marker-icon').show();
+			$('.leaflet-interactive').show();
+		} else if (currentZoom = 8) {
+			$('.leaflet-marker-icon').hide();
+		} else {
+			$('.leaflet-interactive').hide();
+			$('.leaflet-marker-icon').hide();
+		}
 	}
 
 	// Update labels when the map zoom changes
@@ -215,4 +217,4 @@ function wabmap(data) {
     };
 
     legend.addTo(map);
-};
\ No newline at end of file
+};