[types] Remove TryFrom constraint from HasGeoPoint

This way we don't have to pollute the code in the algorithm module with
this, though it does mean more constraint repitition elsewhere.

Author: mshroyer

src/algorithm.rs

@@ -61,7 +61,6 @@ type Result<T> = std::result::Result<T, AlgorithmError>;
 pub fn karney_interception<P>(segment: &GeoSegment<P>, point: &P) -> Result<GeoPoint>
 where
     P: HasGeoPoint,
-    CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     // Start with an initial guess of an intercept at the geodesic's midpoint:
     let mut intercept = geodesic_direct(
@@ -237,15 +236,15 @@ where
 pub trait FromGeoPoints<P>
 where
     Self: Sized,
-    P: HasGeoPoint,
+    P: HasGeoPoint + TryFrom<GeoPoint>,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     fn from_geo_points(start: P, end: P) -> std::result::Result<Self, GeographicError>;
 }
 
 impl<P> FromGeoPoints<P> for GeoSegment<P>
 where
-    P: HasGeoPoint,
+    P: HasGeoPoint + TryFrom<GeoPoint>,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     fn from_geo_points(point1: P, point2: P) -> std::result::Result<Self, GeographicError> {

src/course.rs

@@ -107,7 +107,7 @@ pub type CourseSetBuilder = CourseSetBuilderImpl<GeoPoint>;
 
 pub struct CourseSetBuilderImpl<P>
 where
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
     <P as TryFrom<GeoPoint>>::Error: Send,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
@@ -120,7 +120,7 @@ where
 impl<P> CourseSetBuilderImpl<P>
 where
     Self: SolveIntercept<P>,
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
     <P as TryFrom<GeoPoint>>::Error: Send,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
@@ -296,7 +296,7 @@ where
 
 pub trait SolveIntercept<P>
 where
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     fn solve_intercept(
@@ -471,7 +471,8 @@ impl CourseBuilder {
     /// parameter `P` (such as [`XyzPoint`]).
     fn segment<P>(self) -> Result<SegmentedCourseBuilder<P>>
     where
-        P: HasGeoPoint + Send + Sync,
+        P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
+        GeoSegment<P>: FromGeoPoints<P>,
         <P as TryFrom<GeoPoint>>::Error: Send,
         CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
     {
@@ -496,7 +497,7 @@ impl CourseBuilder {
             .collect::<Vec<_>>();
 
         Ok(SegmentedCourseBuilder {
-            route_points: self.route_points,
+            route_points: ps,
             segments_and_distances,
             name: self.name,
             course_points: Vec::new(),
@@ -515,11 +516,12 @@ impl CourseBuilder {
 /// course points.
 struct SegmentedCourseBuilder<P>
 where
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
+    GeoSegment<P>: FromGeoPoints<P>,
     <P as TryFrom<GeoPoint>>::Error: Send,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
-    route_points: Vec<GeoPoint>,
+    route_points: Vec<P>,
     segments_and_distances: Vec<(GeoSegment<P>, Meter<f64>)>,
     name: Option<String>,
     course_points: Vec<CoursePoint>,
@@ -528,7 +530,8 @@ where
 
 impl<P> SegmentedCourseBuilder<P>
 where
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
+    GeoSegment<P>: FromGeoPoints<P>,
     <P as TryFrom<GeoPoint>>::Error: Send,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
@@ -551,7 +554,7 @@ where
         }
         if let Some(rp) = self.route_points.last() {
             records.push(Record {
-                point: *rp,
+                point: *rp.geo(),
                 cumulative_distance: total_distance,
             })
         }
@@ -598,7 +601,7 @@ pub struct Record {
 /// along the course and lacks a known course distance.
 pub struct Waypoint<P>
 where
-    P: HasGeoPoint + Send + Sync,
+    P: HasGeoPoint + TryFrom<GeoPoint> + Send + Sync,
     CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     /// Position of the waypoint.

src/types.rs

@@ -2,7 +2,6 @@ use approx::{AbsDiffEq, RelativeEq, abs_diff_eq, relative_eq};
 use dimensioned::si::{M, Meter};
 use thiserror::Error;
 
-use crate::course::CourseError;
 use crate::measure::{DEG, Degree};
 
 #[derive(Error, Debug)]
@@ -138,7 +137,6 @@ pub struct GeoAndXyzPoint {
 pub struct GeoSegment<P>
 where
     P: HasGeoPoint,
-    CourseError: From<<P as TryFrom<GeoPoint>>::Error>,
 {
     /// The segment's start point.
     pub start: P,
@@ -153,10 +151,7 @@ where
     pub start_azimuth: Degree<f64>,
 }
 
-pub trait HasGeoPoint: PartialEq + TryFrom<GeoPoint> + Copy
-where
-    <Self as TryFrom<GeoPoint>>::Error: Into<CourseError>,
-{
+pub trait HasGeoPoint: PartialEq + Copy {
     fn geo(&self) -> &GeoPoint;
 }