steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-11-04 21:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

update selection on file removal

Browse Source
This commit is contained in:
vcoppe
2025-10-18 00:46:59 +02:00
parent de81a8940e
commit 4ae0bc25c2
3 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/src/lib/logic/file-action-manager.ts
View File

@@ -15,6 +15,7 @@ import {
type Unsubscriber, type Unsubscriber,
type Writable, type Writable,
} from 'svelte/store'; } from 'svelte/store';
import { selection } from '$lib/logic/selection';
const MAX_PATCHES = 100; const MAX_PATCHES = 100;
@@ -150,7 +151,7 @@ export class FileActionManager {
.filter((file) => file !== undefined) as GPXFile[]; .filter((file) => file !== undefined) as GPXFile[];
updatedFileIds = updatedFiles.map((file) => file._data.id); updatedFileIds = updatedFiles.map((file) => file._data.id);
// updateSelection(updatedFiles, deletedFileIds); selection.update(updatedFiles, deletedFileIds);
// @ts-ignore // @ts-ignore
return db.transaction('rw', db.fileids, db.files, async () => { return db.transaction('rw', db.fileids, db.files, async () => {

201
website/src/lib/logic/file-actions.ts
View File

@@ -28,6 +28,7 @@ import {
type WaypointType, type WaypointType,
} from 'gpx'; } from 'gpx';
import { get } from 'svelte/store'; import { get } from 'svelte/store';
import { settings } from '$lib/logic/settings';
// Generate unique file ids, different from the ones in the database // Generate unique file ids, different from the ones in the database
export function getFileIds(n: number) { export function getFileIds(n: number) {
@@ -67,7 +68,7 @@ export function createFile() {
fileActions.add(file); fileActions.add(file);
// selectFileWhenLoaded(file._data.id); // selectFileWhenLoaded(file._data.id);
tool.current = Tool.ROUTING; currentTool.set(Tool.ROUTING);
} }
export function triggerFileInput() { export function triggerFileInput() {
@@ -143,59 +144,59 @@ export const fileActions = {
return ids; return ids;
}, },
duplicateSelection: () => { duplicateSelection: () => {
// if (get(selection).size === 0) { if (get(selection).size === 0) {
// return; return;
// } }
// fileActionManager.applyGlobal((draft) => { fileActionManager.applyGlobal((draft) => {
// let ids = getFileIds(get(settings.fileOrder).length); let ids = getFileIds(get(settings.fileOrder).length);
// let index = 0; let index = 0;
// applyToOrderedSelectedItemsFromFile((fileId, level, items) => { selection.applyToOrderedSelectedItemsFromFile((fileId, level, items) => {
// if (level === ListLevel.FILE) { if (level === ListLevel.FILE) {
// let file = getFile(fileId); let file = fileStateCollection.getFile(fileId);
// if (file) { if (file) {
// let newFile = file.clone(); let newFile = file.clone();
// newFile._data.id = ids[index++]; newFile._data.id = ids[index++];
// draft.set(newFile._data.id, freeze(newFile)); draft.set(newFile._data.id, freeze(newFile));
// } }
// } else { } else {
// let file = draft.get(fileId); let file = draft.get(fileId);
// if (file) { if (file) {
// if (level === ListLevel.TRACK) { if (level === ListLevel.TRACK) {
// for (let item of items) { for (let item of items) {
// let trackIndex = (item as ListTrackItem).getTrackIndex(); let trackIndex = (item as ListTrackItem).getTrackIndex();
// file.replaceTracks(trackIndex + 1, trackIndex, [ file.replaceTracks(trackIndex + 1, trackIndex, [
// file.trk[trackIndex].clone(), file.trk[trackIndex].clone(),
// ]); ]);
// } }
// } else if (level === ListLevel.SEGMENT) { } else if (level === ListLevel.SEGMENT) {
// for (let item of items) { for (let item of items) {
// let trackIndex = (item as ListTrackSegmentItem).getTrackIndex(); let trackIndex = (item as ListTrackSegmentItem).getTrackIndex();
// let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex(); let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex();
// file.replaceTrackSegments( file.replaceTrackSegments(
// trackIndex, trackIndex,
// segmentIndex + 1, segmentIndex + 1,
// segmentIndex, segmentIndex,
// [file.trk[trackIndex].trkseg[segmentIndex].clone()] [file.trk[trackIndex].trkseg[segmentIndex].clone()]
// ); );
// } }
// } else if (level === ListLevel.WAYPOINTS) { } else if (level === ListLevel.WAYPOINTS) {
// file.replaceWaypoints( file.replaceWaypoints(
// file.wpt.length, file.wpt.length,
// file.wpt.length - 1, file.wpt.length - 1,
// file.wpt.map((wpt) => wpt.clone()) file.wpt.map((wpt) => wpt.clone())
// ); );
// } else if (level === ListLevel.WAYPOINT) { } else if (level === ListLevel.WAYPOINT) {
// for (let item of items) { for (let item of items) {
// let waypointIndex = (item as ListWaypointItem).getWaypointIndex(); let waypointIndex = (item as ListWaypointItem).getWaypointIndex();
// file.replaceWaypoints(waypointIndex + 1, waypointIndex, [ file.replaceWaypoints(waypointIndex + 1, waypointIndex, [
// file.wpt[waypointIndex].clone(), file.wpt[waypointIndex].clone(),
// ]); ]);
// } }
// } }
// } }
// } }
// }); });
// }); });
}, },
addNewTrack: (fileId: string) => { addNewTrack: (fileId: string) => {
fileActionManager.applyToFile(fileId, (file) => fileActionManager.applyToFile(fileId, (file) =>
@@ -801,44 +802,44 @@ export const fileActions = {
// }); // });
}, },
deleteSelection: () => { deleteSelection: () => {
// if (get(selection).size === 0) { if (get(selection).size === 0) {
// return; return;
// } }
// applyGlobal((draft) => { fileActionManager.applyGlobal((draft) => {
// applyToOrderedSelectedItemsFromFile((fileId, level, items) => { selection.applyToOrderedSelectedItemsFromFile((fileId, level, items) => {
// if (level === ListLevel.FILE) { if (level === ListLevel.FILE) {
// draft.delete(fileId); draft.delete(fileId);
// } else { } else {
// let file = draft.get(fileId); let file = draft.get(fileId);
// if (file) { if (file) {
// if (level === ListLevel.TRACK) { if (level === ListLevel.TRACK) {
// for (let item of items) { for (let item of items) {
// let trackIndex = (item as ListTrackItem).getTrackIndex(); let trackIndex = (item as ListTrackItem).getTrackIndex();
// file.replaceTracks(trackIndex, trackIndex, []); file.replaceTracks(trackIndex, trackIndex, []);
// } }
// } else if (level === ListLevel.SEGMENT) { } else if (level === ListLevel.SEGMENT) {
// for (let item of items) { for (let item of items) {
// let trackIndex = (item as ListTrackSegmentItem).getTrackIndex(); let trackIndex = (item as ListTrackSegmentItem).getTrackIndex();
// let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex(); let segmentIndex = (item as ListTrackSegmentItem).getSegmentIndex();
// file.replaceTrackSegments( file.replaceTrackSegments(
// trackIndex, trackIndex,
// segmentIndex, segmentIndex,
// segmentIndex, segmentIndex,
// [] []
// ); );
// } }
// } else if (level === ListLevel.WAYPOINTS) { } else if (level === ListLevel.WAYPOINTS) {
// file.replaceWaypoints(0, file.wpt.length - 1, []); file.replaceWaypoints(0, file.wpt.length - 1, []);
// } else if (level === ListLevel.WAYPOINT) { } else if (level === ListLevel.WAYPOINT) {
// for (let item of items) { for (let item of items) {
// let waypointIndex = (item as ListWaypointItem).getWaypointIndex(); let waypointIndex = (item as ListWaypointItem).getWaypointIndex();
// file.replaceWaypoints(waypointIndex, waypointIndex, []); file.replaceWaypoints(waypointIndex, waypointIndex, []);
// } }
// } }
// } }
// } }
// }); });
// }); });
}, },
addElevationToSelection: async (map: mapboxgl.Map) => { addElevationToSelection: async (map: mapboxgl.Map) => {
// if (get(selection).size === 0) { // if (get(selection).size === 0) {
@@ -909,14 +910,14 @@ export const fileActions = {
// }); // });
}, },
deleteSelectedFiles: () => { deleteSelectedFiles: () => {
// if (get(selection).size === 0) { if (get(selection).size === 0) {
// return; return;
// } }
// applyGlobal((draft) => { fileActionManager.applyGlobal((draft) => {
// applyToOrderedSelectedItemsFromFile((fileId, level, items) => { selection.applyToOrderedSelectedItemsFromFile((fileId, level, items) => {
// draft.delete(fileId); draft.delete(fileId);
// }); });
// }); });
}, },
deleteAllFiles: () => { deleteAllFiles: () => {
fileActionManager.applyGlobal((draft) => { fileActionManager.applyGlobal((draft) => {

109
website/src/lib/logic/selection.ts
View File

@@ -9,7 +9,7 @@ import {
sortItems, sortItems,
ListWaypointsItem, ListWaypointsItem,
} from '$lib/components/file-list/file-list'; } from '$lib/components/file-list/file-list';
import { fileStateCollection } from '$lib/logic/file-state'; import { fileStateCollection, GPXFileStateCollectionObserver } from '$lib/logic/file-state';
import { settings } from '$lib/logic/settings'; import { settings } from '$lib/logic/settings';
import type { GPXFile } from 'gpx'; import type { GPXFile } from 'gpx';
import { get, writable, type Readable, type Writable } from 'svelte/store'; import { get, writable, type Readable, type Writable } from 'svelte/store';
@@ -111,60 +111,59 @@ export class Selection {
} }
update(updatedFiles: GPXFile[], deletedFileIds: string[]) { update(updatedFiles: GPXFile[], deletedFileIds: string[]) {
// TODO do it the other way around: get all selected items, and check if they still exist? let removedItems: ListItem[] = [];
// let removedItems: ListItem[] = []; applyToOrderedItemsFromFile(get(this._selection).getSelected(), (fileId, level, items) => {
// applyToOrderedItemsFromFile(selection.value.getSelected(), (fileId, level, items) => { let file = updatedFiles.find((file) => file._data.id === fileId);
// let file = updatedFiles.find((file) => file._data.id === fileId); if (file) {
// if (file) { items.forEach((item) => {
// items.forEach((item) => { if (item instanceof ListTrackItem) {
// if (item instanceof ListTrackItem) { let newTrackIndex = file.trk.findIndex(
// let newTrackIndex = file.trk.findIndex( (track) => track._data.trackIndex === item.getTrackIndex()
// (track) => track._data.trackIndex === item.getTrackIndex() );
// ); if (newTrackIndex === -1) {
// if (newTrackIndex === -1) { removedItems.push(item);
// removedItems.push(item); }
// } } else if (item instanceof ListTrackSegmentItem) {
// } else if (item instanceof ListTrackSegmentItem) { let newTrackIndex = file.trk.findIndex(
// let newTrackIndex = file.trk.findIndex( (track) => track._data.trackIndex === item.getTrackIndex()
// (track) => track._data.trackIndex === item.getTrackIndex() );
// ); if (newTrackIndex === -1) {
// if (newTrackIndex === -1) { removedItems.push(item);
// removedItems.push(item); } else {
// } else { let newSegmentIndex = file.trk[newTrackIndex].trkseg.findIndex(
// let newSegmentIndex = file.trk[newTrackIndex].trkseg.findIndex( (segment) => segment._data.segmentIndex === item.getSegmentIndex()
// (segment) => segment._data.segmentIndex === item.getSegmentIndex() );
// ); if (newSegmentIndex === -1) {
// if (newSegmentIndex === -1) { removedItems.push(item);
// removedItems.push(item); }
// } }
// } } else if (item instanceof ListWaypointItem) {
// } else if (item instanceof ListWaypointItem) { let newWaypointIndex = file.wpt.findIndex(
// let newWaypointIndex = file.wpt.findIndex( (wpt) => wpt._data.index === item.getWaypointIndex()
// (wpt) => wpt._data.index === item.getWaypointIndex() );
// ); if (newWaypointIndex === -1) {
// if (newWaypointIndex === -1) { removedItems.push(item);
// removedItems.push(item); }
// } }
// } });
// }); } else if (deletedFileIds.includes(fileId)) {
// } else if (deletedFileIds.includes(fileId)) { items.forEach((item) => {
// items.forEach((item) => { removedItems.push(item);
// removedItems.push(item); });
// }); }
// } });
// }); if (removedItems.length > 0) {
// if (removedItems.length > 0) { this._selection.update(($selection) => {
// selection.update(($selection) => { removedItems.forEach((item) => {
// removedItems.forEach((item) => { if (item instanceof ListFileItem) {
// if (item instanceof ListFileItem) { $selection.deleteChild(item.getFileId());
// $selection.deleteChild(item.getFileId()); } else {
// } else { $selection.set(item, false);
// $selection.set(item, false); }
// } });
// }); return $selection;
// return $selection; });
// }); }
// }
} }
getOrderedSelection(reverse: boolean = false): ListItem[] { getOrderedSelection(reverse: boolean = false): ListItem[] {