Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-23 14:59:36 +02:00
Code Issues Releases Activity

Auto mark regions

Browse source
This commit is contained in:
Sean Morley 2024-08-23 14:08:04 -04:00
parent 45196f9823
commit b11c3de461
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/server/worldtravel/views.py
View file

@ -46,7 +46,7 @@ class CountryViewSet(viewsets.ReadOnlyModelViewSet):
region = Region.objects.filter(geometry__contains=point).first()
if region:
return Response({'in_region': True, 'region_name': region.name})
return Response({'in_region': True, 'region_name': region.name, 'region_id': region.id})
else:
return Response({'in_region': False})

34
frontend/src/lib/components/AdventureModal.svelte
View file

@ -29,6 +29,9 @@
let noPlaces: boolean = false;
let region_name: string | null = null;
let region_id: string | null = null;
let adventure: Adventure = {
id: '',
name: '',
@ -274,7 +277,7 @@
}
}
function addMarker(e: CustomEvent<any>) {
async function addMarker(e: CustomEvent<any>) {
markers = [];
markers = [
...markers,
@ -285,6 +288,19 @@
activity_type: ''
}
];
let res = await fetch(
`/api/countries/check_point_in_region/?lat=${e.detail.lngLat.lat}&lon=${e.detail.lngLat.lng}`
);
let data = await res.json();
if (data.error) {
addToast('error', data.error);
} else {
if (data.in_region) {
region_name = data.region_name;
region_id = data.region_id;
}
}
console.log(markers);
}
@ -308,6 +324,19 @@
async function handleSubmit(event: Event) {
event.preventDefault();
if (region_id && region_name) {
let res = await fetch(`/api/visitedregion/`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ region: region_id })
});
if (res.ok) {
addToast('success', `Region ${region_name} marked as visited`);
}
}
if (adventure.date && adventure.end_date) {
if (new Date(adventure.date) > new Date(adventure.end_date)) {
addToast('error', 'Start date must be before end date');
@ -655,6 +684,9 @@ it would also work to just use on:click on the MapLibre component itself. -->
{/each}
</MapLibre>
</div>
{#if region_name}
<p class="text-lg font-semibold mt-2">Region: {region_name} ({region_id})</p>
{/if}
<div class="mt-4">
<button type="submit" class="btn btn-primary">Save & Next</button>