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

fixes waypoint move after save bug

Browse Source
This commit is contained in:
Christian Beutel
2024-12-05 01:17:51 +01:00
parent a39c880272
commit 8adaa52f81
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/lib/components/trail/map_with_elevation_maplibre.svelte
View File

@@ -31,6 +31,9 @@
export let showFullscreen: boolean = false;
export let showTerrain: boolean = false;
export let fitBounds: "animate" | "instant" | "off" = "instant";
export let onMarkerDragEnd:
| ((marker: M.Marker, wpId?: string) => void)
| undefined = undefined;
export let elevationProfileContainer: string | HTMLDivElement | undefined =
undefined;
@@ -488,7 +491,7 @@
return;
}
for (const waypoint of trails[activeTrail]?.expand.waypoints ?? []) {
const marker = createMarkerFromWaypoint(waypoint);
const marker = createMarkerFromWaypoint(waypoint, onMarkerDragEnd);
marker.addTo(map);
markers.push(marker);
}

4
web/src/lib/util/maplibre_util.ts
View File

@@ -23,7 +23,7 @@ export class FontawesomeMarker extends M.Marker {
}
}
export function createMarkerFromWaypoint(waypoint: Waypoint, onDragEnd?: (marker: M.Marker) => void): FontawesomeMarker {
export function createMarkerFromWaypoint(waypoint: Waypoint, onDragEnd?: (marker: M.Marker, wpId?: string) => void): FontawesomeMarker {
const marker = new FontawesomeMarker({
icon: `fa fa-${waypoint.icon}`,
}, {
@@ -44,7 +44,7 @@ export function createMarkerFromWaypoint(waypoint: Waypoint, onDragEnd?: (marker
.setPopup(popup)
if (onDragEnd) {
marker.on("dragend", () => onDragEnd(marker));
marker.on("dragend", () => onDragEnd(marker, waypoint.id,));
}
return marker;

29
web/src/routes/trail/edit/[id]/+page.svelte
View File

@@ -387,23 +387,26 @@
savedWaypoint.id = cryptoRandomString({ length: 15 });
$form.expand.waypoints = [...$form.expand.waypoints, savedWaypoint];
}
const marker = createMarkerFromWaypoint(savedWaypoint, (event) => {
var marker = event;
var position = marker.getLngLat();
const editableWaypointIndex = $form.expand.waypoints.findIndex(
(w) => w.id == savedWaypoint.id,
);
const editableWaypoint =
$form.expand.waypoints[editableWaypointIndex];
editableWaypoint!.lat = position.lat;
editableWaypoint!.lon = position.lng;
$form.expand.waypoints = [...$form.expand.waypoints];
});
const marker = createMarkerFromWaypoint(savedWaypoint, moveMarker);
marker.addTo(map);
savedWaypoint.marker = marker;
}
function moveMarker(marker: M.Marker, wpId?: string) {
const position = marker.getLngLat();
const editableWaypointIndex = $form.expand.waypoints.findIndex(
(w) => w.id == wpId,
);
const editableWaypoint = $form.expand.waypoints[editableWaypointIndex];
if (!editableWaypoint) {
return;
}
editableWaypoint.lat = position.lat;
editableWaypoint.lon = position.lng;
$form.expand.waypoints = [...$form.expand.waypoints];
}
function beforeSummitLogModalOpen() {
summitLog.set(new SummitLog(new Date().toISOString().split("T")[0]));
openSummitLogModal();
@@ -903,6 +906,8 @@
<MapWithElevationMaplibre
trails={mapTrail}
drawing={drawingActive}
showTerrain={true}
onMarkerDragEnd={moveMarker}
bind:map
on:click={(e) => handleMapClick(e.detail)}
></MapWithElevationMaplibre>