From f09257e349f2b42fe8c0ac7e3d61b1ab2f25675b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 22 Oct 2024 16:49:57 -0700 Subject: [PATCH] fixup! Move all geometries impls into `impl Distance for Euclidean` --- geo/CHANGES.md | 10 ++++++---- .../line_measures/metric_spaces/euclidean/distance.rs | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/geo/CHANGES.md b/geo/CHANGES.md index 705761a72..e3d02cd88 100644 --- a/geo/CHANGES.md +++ b/geo/CHANGES.md @@ -23,10 +23,11 @@ Before: ``` use geo::{GeodesicBearing, HaversineBearing, GeodesicDistance, HaversineDistance}; - GeodesicBearing::geodesic_bearing(p1, p2) - HaversineBearing::haversine_bearing(p1, p2) - GeodesicDistance::geodesic_distance(p1, p2) - HaversineDistance::haversine_distance(p1, p2) + p1.geodesic_bearing(p2) + p1.haversine_bearing(p2) + p1.geodesic_distance(p2) + p1.haversine_distance(p2) + p1.euclidean_distance(p2) ``` After: @@ -36,6 +37,7 @@ Haversine::bearing(p1, p2) Geodesic::distance(p1, p2) Haversine::distance(p1, p2) + Euclidean::distance(p1, p2) ``` * * Deprecated legacy line measure traits in favor of those added in the previous changelog entry: diff --git a/geo/src/algorithm/line_measures/metric_spaces/euclidean/distance.rs b/geo/src/algorithm/line_measures/metric_spaces/euclidean/distance.rs index a013f48b5..db5b7b8cb 100644 --- a/geo/src/algorithm/line_measures/metric_spaces/euclidean/distance.rs +++ b/geo/src/algorithm/line_measures/metric_spaces/euclidean/distance.rs @@ -67,9 +67,9 @@ impl Distance, Point> for Euclidean { /// ); /// ``` /// - /// [`Haversine`]: super::Haversine - /// [`Geodesic`]: super::Geodesic - /// [metric spaces]: super + /// [`Haversine`]: crate::line_measures::metric_spaces::Haversine + /// [`Geodesic`]: crate::line_measures::metric_spaces::Geodesic + /// [metric spaces]: crate::line_measures::metric_spaces fn distance(origin: Point, destination: Point) -> F { Self::distance(origin.0, destination.0) }