diff --git a/src/to_wkt/geo_trait_impl.rs b/src/to_wkt/geo_trait_impl.rs index b6ec9a1..7190a5e 100644 --- a/src/to_wkt/geo_trait_impl.rs +++ b/src/to_wkt/geo_trait_impl.rs @@ -33,9 +33,9 @@ impl From for PhysicalCoordinateDimension { } } -pub fn write_point>( +pub fn write_point( f: &mut impl Write, - g: &G, + g: &impl PointTrait, ) -> Result<(), Error> { let dim = g.dim(); // Write prefix @@ -59,9 +59,9 @@ pub fn write_point>( } } -pub fn write_linestring>( +pub fn write_linestring( f: &mut impl Write, - linestring: &G, + linestring: &impl LineStringTrait, ) -> Result<(), Error> { let dim = linestring.dim(); // Write prefix @@ -86,9 +86,9 @@ pub fn write_linestring>( } } -pub fn write_polygon>( +pub fn write_polygon( f: &mut impl Write, - polygon: &G, + polygon: &impl PolygonTrait, ) -> Result<(), Error> { let dim = polygon.dim(); // Write prefix @@ -123,9 +123,9 @@ pub fn write_polygon>( } } -pub fn write_multi_point>( +pub fn write_multi_point( f: &mut impl Write, - multipoint: &G, + multipoint: &impl MultiPointTrait, ) -> Result<(), Error> { let dim = multipoint.dim(); // Write prefix @@ -167,9 +167,9 @@ pub fn write_multi_point>( Ok(()) } -pub fn write_multi_linestring>( +pub fn write_multi_linestring( f: &mut impl Write, - multilinestring: &G, + multilinestring: &impl MultiLineStringTrait, ) -> Result<(), Error> { let dim = multilinestring.dim(); // Write prefix @@ -205,9 +205,9 @@ pub fn write_multi_linestring>( +pub fn write_multi_polygon( f: &mut impl Write, - multipolygon: &G, + multipolygon: &impl MultiPolygonTrait, ) -> Result<(), Error> { let dim = multipolygon.dim(); // Write prefix @@ -257,9 +257,9 @@ pub fn write_multi_polygon /// Create geometry to WKT representation. -pub fn write_geometry>( +pub fn write_geometry( f: &mut impl Write, - geometry: &G, + geometry: &impl GeometryTrait, ) -> Result<(), Error> { match geometry.as_type() { geo_traits::GeometryType::Point(point) => write_point(f, point), @@ -277,9 +277,9 @@ pub fn write_geometry>( } } -pub fn write_geometry_collection>( +pub fn write_geometry_collection( f: &mut impl Write, - gc: &G, + gc: &impl GeometryCollectionTrait, ) -> Result<(), Error> { let dim = gc.dim(); // Write prefix @@ -314,9 +314,9 @@ pub fn write_geometry_collection>( +pub fn write_rect( f: &mut impl Write, - rect: &G, + rect: &impl RectTrait, ) -> Result<(), Error> { // Write prefix and error if not 2D match rect.dim() { @@ -366,9 +366,9 @@ pub fn write_rect>( Ok(f.write_char(')')?) } -pub fn write_triangle>( +pub fn write_triangle( f: &mut impl Write, - triangle: &G, + triangle: &impl TriangleTrait, ) -> Result<(), Error> { let dim = triangle.dim(); // Write prefix @@ -395,9 +395,9 @@ pub fn write_triangle>( Ok(f.write_char(')')?) } -pub fn write_line>( +pub fn write_line( f: &mut impl Write, - line: &G, + line: &impl LineTrait, ) -> Result<(), Error> { let dim = line.dim(); // Write prefix @@ -421,9 +421,9 @@ pub fn write_line>( /// Write a single coordinate to the writer. /// /// Will not include any start or end `()` characters. -fn write_coord>( +fn write_coord( f: &mut impl Write, - coord: &G, + coord: &impl CoordTrait, size: PhysicalCoordinateDimension, ) -> Result<(), std::fmt::Error> { match size { @@ -459,9 +459,9 @@ fn write_coord>( /// (1 2, 3 4, 5 6) /// ``` /// for a coordinate sequence with three coordinates. -fn write_coord_sequence>( +fn write_coord_sequence( f: &mut impl Write, - mut coords: impl Iterator, + mut coords: impl Iterator>, size: PhysicalCoordinateDimension, ) -> Result<(), Error> { f.write_char('(')?;