Merge pull request #111 from busstoptaktik/work

Minor corrections

Author: busstoptaktik

.gitignore

@@ -4,3 +4,4 @@ Cargo.lock
 *.code-workspace
 /untracked
 CHANGELOG
+.markdownlint.jsonc

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
+this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
@@ -69,7 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved syntax for register resources (See *Rumination #009*)
 
-- Change the name of `CHANGES.md` to `CHANGELOG.md`, and try to follow guidelines from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
+- Change the name of `CHANGES.md` to `CHANGELOG.md`, and try to follow guidelines from
+  [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ### Removed
 
@@ -81,11 +82,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
-- Alternative parameter names for the `helmert` operator (`translations`, `rotations` etc.) (Nic Hill)
+- Alternative parameter names for the `helmert` operator
+  (`translations`, `rotations` etc.) (Nic Hill)
 - Improved syntax and parameter handling (#92) (Thomas Knudsen)
-  - `>` and `<` can be used to indicate pipeline steps that are `omit_inv` and `omit_fwd` respectively (syntactic sugar for `| omit_inv`, etc.)
-  - True utf-8 subscripts supported in parameter names (e.g. `x₀`), as alternatives to the existing `x_0`-style
-  - More free form syntax: Modifiers `inv`, `omit_inv` and `omit_fwd` may now prefix the operator name, i.e. `inv utm zone=32` is functionally identical to `utm inv zone=32`
+  - `>` and `<` can be used to indicate pipeline steps that are `omit_inv` and
+    `omit_fwd` respectively (syntactic sugar for `| omit_inv`, etc.)
+  - True utf-8 subscripts supported in parameter names (e.g. `x₀`), as alternatives
+    to the existing `x_0`-style
+  - More free form syntax: Modifiers `inv`, `omit_inv` and `omit_fwd` may now prefix
+    the operator name, i.e. `inv utm zone=32` is functionally identical to `utm inv zone=32`
 - Implement the `axisswap` operator (#84) (Thomas Knudsen)
 - Replace `once_cell` with `std::sync::OneLock`. (Corey Farwell)
 - KP: Guess output dimensionality (#82) (Thomas Knudsen)
@@ -131,7 +136,8 @@ Geodesy v0.12.0 materialized through contributions from
 
   which does nothing, in a very convoluted way
 - Partial operator introspection
-- General support for 2D, 3D, 4D, and 32 bit 2D coordinates (`Coor2D`, `Coor3D`, `Coor4D`, `Coor32`)
+- General support for 2D, 3D, 4D, and 32 bit 2D coordinates
+  (`Coor2D`, `Coor3D`, `Coor4D`, `Coor32`)
 - Hence `Coord` is gone
 
 ### Bug fixes
@@ -140,4 +146,7 @@ Geodesy v0.12.0 materialized through contributions from
 
 ### Acknowledgements
 
-A huge thank you goes to [Sean Rennie](https://github.com/Rennzie) who a.o. did most of the work on the improved grid support in 0.11.0, and to [Kyle Barron](https://github.com/kylebarron) for pushing Geodesy over the WASM barrier in 0.10.0
+A huge thank you goes to [Sean Rennie](https://github.com/Rennzie) who a.o. did most
+of the work on the improved grid support in 0.11.0,
+and to [Kyle Barron](https://github.com/kylebarron) for pushing Geodesy over the
+WASM barrier in 0.10.0

README.md

@@ -103,7 +103,7 @@ The documentation is currently limited, but take a look at:
 
 ## License
 
-*Rust Geodesy*: Copyright 2020, 2021, 2022, 2023 by Thomas Knudsen <knudsen.thomas@gmail.com>.
+*Rust Geodesy*: Copyright 2020, 2021, 2022, 2023, 2024 by Thomas Knudsen <knudsen.thomas@gmail.com> and contributors.
 
 Licensed under either of
 

src/context/minimal.rs

@@ -40,7 +40,6 @@ impl Context for Minimal {
         direction: Direction,
         operands: &mut dyn CoordinateSet,
     ) -> Result<usize, Error> {
-        const BAD_ID_MESSAGE: Error = Error::General("Minimal: Unknown operator id");
         let op = self.operators.get(&op).ok_or(BAD_ID_MESSAGE)?;
         Ok(op.apply(self, operands, direction))
     }

src/lib.rs

@@ -5,7 +5,7 @@ pub mod prelude {
     pub use crate::coord::*;
     pub use crate::ctx::*;
     pub use crate::ellps::*;
-    #[allow(unused_imports)]
+    #[cfg(test)]
     pub use crate::test_coords::*;
     pub use crate::Error;
 }
@@ -73,30 +73,6 @@ pub mod coord {
     pub use crate::math::angular;
 }
 
-/// Some generic coordintes for test composition
-mod test_coords {
-    #[cfg(test)]
-    pub fn some_basic_coor4dinates() -> [crate::coord::Coor4D; 2] {
-        let copenhagen = crate::coord::Coor4D::raw(55., 12., 0., 0.);
-        let stockholm = crate::coord::Coor4D::raw(59., 18., 0., 0.);
-        [copenhagen, stockholm]
-    }
-
-    #[cfg(test)]
-    pub fn some_basic_coor3dinates() -> [crate::coord::Coor3D; 2] {
-        let copenhagen = crate::coord::Coor3D::raw(55., 12., 0.);
-        let stockholm = crate::coord::Coor3D::raw(59., 18., 0.);
-        [copenhagen, stockholm]
-    }
-
-    #[cfg(test)]
-    pub fn some_basic_coor2dinates() -> [crate::coord::Coor2D; 2] {
-        let copenhagen = crate::coord::Coor2D::raw(55., 12.);
-        let stockholm = crate::coord::Coor2D::raw(59., 18.);
-        [copenhagen, stockholm]
-    }
-}
-
 /// Elements for building operators
 mod ops {
     pub use crate::inner_op::InnerOp;
@@ -197,6 +173,28 @@ mod math;
 mod op;
 mod token;
 
+/// Some generic coordinates for test composition
+#[cfg(test)]
+mod test_coords {
+    pub fn some_basic_coor4dinates() -> [crate::coord::Coor4D; 2] {
+        let copenhagen = crate::coord::Coor4D::raw(55., 12., 0., 0.);
+        let stockholm = crate::coord::Coor4D::raw(59., 18., 0., 0.);
+        [copenhagen, stockholm]
+    }
+
+    pub fn some_basic_coor3dinates() -> [crate::coord::Coor3D; 2] {
+        let copenhagen = crate::coord::Coor3D::raw(55., 12., 0.);
+        let stockholm = crate::coord::Coor3D::raw(59., 18., 0.);
+        [copenhagen, stockholm]
+    }
+
+    pub fn some_basic_coor2dinates() -> [crate::coord::Coor2D; 2] {
+        let copenhagen = crate::coord::Coor2D::raw(55., 12.);
+        let stockholm = crate::coord::Coor2D::raw(59., 18.);
+        [copenhagen, stockholm]
+    }
+}
+
 // ---- Documentation: Bibliography ----
 #[cfg(doc)]
 pub use crate::bibliography::Bibliography;