From f40714ac2ca4ec601cd17fa92da38c0d2fe726ca Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Fri, 9 Aug 2024 09:31:39 -0400
Subject: [PATCH] Fix map filtering bug

---
 frontend/src/routes/collections/[id]/+page.svelte |  2 +-
 frontend/src/routes/map/+page.svelte              | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte
index e78e6b4..41b1e90 100644
--- a/frontend/src/routes/collections/[id]/+page.svelte
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -426,7 +426,7 @@
 		</div>
 	{/if}
 
-	{#if adventures.length == 0 && transportations.length == 0}
+	{#if adventures.length == 0 && transportations.length == 0 && notes.length == 0 && checklists.length == 0}
 		<NotFound error={undefined} />
 	{/if}
 	{#if adventures.length > 0}
diff --git a/frontend/src/routes/map/+page.svelte b/frontend/src/routes/map/+page.svelte
index 3559133..236207b 100644
--- a/frontend/src/routes/map/+page.svelte
+++ b/frontend/src/routes/map/+page.svelte
@@ -22,17 +22,18 @@
 
 	$: {
 		if (!showVisited) {
-			markers = markers.filter((marker) => marker.type !== 'visited');
+			markers = data.props.markers.filter((marker) => marker.type !== 'visited');
 		} else {
 			const visitedMarkers = data.props.markers.filter((marker) => marker.type === 'visited');
 			markers = [...markers, ...visitedMarkers];
 		}
 		if (!showPlanned) {
-			markers = markers.filter((marker) => marker.type !== 'planned');
+			markers = data.props.markers.filter((marker) => marker.type !== 'planned');
 		} else {
 			const plannedMarkers = data.props.markers.filter((marker) => marker.type === 'planned');
 			markers = [...markers, ...plannedMarkers];
 		}
+		console.log(markers);
 	}
 
 	let newMarker = [];
@@ -55,15 +56,6 @@
 	}
 
 	function createNewAdventure(event) {
-		// markers = visited
-		// 		.filter((adventure) => adventure.latitude !== null && adventure.longitude !== null)
-		// 		.map((adventure) => {
-		// 			return {
-		// 				lngLat: [adventure.longitude, adventure.latitude] as [number, number],
-		// 				name: adventure.name,
-		// 				type: adventure.type
-		// 			};
-		// 		});
 		console.log(event.detail);
 
 		let newMarker = {