From 1286d0ea2a8eae301197ab297f45a468a9c8c211 Mon Sep 17 00:00:00 2001
From: Eli Ribble <eli@gleipnir.technology>
Date: Wed, 22 Apr 2026 15:40:42 +0000
Subject: [PATCH] Fix organization ID for aggregate map

---
 ts/components/MapAggregate.vue | 26 +++++++++++++-------------
 ts/view/Dash.vue               |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ts/components/MapAggregate.vue b/ts/components/MapAggregate.vue
index 9f9153fd..3557715d 100644
--- a/ts/components/MapAggregate.vue
+++ b/ts/components/MapAggregate.vue
@@ -69,26 +69,26 @@ const initializeMap = () => {
 
 	const bounds = _bounds();
 
-	map.value = new maplibregl.Map({
+	const _map = new maplibregl.Map({
 		bounds: bounds,
 		container: mapContainer.value,
 		style: "https://tiles.stadiamaps.com/styles/alidade_smooth.json",
 	});
+	map.value = _map;
 
 	console.log("Initializing map to bounds", bounds);
 	const mapInstance = map.value;
 	if (mapInstance) {
 		map.value.on("load", () => {
-			if (!map.value) return;
-
-			map.value.addSource("tegola", {
+			_map.addSource("tegola", {
 				type: "vector",
 				tiles: [
 					`${props.tegola}maps/nidus/{z}/{x}/{y}?id=${props.organizationId}&organization_id=${props.organizationId}`,
 				],
 			});
+			console.log("Added tegola", props.tegola, props.organizationId);
 
-			map.value.addLayer({
+			_map.addLayer({
 				id: "mosquito_source",
 				type: "fill",
 				filter: [
@@ -104,7 +104,7 @@ const initializeMap = () => {
 				},
 			});
 
-			map.value.addLayer({
+			_map.addLayer({
 				id: "service_request",
 				type: "fill",
 				filter: [
@@ -120,7 +120,7 @@ const initializeMap = () => {
 				},
 			});
 
-			map.value.addLayer({
+			_map.addLayer({
 				id: "trap",
 				type: "fill",
 				filter: [
@@ -136,7 +136,7 @@ const initializeMap = () => {
 				},
 			});
 
-			map.value.addLayer({
+			_map.addLayer({
 				id: "service-area",
 				source: "tegola",
 				"source-layer": "service-area-bounds",
@@ -146,13 +146,13 @@ const initializeMap = () => {
 				},
 			});
 
-			map.value.on("mouseenter", "mosquito_source", () => {
+			_map.on("mouseenter", "mosquito_source", () => {
 				if (map.value) {
 					map.value.getCanvas().style.cursor = "pointer";
 				}
 			});
 
-			map.value.on("mouseleave", "mosquito_source", () => {
+			_map.on("mouseleave", "mosquito_source", () => {
 				if (map.value) {
 					map.value.getCanvas().style.cursor = "";
 				}
@@ -167,9 +167,9 @@ const initializeMap = () => {
 				emit("cell-click", properties.cell);
 			};
 
-			map.value.on("click", "mosquito_source", handleClick);
-			map.value.on("click", "service_request", handleClick);
-			map.value.on("click", "trap", handleClick);
+			_map.on("click", "mosquito_source", handleClick);
+			_map.on("click", "service_request", handleClick);
+			_map.on("click", "trap", handleClick);
 		});
 	}
 };
diff --git a/ts/view/Dash.vue b/ts/view/Dash.vue
index f2934e2c..d5010dbd 100644
--- a/ts/view/Dash.vue
+++ b/ts/view/Dash.vue
@@ -124,7 +124,7 @@
 			<MapAggregate
 				:bounds="mapBounds()"
 				:markers="[]"
-				:organizationId="dashboard.organization.id"
+				:organizationId="session.organization?.id ?? 0"
 				:tegola="session.urls?.tegola ?? ''"
 			/>
 		</div>