Merge pull request #217 from xhwhis/main

upgrade geos to 9.0

Cargo.toml

@@ -37,7 +37,7 @@ gdal-sys = "0.9"
 geo = "0.26.0"
 geo-types = { version = "0.7.11", default-features = false }
 geojson = { version = "0.24.1", default-features = false }
-geos = "8.3"
+geos = "9.0"
 gpx = { version = "0.9", default-features = false }
 hex = "0.4"
 kdbush = "0.2"

geozero/src/geos/geos_reader.rs

@@ -2,7 +2,7 @@ use crate::error::{GeozeroError, Result};
 use crate::{CoordDimensions, GeomProcessor, GeozeroGeometry};
 use geos::{CoordSeq, Geom, Geometry as GGeometry, GeometryTypes};
 
-impl GeozeroGeometry for geos::Geometry<'_> {
+impl GeozeroGeometry for geos::Geometry {
     fn process_geom<P: GeomProcessor>(&self, processor: &mut P) -> Result<()> {
         process_geom(self, processor)
     }
@@ -39,7 +39,7 @@ pub fn process_geom<P: GeomProcessor>(ggeom: &GGeometry, processor: &mut P) -> R
     process_geom_n(ggeom, 0, processor)
 }
 
-fn process_geom_n<'a, P: GeomProcessor, G: Geom<'a>>(
+fn process_geom_n<P: GeomProcessor, G: Geom>(
     ggeom: &G,
     idx: usize,
     processor: &mut P,
@@ -128,7 +128,7 @@ fn process_coord_seq<P: GeomProcessor>(
     Ok(())
 }
 
-fn process_point<'a, P: GeomProcessor, G: Geom<'a>>(
+fn process_point<P: GeomProcessor, G: Geom>(
     ggeom: &G,
     idx: usize,
     processor: &mut P,
@@ -139,7 +139,7 @@ fn process_point<'a, P: GeomProcessor, G: Geom<'a>>(
     process_coord_seq(&cs, idx, processor)
 }
 
-fn process_linestring<'a, P: GeomProcessor, G: Geom<'a>>(
+fn process_linestring<P: GeomProcessor, G: Geom>(
     ggeom: &G,
     tagged: bool,
     idx: usize,
@@ -154,7 +154,7 @@ fn process_linestring<'a, P: GeomProcessor, G: Geom<'a>>(
     processor.linestring_end(tagged, idx)
 }
 
-fn process_polygon<'a, P: GeomProcessor, G: Geom<'a>>(
+fn process_polygon<P: GeomProcessor, G: Geom>(
     ggeom: &G,
     tagged: bool,
     idx: usize,

geozero/src/geos/geos_writer.rs

@@ -3,16 +3,16 @@ use crate::{FeatureProcessor, GeomProcessor, PropertyProcessor};
 use geos::{CoordDimensions, CoordSeq, GResult, Geometry as GGeometry};
 
 /// Generator for GEOS geometry type.
-pub struct GeosWriter<'a> {
-    pub(crate) geom: GGeometry<'a>,
+pub struct GeosWriter {
+    pub(crate) geom: GGeometry,
     srid: Option<i32>,
     // CoordSeq for Points, Lines and Rings
-    cs: Vec<CoordSeq<'a>>,
+    cs: Vec<CoordSeq>,
     // Polygons or MultiPolygons
-    polys: Vec<GGeometry<'a>>,
+    polys: Vec<GGeometry>,
 }
 
-impl<'a> GeosWriter<'a> {
+impl GeosWriter {
     pub fn new() -> Self {
         Self::default()
     }
@@ -21,12 +21,12 @@ impl<'a> GeosWriter<'a> {
             .push(CoordSeq::new(len as u32, CoordDimensions::TwoD)?);
         Ok(())
     }
-    pub fn geometry(&self) -> &GGeometry<'a> {
+    pub fn geometry(&self) -> &GGeometry {
         &self.geom
     }
 }
 
-impl<'a> Default for GeosWriter<'a> {
+impl Default for GeosWriter {
     fn default() -> Self {
         GeosWriter {
             geom: GGeometry::create_empty_point().unwrap(),
@@ -37,7 +37,7 @@ impl<'a> Default for GeosWriter<'a> {
     }
 }
 
-impl GeomProcessor for GeosWriter<'_> {
+impl GeomProcessor for GeosWriter {
     fn srid(&mut self, srid: Option<i32>) -> Result<()> {
         self.srid = srid;
         Ok(())
@@ -168,8 +168,8 @@ impl GeomProcessor for GeosWriter<'_> {
     }
 }
 
-impl PropertyProcessor for GeosWriter<'_> {}
-impl FeatureProcessor for GeosWriter<'_> {}
+impl PropertyProcessor for GeosWriter {}
+impl FeatureProcessor for GeosWriter {}
 
 #[cfg(test)]
 #[cfg(feature = "with-geojson")]

geozero/src/geos/mod.rs

@@ -13,11 +13,11 @@ pub(crate) mod conversion {
     /// Convert to GEOS geometry.
     pub trait ToGeos {
         /// Convert to GEOS geometry.
-        fn to_geos(&self) -> Result<geos::Geometry<'_>>;
+        fn to_geos(&self) -> Result<geos::Geometry>;
     }
 
     impl<T: GeozeroGeometry> ToGeos for T {
-        fn to_geos(&self) -> Result<geos::Geometry<'_>> {
+        fn to_geos(&self) -> Result<geos::Geometry> {
             let mut geos = GeosWriter::new();
             self.process_geom(&mut geos)?;
             Ok(geos.geom)
@@ -32,7 +32,7 @@ mod wkb {
     use crate::wkb::{FromWkb, WkbDialect};
     use std::io::Read;
 
-    impl FromWkb for geos::Geometry<'_> {
+    impl FromWkb for geos::Geometry {
         fn from_wkb<R: Read>(rdr: &mut R, dialect: WkbDialect) -> Result<Self> {
             let mut geos = GeosWriter::new();
             crate::wkb::process_wkb_type_geom(rdr, &mut geos, dialect)?;