Merge #295

295: Enabled non-consuming fallible conversion from GDAL to geo-types Geometry r=lnicola a=metasim

Also added `Geometry::to_geo` method, for symmetry with `ToGdal::to_gdal`.

- [x] I agree to follow the project's [code of conduct](https://github.com/georust/gdal/blob/master/CODE_OF_CONDUCT.md).
- [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users.
---

Closes #276



Co-authored-by: Simeon H.K. Fitch <[email protected]>

CHANGES.md

@@ -86,6 +86,10 @@
 
   - <https://github.com/georust/gdal/pull/284>
 
+- Added `Geometry::to_geo` method for GDAL to geo-types Geometry conversions.
+
+  - <https://github.com/georust/gdal/pull/295>  
+
 - Add `Rasterband::set_scale` and `Rasterband::set_offset` methods
 
   - <https://github.com/georust/gdal/pull/294>

src/vector/gdal_to_geo.rs

@@ -5,10 +5,10 @@ use gdal_sys::{self, OGRwkbGeometryType};
 use crate::errors::GdalError;
 use crate::vector::Geometry;
 
-impl TryFrom<Geometry> for geo_types::Geometry<f64> {
+impl TryFrom<&Geometry> for geo_types::Geometry<f64> {
     type Error = GdalError;
 
-    fn try_from(geo: Geometry) -> Result<geo_types::Geometry<f64>, Self::Error> {
+    fn try_from(geo: &Geometry) -> Result<geo_types::Geometry<f64>, Self::Error> {
         let geometry_type = geo.geometry_type();
 
         let ring = |n: usize| {
@@ -110,3 +110,10 @@ impl TryFrom<Geometry> for geo_types::Geometry<f64> {
         }
     }
 }
+
+impl TryFrom<Geometry> for geo_types::Geometry<f64> {
+    type Error = GdalError;
+    fn try_from(value: Geometry) -> Result<Self, Self::Error> {
+        Self::try_from(&value)
+    }
+}

src/vector/geometry.rs

@@ -411,6 +411,11 @@ impl Geometry {
             gdal_sys::OGR_G_AssignSpatialReference(self.c_geometry(), spatial_ref.to_c_hsrs())
         };
     }
+
+    /// Create a copy of self as a `geo-types` geometry.
+    pub fn to_geo(&self) -> Result<geo_types::Geometry<f64>> {
+        self.try_into()
+    }
 }
 
 impl Drop for Geometry {