mirror of
https://github.com/gpxstudio/gpx.studio.git
synced 2026-11-15 07:07:07 +00:00
* wasm first steps * parsing start * parsing continued * progress * progress * progress * progress * progress * progress * progress * progress * fixes * reorganize * change type * fix * progress * refactoring * progress * progress * progress * keep style info * progress * progress * remove (copy) in name * progress * merge methods into 1 * splice * progress * progress * progress * cleaning * progress * progress * progress * visibility * progress * progress * progress * progress * progress * fixes * progress * fix markers * fix * progress * progress * progress * progress * progress * progress * small fix * use engine info * fix popups * small fix * progress * progress * progress * clean tool * handle self closing elements * reduce data exchanges across boundary * copy on wasm side to avoid any data corruption * speed fix * routing * refactoring * reverse * reverse * crop * split * merge * progress * time tool * fix bounds for waypoints * reduce * fix reactivity * handle corrupt time data * export * progress * remove gpx js package * remove todo * update readme * cleaning * progress * fix link fields * remove unused fields * refactoring and tests * import and export of routes, ref #192 * per-chunk categories storage * cross-tab sync * outdated state * refactoring * reorder methods * refactoring * fix * improve flow * renaming * progress * progress * fix * progress * per file history * keep original flag * use history variant * fix * progress * file explorer * progress * fix * sticky folders * improved sticky folders * fix sortable * fix sortable * fix * fix tab size * no file delete on desktop * fix routing on other file * fix sorting * remember language * open links in browser * commit missing changes * avoid selecting on resize * clarify filename * explorer actions * fix folder styling * drop anywhere in folder * cleaning * fixes * remove focus-ring * full screen * small fix * consistent highlight color * improved preview * performance improvements * sparser data transfers * sparser data transfers * show popup once data is loaded * fix routing control size * fix * sparse desktop build * remove custom ign styles * use new endpoint for openhikingmap * strip native menu * reorder context menu items * route full support * route - track conversion * create route file action * route export, filter out anchors at high zoom level * clarify name handling * move hide & center to view * routes continued * update docs * fix power format, closes #378 * lint fixes * fix display of additional data with gaps, closes #361 * fix linting issues * fix import modules * fix multidrag * change base to resolve * fix type errors * fix layer typings * fix last type error * each keys * improve typings * deploy to cloudflare --------- Co-authored-by: vcoppe <vcoppe@hexaly.com>
121 lines
3.4 KiB
Rust
121 lines
3.4 KiB
Rust
use crate::{Apply, CommandError, FileId, Selection, State, WaypointId, delete_waypoints};
|
|
|
|
/// Deletes a waypoint of a file, whatever is selected (what the delete button of its popup does).
|
|
/// If it was the only selected element, its file gets selected.
|
|
#[derive(Debug)]
|
|
pub struct DeleteWaypoint {
|
|
pub file_id: FileId,
|
|
pub waypoint_id: WaypointId,
|
|
}
|
|
|
|
impl Apply for DeleteWaypoint {
|
|
fn apply(self, state: &mut State) -> Result<(), CommandError> {
|
|
delete_waypoints(state.files, self.file_id, |wpt| wpt.id == self.waypoint_id)?;
|
|
if let Selection::Waypoint { file_id, wpt_ids } = &*state.selection
|
|
&& *file_id == self.file_id
|
|
&& wpt_ids.iter().all(|id| *id == self.waypoint_id)
|
|
{
|
|
*state.selection = Selection::File {
|
|
file_ids: [self.file_id].into(),
|
|
};
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::rc::Rc;
|
|
|
|
use crate::{
|
|
File, Selection, Waypoint, WaypointChunk, engine::command::fixture::Fixture, waypoint_ids,
|
|
};
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_deletes_one_waypoint_without_touching_the_selection() {
|
|
let mut fx = Fixture::default();
|
|
let mut file = File::default();
|
|
file.wpt.push(WaypointChunk {
|
|
wpt: (0..3)
|
|
.map(|i| Waypoint {
|
|
name: Some(format!("w{i}")),
|
|
..Default::default()
|
|
})
|
|
.collect(),
|
|
..Default::default()
|
|
});
|
|
let id = file.id;
|
|
let ids: Vec<_> = waypoint_ids(&file).collect();
|
|
fx.files.insert(id, Rc::new(file));
|
|
fx.order.0.push(id);
|
|
fx.selection = Selection::File {
|
|
file_ids: [id].into(),
|
|
};
|
|
|
|
DeleteWaypoint {
|
|
file_id: id,
|
|
waypoint_id: ids[1],
|
|
}
|
|
.apply(&mut fx.state())
|
|
.unwrap();
|
|
|
|
let names: Vec<_> = fx.files[&id]
|
|
.wpt
|
|
.iter()
|
|
.map(|wpt| wpt.name.clone().unwrap())
|
|
.collect();
|
|
assert_eq!(names, ["w0", "w2"]);
|
|
assert_eq!(
|
|
fx.selection,
|
|
Selection::File {
|
|
file_ids: [id].into()
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_deleting_the_selected_waypoint_selects_its_file() {
|
|
let mut fx = Fixture::default();
|
|
let mut file = File::default();
|
|
file.wpt.push(WaypointChunk {
|
|
wpt: vec![Waypoint::default(), Waypoint::default()],
|
|
..Default::default()
|
|
});
|
|
let id = file.id;
|
|
let ids: Vec<_> = waypoint_ids(&file).collect();
|
|
fx.files.insert(id, Rc::new(file));
|
|
fx.selection = Selection::Waypoint {
|
|
file_id: id,
|
|
wpt_ids: [ids[0]].into(),
|
|
};
|
|
DeleteWaypoint {
|
|
file_id: id,
|
|
waypoint_id: ids[0],
|
|
}
|
|
.apply(&mut fx.state())
|
|
.unwrap();
|
|
assert_eq!(
|
|
fx.selection,
|
|
Selection::File {
|
|
file_ids: [id].into()
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_unknown_waypoint_is_nothing_to_do() {
|
|
let mut fx = Fixture::default();
|
|
let file = File::default();
|
|
let id = file.id;
|
|
fx.files.insert(id, Rc::new(file));
|
|
let result = DeleteWaypoint {
|
|
file_id: id,
|
|
waypoint_id: WaypointId::default(),
|
|
}
|
|
.apply(&mut fx.state());
|
|
assert!(matches!(result, Err(CommandError::NothingToDo)));
|
|
}
|
|
}
|