Move local module to approx

crates/fj-kernel/src/algorithms/approx/curves.rs

@@ -2,12 +2,9 @@ use std::cmp::max;
 
 use fj_math::{Circle, Point, Scalar};
 
-use crate::{
-    local::Local,
-    objects::{CurveKind, GlobalCurve},
-};
+use crate::objects::{CurveKind, GlobalCurve};
 
-use super::Tolerance;
+use super::{Local, Tolerance};
 
 /// Compute an approximation of the curve
 ///

crates/fj-kernel/src/algorithms/approx/cycles.rs

@@ -1,8 +1,8 @@
 use fj_math::{Point, Segment};
 
-use crate::{local::Local, objects::Cycle};
+use crate::objects::Cycle;
 
-use super::{curves::approx_curve, edges::approx_edge, Tolerance};
+use super::{curves::approx_curve, edges::approx_edge, Local, Tolerance};
 
 /// An approximation of a [`Cycle`]
 #[derive(Debug, Eq, PartialEq, Hash)]

crates/fj-kernel/src/algorithms/approx/edges.rs

@@ -1,6 +1,8 @@
 use fj_math::Point;
 
-use crate::{local::Local, objects::VerticesOfEdge};
+use crate::objects::VerticesOfEdge;
+
+use super::Local;
 
 pub fn approx_edge(
     vertices: VerticesOfEdge,
@@ -37,7 +39,7 @@ mod test {
     use fj_math::Point;
 
     use crate::{
-        local::Local,
+        algorithms::approx::Local,
         objects::{GlobalVertex, Vertex, VerticesOfEdge},
     };
 

crates/fj-kernel/src/algorithms/approx/faces.rs

@@ -2,9 +2,9 @@ use std::collections::HashSet;
 
 use fj_math::Point;
 
-use crate::{local::Local, objects::Face};
+use crate::objects::Face;
 
-use super::{CycleApprox, Tolerance};
+use super::{CycleApprox, Local, Tolerance};
 
 /// An approximation of a [`Face`]
 #[derive(Debug, PartialEq)]
@@ -84,7 +84,7 @@ mod tests {
     use map_macro::set;
 
     use crate::{
-        local::Local,
+        algorithms::approx::Local,
         objects::{Face, Surface},
     };
 

crates/fj-kernel/src/algorithms/approx/mod.rs

@@ -2,10 +2,12 @@ mod curves;
 mod cycles;
 mod edges;
 mod faces;
+mod local;
 mod tolerance;
 
 pub use self::{
     cycles::CycleApprox,
     faces::FaceApprox,
+    local::{Local, LocalForm},
     tolerance::{InvalidTolerance, Tolerance},
 };

crates/fj-kernel/src/algorithms/triangulate/delaunay.rs

@@ -1,7 +1,7 @@
 use fj_math::{Point, Scalar, Triangle, Winding};
 use spade::HasPosition;
 
-use crate::local::Local;
+use crate::algorithms::approx::Local;
 
 /// Create a Delaunay triangulation of all points
 pub fn triangulate(points: Vec<Local<Point<2>>>) -> Vec<[Local<Point<2>>; 3]> {

crates/fj-kernel/src/lib.rs

@@ -90,6 +90,5 @@
 pub mod algorithms;
 pub mod builder;
 pub mod iter;
-pub mod local;
 pub mod objects;
 pub mod validation;