progress

georust · Jun 23, 2018 · 4e7532a · 4e7532a
1 parent f99f180
commit 4e7532a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/geo-types/src/line_string.rs b/geo-types/src/line_string.rs
@@ -65,7 +65,6 @@ use {Coordinate, CoordinateType, Line, Point};
 /// }
 /// ```
 ///
-// TODO: don't expose this within the module
 #[derive(PartialEq, Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct LineString<T>(pub Vec<Coordinate<T>>)

diff --git a/geo/src/algorithm/from_postgis.rs b/geo/src/algorithm/from_postgis.rs
@@ -18,10 +18,10 @@ impl<'a, T> FromPostgis<&'a T> for Point<f64> where T: postgis::Point {
 }
 impl<'a, T> FromPostgis<&'a T> for LineString<f64> where T: postgis::LineString<'a> {
     fn from_postgis(ls: &'a T) -> Self {
-        let ret = ls.points()
+        let ret: Vec<Point<f64>> = ls.points()
             .map(|x| Point::from_postgis(x))
             .collect();
-        LineString(ret)
+        LineString::from(ret)
     }
 }
 impl<'a, T> FromPostgis<&'a T> for Option<Polygon<f64>> where T: postgis::Polygon<'a> {

diff --git a/geo/src/algorithm/to_postgis.rs b/geo/src/algorithm/to_postgis.rs
@@ -1,4 +1,4 @@
-use ::{MultiPoint, Line, Point, LineString, MultiLineString, MultiPolygon, Polygon, Geometry, GeometryCollection};
+use ::{Coordinate, MultiPoint, Line, Point, LineString, MultiLineString, MultiPolygon, Polygon, Geometry, GeometryCollection};
 use postgis::ewkb;
 
 /// Converts geometry to a PostGIS type.
@@ -16,6 +16,12 @@ pub trait ToPostgis<T> {
     }
 }
 
+impl ToPostgis<ewkb::Point> for Coordinate<f64> {
+    fn to_postgis_with_srid(&self, srid: Option<i32>) -> ewkb::Point {
+        ewkb::Point::new(self.x, self.y, srid)
+    }
+}
+
 impl ToPostgis<ewkb::Point> for Point<f64> {
     fn to_postgis_with_srid(&self, srid: Option<i32>) -> ewkb::Point {
         ewkb::Point::new(self.x(), self.y(), srid)
@@ -24,8 +30,8 @@ impl ToPostgis<ewkb::Point> for Point<f64> {
 impl ToPostgis<ewkb::LineString> for Line<f64> {
     fn to_postgis_with_srid(&self, srid: Option<i32>) -> ewkb::LineString {
         let points = vec![
-            self.start.to_postgis_with_srid(srid),
-            self.end.to_postgis_with_srid(srid)
+            self.start_point().to_postgis_with_srid(srid),
+            self.end_point().to_postgis_with_srid(srid)
         ];
         ewkb::LineString { points, srid }
     }
@@ -34,7 +40,7 @@ impl ToPostgis<ewkb::Polygon> for Polygon<f64> {
     fn to_postgis_with_srid(&self, srid: Option<i32>) -> ewkb::Polygon {
         let rings = ::std::iter::once(&self.exterior)
             .chain(self.interiors.iter())
-            .map(|x| x.to_postgis_with_srid(srid))
+            .map(|x| (*x).to_postgis_with_srid(srid))
             .collect();
         ewkb::Polygon { rings, srid }
     }