diff --git a/frontend/src/routes/adventures/+page.server.ts b/frontend/src/routes/adventures/+page.server.ts
index c93f27d..dd72f87 100644
--- a/frontend/src/routes/adventures/+page.server.ts
+++ b/frontend/src/routes/adventures/+page.server.ts
@@ -109,7 +109,13 @@ export const actions: Actions = {
formDataToSend.append('description', description || '');
formDataToSend.append('latitude', latitude || '');
formDataToSend.append('longitude', longitude || '');
- formDataToSend.append('collection', collection || '');
+
+ if (!isNaN(Number(collection))) {
+ if (collection !== null) {
+ formDataToSend.append('collection', collection);
+ }
+ }
+
if (activity_types) {
// Filter out empty and duplicate activity types, then trim each activity type
const cleanedActivityTypes = Array.from(
@@ -129,6 +135,11 @@ export const actions: Actions = {
formDataToSend.append('link', link || '');
formDataToSend.append('image', image);
+ // log each key-value pair in the FormData
+ for (let pair of formDataToSend.entries()) {
+ console.log(pair[0] + ', ' + pair[1]);
+ }
+
let auth = event.cookies.get('auth');
if (!auth) {
diff --git a/frontend/src/routes/map/+page.server.ts b/frontend/src/routes/map/+page.server.ts
index c355bac..af9352b 100644
--- a/frontend/src/routes/map/+page.server.ts
+++ b/frontend/src/routes/map/+page.server.ts
@@ -33,7 +33,8 @@ export const load = (async (event) => {
return {
lngLat: [adventure.longitude, adventure.latitude] as [number, number],
name: adventure.name,
- type: adventure.type
+ type: adventure.type,
+ collection: adventure.collection
};
});
diff --git a/frontend/src/routes/map/+page.svelte b/frontend/src/routes/map/+page.svelte
index 4cdfd64..ee9d760 100644
--- a/frontend/src/routes/map/+page.svelte
+++ b/frontend/src/routes/map/+page.svelte
@@ -19,6 +19,7 @@
let showVisited = true;
let showPlanned = true;
+ let showCollectionAdventures = false;
$: {
if (!showVisited) {
@@ -33,6 +34,12 @@
const plannedMarkers = data.props.markers.filter((marker) => marker.type === 'planned');
markers = [...markers, ...plannedMarkers];
}
+ if (!showCollectionAdventures) {
+ markers = markers.filter((marker) => marker.collection === null);
+ } else {
+ const collectionMarkers = data.props.markers.filter((marker) => marker.collection !== null);
+ markers = [...markers, ...collectionMarkers];
+ }
}
let newMarker = [];
@@ -117,6 +124,14 @@
Planned
+
{#if newMarker.length > 0}