LrmScale have an id

Author: Tristramg

src/curves.rs

@@ -13,7 +13,7 @@ use thiserror::Error;
 /// It provides basic primitives to locate/project points on it
 /// A curve can be part of a larger curve (e.g. for optimisation purpurses and have better bounding boxes)
 /// The curve can be implemented
-trait Curve {
+pub trait Curve {
     /// Project the point to the closest position on the curve
     /// Will fail if the curve is invalid (e.g. no points on it)
     /// or if the point is to far away

src/lrm_scale.rs

@@ -130,7 +130,7 @@ impl ScaleBuilder {
     /// Requires at least one named anchor
     /// Will fail if none is present and if the anchors names are duplicated
     /// This will consume the builder that can not be used after
-    pub fn build(self) -> Result<LrmScale, LrmScaleError> {
+    pub fn build(self, id: &str) -> Result<LrmScale, LrmScaleError> {
         let mut names = std::collections::HashSet::new();
         for anchor in self.anchors.iter() {
             if let Some(name) = &anchor.id {
@@ -276,7 +276,7 @@ mod tests {
     fn scale() -> LrmScale {
         ScaleBuilder::new(Anchor::new("a", 0., 0.))
             .add_named("b", 10., 100.)
-            .build()
+            .build("id")
             .unwrap()
     }
 
@@ -289,13 +289,13 @@ mod tests {
 
         // Missing named anchor
         let b = ScaleBuilder::new(Anchor::new_unnamed(0., 0.));
-        let scale = b.build();
+        let scale = b.build("id");
         assert_eq!(scale, Err(LrmScaleError::NoEnoughNamedAnchor));
 
         // Duplicated name
         let scale = ScaleBuilder::new(Anchor::new("a", 0., 0.))
             .add_named("a", 100., 100.)
-            .build();
+            .build("id");
         assert_eq!(
             scale,
             Err(LrmScaleError::DuplicatedAnchorName("a".to_string()))
@@ -327,7 +327,7 @@ mod tests {
     fn nearest_named() {
         let scale = ScaleBuilder::new(Anchor::new("a", 0., 2.))
             .add_named("b", 10., 1.)
-            .build()
+            .build("id")
             .unwrap();
 
         assert_eq!(scale.nearest_named(2.1).unwrap().id, "a");
@@ -340,7 +340,7 @@ mod tests {
     fn locate_anchor() {
         let scale = ScaleBuilder::new(Anchor::new("a", 0., 0.))
             .add_named("b", 10., 100.)
-            .build()
+            .build("id")
             .unwrap();
 
         let measure = scale.locate_anchor(40.).unwrap();
@@ -363,7 +363,7 @@ mod tests {
             .add_named("a", 1., 100.)
             .add_named("b", 1., 100.)
             .add_unnamed(1., 100.)
-            .build()
+            .build("id")
             .unwrap();
 
         // Unamed----position----Named