Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove associated type T on geo-traits traits. #1258

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+263 −152
Draft

Remove associated type T on geo-traits traits. #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 170 additions & 57 deletions geo-traits/src/geometry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,53 @@ use crate::{
/// A trait for accessing data from a generic Geometry.
#[allow(clippy::type_complexity)]
pub trait GeometryTrait {
/// The coordinate type of this geometry
type T;

/// The type of each underlying Point, which implements [PointTrait]
type PointType<'a>: 'a + PointTrait<T = Self::T>
type PointType<'a>: 'a + PointTrait
where
Self: 'a;

/// The type of each underlying LineString, which implements [LineStringTrait]
type LineStringType<'a>: 'a + LineStringTrait<T = Self::T>
type LineStringType<'a>: 'a + LineStringTrait
where
Self: 'a;

/// The type of each underlying Polygon, which implements [PolygonTrait]
type PolygonType<'a>: 'a + PolygonTrait<T = Self::T>
type PolygonType<'a>: 'a + PolygonTrait
where
Self: 'a;

/// The type of each underlying MultiPoint, which implements [MultiPointTrait]
type MultiPointType<'a>: 'a + MultiPointTrait<T = Self::T>
type MultiPointType<'a>: 'a + MultiPointTrait
where
Self: 'a;

/// The type of each underlying MultiLineString, which implements [MultiLineStringTrait]
type MultiLineStringType<'a>: 'a + MultiLineStringTrait<T = Self::T>
type MultiLineStringType<'a>: 'a + MultiLineStringTrait
where
Self: 'a;

/// The type of each underlying MultiPolygon, which implements [MultiPolygonTrait]
type MultiPolygonType<'a>: 'a + MultiPolygonTrait<T = Self::T>
type MultiPolygonType<'a>: 'a + MultiPolygonTrait
where
Self: 'a;

/// The type of each underlying GeometryCollection, which implements [GeometryCollectionTrait]
type GeometryCollectionType<'a>: 'a + GeometryCollectionTrait<T = Self::T>
type GeometryCollectionType<'a>: 'a + GeometryCollectionTrait
where
Self: 'a;

/// The type of each underlying Rect, which implements [RectTrait]
type RectType<'a>: 'a + RectTrait<T = Self::T>
type RectType<'a>: 'a + RectTrait
where
Self: 'a;

/// The type of each underlying Triangle, which implements [TriangleTrait]
type TriangleType<'a>: 'a + TriangleTrait<T = Self::T>
type TriangleType<'a>: 'a + TriangleTrait
where
Self: 'a;

/// The type of each underlying Line, which implements [LineTrait]
type LineType<'a>: 'a + LineTrait<T = Self::T>
type LineType<'a>: 'a + LineTrait
where
Self: 'a;

Expand Down Expand Up @@ -127,17 +124,46 @@ where

#[cfg(feature = "geo-types")]
impl<'a, T: CoordNum + 'a> GeometryTrait for Geometry<T> {
type T = T;
type PointType<'b> = Point<Self::T> where Self: 'b;
type LineStringType<'b> = LineString<Self::T> where Self: 'b;
type PolygonType<'b> = Polygon<Self::T> where Self: 'b;
type MultiPointType<'b> = MultiPoint<Self::T> where Self: 'b;
type MultiLineStringType<'b> = MultiLineString<Self::T> where Self: 'b;
type MultiPolygonType<'b> = MultiPolygon<Self::T> where Self: 'b;
type GeometryCollectionType<'b> = GeometryCollection<Self::T> where Self: 'b;
type RectType<'b> = Rect<Self::T> where Self: 'b;
type TriangleType<'b> = Triangle<Self::T> where Self: 'b;
type LineType<'b> = Line<Self::T> where Self: 'b;
type PointType<'b>
= Point<T>
where
Self: 'b;
type LineStringType<'b>
= LineString<T>
where
Self: 'b;
type PolygonType<'b>
= Polygon<T>
where
Self: 'b;
type MultiPointType<'b>
= MultiPoint<T>
where
Self: 'b;
type MultiLineStringType<'b>
= MultiLineString<T>
where
Self: 'b;
type MultiPolygonType<'b>
= MultiPolygon<T>
where
Self: 'b;
type GeometryCollectionType<'b>
= GeometryCollection<T>
where
Self: 'b;
type RectType<'b>
= Rect<T>
where
Self: 'b;
type TriangleType<'b>
= Triangle<T>
where
Self: 'b;
type LineType<'b>
= Line<T>
where
Self: 'b;

fn dim(&self) -> Dimensions {
Dimensions::Xy
Expand Down Expand Up @@ -175,17 +201,46 @@ impl<'a, T: CoordNum + 'a> GeometryTrait for Geometry<T> {

#[cfg(feature = "geo-types")]
impl<'a, T: CoordNum + 'a> GeometryTrait for &'a Geometry<T> {
type T = T;
type PointType<'b> = Point<Self::T> where Self: 'b;
type LineStringType<'b> = LineString<Self::T> where Self: 'b;
type PolygonType<'b> = Polygon<Self::T> where Self: 'b;
type MultiPointType<'b> = MultiPoint<Self::T> where Self: 'b;
type MultiLineStringType<'b> = MultiLineString<Self::T> where Self: 'b;
type MultiPolygonType<'b> = MultiPolygon<Self::T> where Self: 'b;
type GeometryCollectionType<'b> = GeometryCollection<Self::T> where Self: 'b;
type RectType<'b> = Rect<Self::T> where Self: 'b;
type TriangleType<'b> = Triangle<Self::T> where Self: 'b;
type LineType<'b> = Line<Self::T> where Self: 'b;
type PointType<'b>
= Point<T>
where
Self: 'b;
type LineStringType<'b>
= LineString<T>
where
Self: 'b;
type PolygonType<'b>
= Polygon<T>
where
Self: 'b;
type MultiPointType<'b>
= MultiPoint<T>
where
Self: 'b;
type MultiLineStringType<'b>
= MultiLineString<T>
where
Self: 'b;
type MultiPolygonType<'b>
= MultiPolygon<T>
where
Self: 'b;
type GeometryCollectionType<'b>
= GeometryCollection<T>
where
Self: 'b;
type RectType<'b>
= Rect<T>
where
Self: 'b;
type TriangleType<'b>
= Triangle<T>
where
Self: 'b;
type LineType<'b>
= Line<T>
where
Self: 'b;

fn dim(&self) -> Dimensions {
Dimensions::Xy
Expand Down Expand Up @@ -227,17 +282,46 @@ macro_rules! impl_specialization {
($geometry_type:ident) => {
#[cfg(feature = "geo-types")]
impl<T: CoordNum> GeometryTrait for $geometry_type<T> {
type T = T;
type PointType<'b> = Point<Self::T> where Self: 'b;
type LineStringType<'b> = LineString<Self::T> where Self: 'b;
type PolygonType<'b> = Polygon<Self::T> where Self: 'b;
type MultiPointType<'b> = MultiPoint<Self::T> where Self: 'b;
type MultiLineStringType<'b> = MultiLineString<Self::T> where Self: 'b;
type MultiPolygonType<'b> = MultiPolygon<Self::T> where Self: 'b;
type GeometryCollectionType<'b> = GeometryCollection<Self::T> where Self: 'b;
type RectType<'b> = Rect<Self::T> where Self: 'b;
type TriangleType<'b> = Triangle<Self::T> where Self: 'b;
type LineType<'b> = Line<Self::T> where Self: 'b;
type PointType<'b>
= Point<T>
where
Self: 'b;
type LineStringType<'b>
= LineString<T>
where
Self: 'b;
type PolygonType<'b>
= Polygon<T>
where
Self: 'b;
type MultiPointType<'b>
= MultiPoint<T>
where
Self: 'b;
type MultiLineStringType<'b>
= MultiLineString<T>
where
Self: 'b;
type MultiPolygonType<'b>
= MultiPolygon<T>
where
Self: 'b;
type GeometryCollectionType<'b>
= GeometryCollection<T>
where
Self: 'b;
type RectType<'b>
= Rect<T>
where
Self: 'b;
type TriangleType<'b>
= Triangle<T>
where
Self: 'b;
type LineType<'b>
= Line<T>
where
Self: 'b;

fn dim(&self) -> Dimensions {
Dimensions::Xy
Expand All @@ -264,17 +348,46 @@ macro_rules! impl_specialization {

#[cfg(feature = "geo-types")]
impl<'a, T: CoordNum + 'a> GeometryTrait for &'a $geometry_type<T> {
type T = T;
type PointType<'b> = Point<Self::T> where Self: 'b;
type LineStringType<'b> = LineString<Self::T> where Self: 'b;
type PolygonType<'b> = Polygon<Self::T> where Self: 'b;
type MultiPointType<'b> = MultiPoint<Self::T> where Self: 'b;
type MultiLineStringType<'b> = MultiLineString<Self::T> where Self: 'b;
type MultiPolygonType<'b> = MultiPolygon<Self::T> where Self: 'b;
type GeometryCollectionType<'b> = GeometryCollection<Self::T> where Self: 'b;
type RectType<'b> = Rect<Self::T> where Self: 'b;
type TriangleType<'b> = Triangle<Self::T> where Self: 'b;
type LineType<'b> = Line<Self::T> where Self: 'b;
type PointType<'b>
= Point<T>
where
Self: 'b;
type LineStringType<'b>
= LineString<T>
where
Self: 'b;
type PolygonType<'b>
= Polygon<T>
where
Self: 'b;
type MultiPointType<'b>
= MultiPoint<T>
where
Self: 'b;
type MultiLineStringType<'b>
= MultiLineString<T>
where
Self: 'b;
type MultiPolygonType<'b>
= MultiPolygon<T>
where
Self: 'b;
type GeometryCollectionType<'b>
= GeometryCollection<T>
where
Self: 'b;
type RectType<'b>
= Rect<T>
where
Self: 'b;
type TriangleType<'b>
= Triangle<T>
where
Self: 'b;
type LineType<'b>
= Line<T>
where
Self: 'b;

fn dim(&self) -> Dimensions {
Dimensions::Xy
Expand Down
14 changes: 6 additions & 8 deletions geo-traits/src/geometry_collection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ use geo_types::{CoordNum, Geometry, GeometryCollection};
///
/// A GeometryCollection is a collection of [Geometry][GeometryTrait] types.
pub trait GeometryCollectionTrait: Sized {
/// The coordinate type of this geometry
type T;

/// The type of each underlying geometry, which implements [GeometryTrait]
type GeometryType<'a>: 'a + GeometryTrait<T = Self::T>
type GeometryType<'a>: 'a + GeometryTrait
where
Self: 'a;

Expand Down Expand Up @@ -48,8 +45,8 @@ pub trait GeometryCollectionTrait: Sized {

#[cfg(feature = "geo-types")]
impl<T: CoordNum> GeometryCollectionTrait for GeometryCollection<T> {
type T = T;
type GeometryType<'a> = &'a Geometry<Self::T>
type GeometryType<'a>
= &'a Geometry<T>
where
Self: 'a;

Expand All @@ -68,8 +65,9 @@ impl<T: CoordNum> GeometryCollectionTrait for GeometryCollection<T> {

#[cfg(feature = "geo-types")]
impl<'a, T: CoordNum> GeometryCollectionTrait for &'a GeometryCollection<T> {
type T = T;
type GeometryType<'b> = &'a Geometry<Self::T> where
type GeometryType<'b>
= &'a Geometry<T>
where
Self: 'b;

fn dim(&self) -> Dimensions {
Expand Down
Loading
Loading