progress

gpx-rs/engine/src/core/gpx/categories.rs

@@ -3,7 +3,7 @@
 ///
 /// The codes are the positions of the names in the order of first appearance. The table only
 /// grows: a code never changes meaning, so it stays valid in every state of the history.
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct Categories(Vec<String>);
 
 impl Categories {
@@ -36,7 +36,7 @@ impl Categories {
 
 /// The categories of the data of the trackpoints. There is one table per engine, shared by all
 /// its files.
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct TrackpointCategories {
     pub surface: Categories,
     pub highway: Categories,

gpx-rs/engine/src/core/gpx/chunk.rs

@@ -5,8 +5,8 @@ use crate::{Trackpoint, Waypoint};
 /// A run of items, shared between the successive versions of a [`crate::Chunked`] list: a chunk
 /// that is not touched by an edit is not copied.
 ///
-/// Chunks are equal when they have the same identity, which is cheap to compare and changes
-/// whenever the content does (a modified chunk is a new one).
+/// A chunk has an identity, which changes whenever the content does (a modified chunk is a new
+/// one): what is derived from a chunk, or kept of it, is up to date as long as the identity is.
 pub trait Chunk {
     type Item: Clone;
 
@@ -27,8 +27,8 @@ pub trait Chunk {
 
 const MAX_TRKPT_CHUNK_SIZE: usize = 4096;
 
-#[derive(Debug, PartialEq, Eq)]
-pub struct TrackpointChunkId(Uuid);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+pub struct TrackpointChunkId(pub Uuid);
 
 impl Default for TrackpointChunkId {
     fn default() -> Self {
@@ -42,12 +42,6 @@ pub struct TrackpointChunk {
     pub trkpt: Vec<Trackpoint>,
 }
 
-impl PartialEq for TrackpointChunk {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
 impl Chunk for TrackpointChunk {
     type Item = Trackpoint;
     const MAX_SIZE: usize = MAX_TRKPT_CHUNK_SIZE;
@@ -68,8 +62,8 @@ impl Chunk for TrackpointChunk {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct WaypointChunkId(Uuid);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+pub struct WaypointChunkId(pub Uuid);
 
 impl Default for WaypointChunkId {
     fn default() -> Self {
@@ -85,12 +79,6 @@ pub struct WaypointChunk {
     pub wpt: Vec<Waypoint>,
 }
 
-impl PartialEq for WaypointChunk {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
 impl Chunk for WaypointChunk {
     type Item = Waypoint;
     const MAX_SIZE: usize = MAX_WPT_CHUNK_SIZE;
@@ -141,20 +129,8 @@ mod tests {
     fn test_new_chunks_have_their_own_identity() {
         let a = TrackpointChunk::new(vec![Trackpoint::default()]);
         let b = TrackpointChunk::new(vec![Trackpoint::default()]);
-        assert_ne!(a, b);
+        assert_ne!(a.id, b.id);
         assert_eq!(a.items().len(), 1);
-        assert_ne!(WaypointChunk::new(vec![]), WaypointChunk::new(vec![]));
-    }
-
-    #[test]
-    fn test_chunk_equality_is_by_id() {
-        let a = TrackpointChunk::default();
-        let b = TrackpointChunk::default();
-        assert_ne!(a, b);
-        let c = TrackpointChunk {
-            id: TrackpointChunkId(a.id.0),
-            trkpt: vec![Trackpoint::default()],
-        };
-        assert_eq!(a, c);
+        assert_ne!(WaypointChunk::new(vec![]).id, WaypointChunk::new(vec![]).id);
     }
 }

gpx-rs/engine/src/core/gpx/chunked.rs

@@ -6,7 +6,7 @@ use crate::Chunk;
 /// copies the chunks around the change, so that a version costs little more than the change.
 ///
 /// There are no empty chunks.
-#[derive(Debug, PartialEq)]
+#[derive(Debug)]
 pub struct Chunked<C: Chunk> {
     chunks: Vec<Rc<C>>,
     cumul_length: Vec<usize>,

gpx-rs/engine/src/core/gpx/common.rs

@@ -1,10 +1,10 @@
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct Link {
     pub href: String,
     pub text: Option<String>,
 }
 
-#[derive(Debug, Default, Clone, Copy)]
+#[derive(Debug, Default, Clone, Copy, serde::Serialize, serde::Deserialize)]
 pub struct LngLat {
     pub lng: f64,
     pub lat: f64,

gpx-rs/engine/src/core/gpx/file.rs

@@ -2,7 +2,7 @@ use uuid::Uuid;
 
 use crate::{Link, Track, Waypoints};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct FileId(pub Uuid);
 
 impl Default for FileId {
@@ -11,16 +11,15 @@ impl Default for FileId {
     }
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone)]
 pub struct File {
     pub id: FileId,
     pub info: FileInfo,
     pub trk: Vec<Track>,
     pub wpt: Waypoints,
-    // TODO routes
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct FileInfo {
     pub name: String,
     pub desc: Option<String>,
@@ -29,7 +28,7 @@ pub struct FileInfo {
     pub time: Option<i64>,
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct Author {
     pub name: Option<String>,
     pub email: Option<String>,

gpx-rs/engine/src/core/gpx/segment.rs

@@ -4,7 +4,7 @@ use uuid::Uuid;
 
 use crate::{ChunkIndex, Chunked, ChunkedIter, Trackpoint, TrackpointChunk, compute_anchors};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct TrackSegmentId(pub Uuid);
 
 impl Default for TrackSegmentId {
@@ -22,7 +22,7 @@ impl Default for TrackSegmentRevisionId {
     }
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone)]
 pub struct TrackSegment {
     pub id: TrackSegmentId,
     pub rev_id: TrackSegmentRevisionId,

gpx-rs/engine/src/core/gpx/track.rs

@@ -2,7 +2,7 @@ use uuid::Uuid;
 
 use crate::{Link, TrackSegment};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct TrackId(pub Uuid);
 
 impl Default for TrackId {
@@ -11,14 +11,14 @@ impl Default for TrackId {
     }
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone)]
 pub struct Track {
     pub id: TrackId,
     pub info: TrackInfo,
     pub trkseg: Vec<TrackSegment>,
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct TrackInfo {
     pub name: Option<String>,
     pub cmt: Option<String>,

gpx-rs/engine/src/core/gpx/trackpoint.rs

@@ -1,6 +1,6 @@
 use crate::LngLat;
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Trackpoint {
     pub coordinates: LngLat,
     pub ele: f64,

gpx-rs/engine/src/core/gpx/waypoint.rs

@@ -2,7 +2,7 @@ use uuid::Uuid;
 
 use crate::{Link, LngLat};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct WaypointId(pub Uuid);
 
 impl Default for WaypointId {
@@ -11,7 +11,7 @@ impl Default for WaypointId {
     }
 }
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize)]
 pub struct Waypoint {
     pub id: WaypointId,
     pub coordinates: LngLat,

gpx-rs/engine/src/core/gpx/waypoints.rs

@@ -19,7 +19,7 @@ impl Default for FileWaypointsRevisionId {
 /// Everything that changes the waypoints changes the revision too, which is why there is no
 /// mutable access to the list itself: the revision tells what is derived from the waypoints
 /// (coordinates for the map...) that it is out of date.
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone)]
 pub struct Waypoints {
     chunks: Chunked<WaypointChunk>,
     /// Changes when the waypoints do.
@@ -50,6 +50,12 @@ impl Waypoints {
         self.rev_id = Default::default();
     }
 
+    /// Adds a chunk that is shared with something else after the last waypoint.
+    pub fn push_shared(&mut self, chunk: std::rc::Rc<WaypointChunk>) {
+        self.chunks.push_shared(chunk);
+        self.rev_id = Default::default();
+    }
+
     /// Replaces the waypoints in `start..end` by `waypoints`, see [`Chunked::splice`].
     pub fn splice(&mut self, start: usize, end: usize, waypoints: Vec<Waypoint>) {
         self.chunks.splice(start, end, waypoints);