reorganize

gpx-rs/src/action/action.rs

@@ -1,5 +0,0 @@
-use crate::state::StackEntry;
-
-pub trait Action {
-    fn apply(entry: &mut StackEntry) -> Result<(), &'static str>;
-}

gpx-rs/src/action/file.rs

@@ -1 +0,0 @@
-use crate::action::Action;

gpx-rs/src/action/mod.rs

@@ -1,5 +0,0 @@
-mod action;
-mod file;
-
-pub use action::*;
-pub use file::*;

gpx-rs/src/buffer/coordinates.rs

@@ -1,4 +0,0 @@
-pub struct CoordinatesBuffer {
-    pub lng: Vec<f64>,
-    pub lat: Vec<f64>,
-}

gpx-rs/src/buffer/mod.rs

@@ -1,5 +0,0 @@
-mod coordinates;
-mod statistics;
-
-pub use coordinates::*;
-pub use statistics::*;

gpx-rs/src/core/algorithm/simplify.rs

@@ -1,6 +1,6 @@
 use crate::{
-    gpx::{TrackSegment, TrackSegmentIndex},
-    utils::crossarc,
+    core::gpx::{TrackSegment, TrackSegmentIndex},
+    core::utils::crossarc,
 };
 
 pub fn ramer_douglas_peucker<F>(

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

@@ -1,6 +1,6 @@
 use uuid::Uuid;
 
-use crate::gpx::{Trackpoint, Waypoint};
+use crate::{Trackpoint, Waypoint};
 
 static MAX_TRKPT_CHUNK_SIZE: usize = 4096;
 

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

@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use uuid::Uuid;
 
-use crate::gpx::{Link, Track, WaypointChunk};
+use crate::{Link, Track, WaypointChunk};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct FileId(pub Uuid);

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

@@ -2,7 +2,7 @@ use std::{ops::Index, rc::Rc};
 
 use uuid::Uuid;
 
-use crate::gpx::{Trackpoint, TrackpointChunk};
+use crate::{Trackpoint, TrackpointChunk};
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub struct TrackSegmentId(Uuid);
@@ -174,8 +174,6 @@ impl<'a> Iterator for TrackSegmentIterator<'a> {
 
 #[cfg(test)]
 mod tests {
-    use crate::gpx::TrackpointChunk;
-
     use super::*;
 
     fn create_track_segment(nb_chunks: usize) -> TrackSegment {

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

@@ -1,6 +1,6 @@
 use uuid::Uuid;
 
-use crate::gpx::{Link, TrackSegment};
+use crate::{Link, TrackSegment};
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub struct TrackId(Uuid);

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

@@ -1,4 +1,4 @@
-use crate::gpx::LngLat;
+use crate::LngLat;
 
 #[derive(Debug, Default)]
 pub struct Trackpoint {

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

@@ -1,6 +1,6 @@
 use uuid::Uuid;
 
-use crate::gpx::{Link, LngLat};
+use crate::{Link, LngLat};
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct WaypointId(Uuid);

gpx-rs/src/core/io/parse.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use crate::gpx::{
+use crate::{
     Author, File, Link, LngLat, Track, TrackSegment, Trackpoint, TrackpointChunk, Waypoint,
     WaypointChunk,
 };

gpx-rs/src/core/mod.rs

@@ -0,0 +1,11 @@
+mod algorithm;
+pub(crate) mod gpx;
+mod io;
+pub(crate) mod statistics;
+mod utils;
+
+pub use algorithm::*;
+pub use gpx::*;
+pub use io::*;
+pub use statistics::*;
+pub use utils::*;

gpx-rs/src/core/statistics/mod.rs

@@ -1,7 +1,5 @@
-mod cache;
 mod statistics;
 mod utils;
 
-pub use cache::*;
 pub use statistics::*;
 pub use utils::*;

gpx-rs/src/core/statistics/statistics.rs

@@ -1,9 +1,6 @@
 use crate::{
-    algorithm::ramer_douglas_peucker,
-    for_each_window,
-    gpx::{LngLat, LngLatBounds, TrackSegment, TrackSegmentIndex, Trackpoint},
-    statistics::sum_options,
-    utils::{distance, slope, speed, time_diff},
+    LngLat, LngLatBounds, TrackSegment, TrackSegmentIndex, Trackpoint, distance, for_each_window,
+    ramer_douglas_peucker, slope, speed, sum_options, time_diff,
 };
 
 #[derive(Default, Debug)]
@@ -290,7 +287,7 @@ pub struct SlopeSegment {
 mod tests {
     use std::{fs::File, io::Read};
 
-    use crate::io::parse;
+    use crate::parse;
 
     use super::*;
 

gpx-rs/src/core/utils.rs

@@ -1,6 +1,6 @@
 use std::f64::consts::PI;
 
-use crate::gpx::LngLat;
+use crate::LngLat;
 
 static TO_RADIANS: f64 = PI / 180.0;
 static EARTH_RADIUS: f64 = 6371.0088;

gpx-rs/src/engine/derived/mod.rs

@@ -0,0 +1,5 @@
+mod statistics_buffer;
+mod statistics_cache;
+
+pub use statistics_buffer::*;
+pub use statistics_cache::*;

gpx-rs/src/engine/derived/statistics_buffer.rs

@@ -1,4 +1,4 @@
-use crate::statistics::{GlobalStatistics, Statistics, sum_options};
+use crate::{GlobalStatistics, Statistics, sum_options};
 
 #[derive(Debug, Default)]
 pub struct StatisticsBuffer {

gpx-rs/src/engine/derived/statistics_cache.rs

@@ -3,12 +3,7 @@ use std::{
     rc::Rc,
 };
 
-use crate::{
-    gpx::{File, Track, TrackSegment, TrackSegmentRevisionId},
-    selection::Selection,
-    state::StackEntry,
-    statistics::Statistics,
-};
+use crate::{File, Selection, StackEntry, Statistics, Track, TrackSegment, TrackSegmentRevisionId};
 
 #[derive(Debug, Default)]
 pub struct StatisticsCache {

gpx-rs/src/engine/engine.rs

@@ -6,14 +6,7 @@ use js_sys::{Float64Array, Function, Int32Array};
 use uuid::Uuid;
 use wasm_bindgen::prelude::*;
 
-use crate::{
-    buffer::StatisticsBuffer,
-    gpx::{File, FileId},
-    io::parse,
-    selection::Selection,
-    state::{Stack, StackEntry},
-    statistics::StatisticsCache,
-};
+use crate::{File, FileId, Selection, Stack, StackEntry, StatisticsBuffer, StatisticsCache, parse};
 
 extern crate console_error_panic_hook;
 

gpx-rs/src/engine/mod.rs

@@ -0,0 +1,9 @@
+mod derived;
+mod engine;
+mod selection;
+mod state;
+
+pub use derived::*;
+pub use engine::*;
+pub use selection::*;
+pub use state::*;

gpx-rs/src/engine/selection.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use crate::gpx::{FileId, TrackId, TrackSegmentId, WaypointId};
+use crate::{FileId, TrackId, TrackSegmentId, WaypointId};
 
 #[derive(Debug)]
 pub struct FileSelection {

gpx-rs/src/engine/state/stack.rs

@@ -3,7 +3,7 @@ use std::{
     rc::Rc,
 };
 
-use crate::gpx::{File, FileId};
+use crate::{File, FileId};
 
 #[derive(Debug, Default)]
 pub struct Stack {

gpx-rs/src/lib.rs

@@ -1,12 +1,5 @@
-mod action;
-mod algorithm;
-mod buffer;
+mod core;
 mod engine;
-mod gpx;
-mod io;
-mod selection;
-mod state;
-mod statistics;
-mod utils;
 
+pub use core::*;
 pub use engine::*;