brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiple bug fixes

Browse Source
This commit is contained in:
Christian Beutel
2024-03-17 23:25:01 +01:00
parent eae455112b
commit abecaa4497
16 changed files with 69 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/lib/components/trail/trail_filter_panel.svelte
View File

@@ -201,27 +201,27 @@
<p class="text-sm font-medium pb-4">{$_("distance")}</p>
<DoubleSlider
minValue={filter.distanceMin}
maxValue={filter.distanceMax}
maxValue={filter.distanceLimit}
bind:currentMin={filter.distanceMin}
bind:currentMax={filter.distanceMax}
on:set={() => update()}
></DoubleSlider>
<div class="flex justify-between">
<span>{formatDistance(filter.distanceMin)}</span>
<span>{formatDistance(filter.distanceMax)}</span>
<span>{formatDistance(filter.distanceMax)}{filter.distanceMax == filter.distanceLimit ? '+' : ''}</span>
</div>
<hr class="my-4 border-separator" />
<p class="text-sm font-medium pb-4">{$_("elevation-gain")}</p>
<DoubleSlider
minValue={filter.elevationGainMin}
maxValue={filter.elevationGainMax}
maxValue={filter.elevationGainLimit}
bind:currentMin={filter.elevationGainMin}
bind:currentMax={filter.elevationGainMax}
on:set={() => update()}
></DoubleSlider>
<div class="flex justify-between">
<span>{formatElevation(filter.elevationGainMin)}</span>
<span>{formatElevation(filter.elevationGainMax)}</span>
<span>{formatElevation(filter.elevationGainMax)}{filter.elevationGainMax == filter.elevationGainLimit ? '+' : ''}</span>
</div>
<hr class="my-4 border-separator" />
<p class="text-sm font-medium pb-4">{$_("completed")}</p>

2
web/src/lib/models/trail.ts
View File

@@ -90,8 +90,10 @@ interface TrailFilter {
}
distanceMin: number,
distanceMax: number,
distanceLimit: number,
elevationGainMin: number;
elevationGainMax: number;
elevationGainLimit: number;
completed?: boolean;
sort: "name" | "distance" | "elevation_gain" | "created";
sortOrder: "+" | "-"

28
web/src/lib/stores/trail_store.ts
View File

@@ -34,7 +34,15 @@ export async function trails_index(data: { perPage: number, random?: boolean, f:
}
export async function trails_search_filter(filter: TrailFilter, page: number = 1, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
let filterText: string = `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.elevationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
let filterText: string = `distance >= ${filter.distanceMin} AND elevation_gain >= ${filter.elevationGainMin}`
if (filter.distanceMax < filter.distanceLimit) {
filterText += ` AND distance <= ${filter.distanceMax}`
}
if (filter.elevationGainMax < filter.elevationGainLimit) {
filterText += ` AND elevation_gain <= ${filter.elevationGainMax}`
}
filterText += ` AND difficulty IN [${filter.difficulty.join(",")}]`
@@ -52,7 +60,7 @@ export async function trails_search_filter(filter: TrailFilter, page: number = 1
}
let r = await f("/api/v1/search/trails", {
method: "POST",
body: JSON.stringify({ q: filter.q, options: { filter: filterText, hitsPerPage: 20, page: page } }),
body: JSON.stringify({ q: filter.q, options: { filter: filterText, hitsPerPage: 21, page: page } }),
});
const result = await r.json();
@@ -90,7 +98,15 @@ export async function trails_search_bounding_box(northEast: LatLng, southWest: L
let filterText: string = "";
if (filter) {
filterText += `distance >= ${filter.distanceMin} AND distance <= ${filter.distanceMax} AND elevation_gain >= ${filter.elevationGainMin} AND elevation_gain <= ${filter.elevationGainMax}`;
filterText += `distance >= ${filter.distanceMin} AND elevation_gain >= ${filter.elevationGainMin}`;
if (filter.distanceMax < filter.distanceLimit) {
filterText += ` AND distance <= ${filter.distanceMax}`
}
if (filter.elevationGainMax < filter.elevationGainLimit) {
filterText += ` AND elevation_gain <= ${filter.elevationGainMax}`
}
filterText += ` AND difficulty IN [${filter.difficulty.join(",")}]`
@@ -162,7 +178,7 @@ export async function trails_show(id: string, loadGPX?: boolean, f: (url: Reques
}
if (loadGPX) {
if(!response.expand) {
if (!response.expand) {
response.expand = {}
}
const gpxData: string = await fetchGPX(response, f);
@@ -312,12 +328,12 @@ export async function trails_update(oldTrail: Trail, newTrail: Trail, photos: Fi
export async function trails_delete(trail: Trail) {
if (trail.expand.waypoints) {
for (const waypoint of trail.expand.waypoints) {
waypoints_delete(waypoint);
await waypoints_delete(waypoint);
}
}
if (trail.expand.summit_logs) {
for (const summit_log of trail.expand.summit_logs) {
summit_logs_delete(summit_log);
await summit_logs_delete(summit_log);
}
}

1
web/src/lib/stores/user_store.ts
View File

@@ -16,6 +16,7 @@ export type User = {
export const currentUser: Writable<User | null> = writable<User | null>()
export async function users_create(user: User) {
user.unit = "metric";
const r = await fetch('/api/v1/user', {
method: 'PUT',
body: JSON.stringify({ ...user, passwordConfirm: user.password })

2
web/src/routes/api/v1/search/[index]/+server.ts
View File

@@ -4,7 +4,7 @@ export async function POST(event: RequestEvent) {
const data = await event.request.json()
try {
const r = await event.locals.ms.index(event.params.index as string).search(data.q, data.options);
const r = await event.locals.ms.index(event.params.index as string).search(data.q, data.options);
return json(r);
} catch (e: any) {
console.log(e);

2
web/src/routes/api/v1/trail/+server.ts
View File

@@ -4,7 +4,7 @@ import { error, json, type RequestEvent } from '@sveltejs/kit';
export async function GET(event: RequestEvent) {
const page = event.url.searchParams.get("page") ?? "0";
const perPage = event.url.searchParams.get("per-page") ?? "5";
const perPage = event.url.searchParams.get("per-page") ?? "21";
const expand = event.url.searchParams.get("expand") ?? ""
const sort = event.url.searchParams.get("sort") ?? ""
const filter = event.url.searchParams.get("filter") ?? "";

2
web/src/routes/lists/+page.ts
View File

@@ -12,8 +12,10 @@ export const load: Load = async ({ params, fetch }) => {
},
distanceMin: 0,
distanceMax: 20000,
distanceLimit: 20000,
elevationGainMin: 0,
elevationGainMax: 4000,
elevationGainLimit: 4000,
sort: "created",
sortOrder: "+",
};

2
web/src/routes/map/+page.ts
View File

@@ -13,8 +13,10 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
},
distanceMin: 0,
distanceMax: 20000,
distanceLimit: 20000,
elevationGainMin: 0,
elevationGainMax: 4000,
elevationGainLimit: 4000,
sort: "created",
sortOrder: "+",
};

1
web/src/routes/profile/+page.svelte
View File

@@ -59,6 +59,7 @@
}
async function handleSearchClick(item: SearchItem) {
citySearchQuery = item.text;
await users_update($currentUser!.id, {
location: {
name: item.value.name,

14
web/src/routes/trails/+page.svelte
View File

@@ -4,17 +4,15 @@
import TrailList from "$lib/components/trail/trail_list.svelte";
import type { TrailFilter } from "$lib/models/trail";
import { categories } from "$lib/stores/category_store";
import {
trails,
trails_search_filter,
} from "$lib/stores/trail_store";
import { trails, trails_search_filter } from "$lib/stores/trail_store";
import { onMount } from "svelte";
import { _ } from "svelte-i18n";
let filterExpanded: boolean = true;
const filter: TrailFilter = $page.data.filter;
const pagination: {page: number, totalPages: number} = $page.data.pagination
const pagination: { page: number; totalPages: number } =
$page.data.pagination;
onMount(() => {
if (window.innerWidth < 768) {
@@ -23,8 +21,8 @@
});
async function handleFilterUpdate() {
const response= await trails_search_filter(filter, 1);
pagination.page = response.page
const response = await trails_search_filter(filter, 1);
pagination.page = response.page;
pagination.totalPages = response.totalPages;
}
@@ -50,7 +48,7 @@
<TrailList
{filter}
trails={$trails}
pagination={pagination}
{pagination}
on:update={() => handleFilterUpdate()}
on:pagination={(e) => paginate(e.detail)}
></TrailList>

2
web/src/routes/trails/+page.ts
View File

@@ -13,8 +13,10 @@ export const load: ServerLoad = async ({ params, locals, url, fetch }) => {
},
distanceMin: 0,
distanceMax: 20000,
distanceLimit: 20000,
elevationGainMin: 0,
elevationGainMax: 4000,
elevationGainLimit: 4000,
sort: "created",
sortOrder: "+",
};