diff --git a/Cargo.toml b/Cargo.toml index 0d23ced..660ff7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,3 +26,6 @@ default = ["geo-types"] [[bench]] name = "parse" harness = false + +[patch.crates-io] +geo-types = { git = "https://github.com/nyurik/geo", branch = "dim" } diff --git a/src/conversion.rs b/src/conversion.rs index 306e330..ca3ffa1 100644 --- a/src/conversion.rs +++ b/src/conversion.rs @@ -278,7 +278,7 @@ where .map(Geometry::try_into) .collect::>()?; - Ok(geo_types::GeometryCollection::new_from(geo_geometries)) + Ok(geo_types::GeometryCollection::new(geo_geometries)) } } @@ -871,7 +871,7 @@ mod tests { ]); let g_geometrycollection: geo_types::GeometryCollection = - geo_types::GeometryCollection::new_from(vec![ + geo_types::GeometryCollection::new(vec![ geo_types::Geometry::Point(g_point), geo_types::Geometry::MultiPoint(g_multipoint), geo_types::Geometry::LineString(g_linestring), diff --git a/src/deserialize.rs b/src/deserialize.rs index ec7a23a..894eee5 100644 --- a/src/deserialize.rs +++ b/src/deserialize.rs @@ -127,7 +127,7 @@ where /// # extern crate wkt; /// # extern crate geo_types; /// # extern crate serde_json; -/// use geo_types::Point; +/// use geo_types::{Point, PointTZM}; /// /// #[derive(serde::Deserialize)] /// struct MyType { @@ -137,7 +137,7 @@ where /// /// let json = r#"{ "geometry": "POINT (3.14 42)" }"#; /// let my_type: MyType = serde_json::from_str(json).unwrap(); -/// assert!(matches!(my_type.geometry, Some(Point(_)))); +/// assert!(matches!(my_type.geometry, Some(PointTZM(_)))); /// /// let json = r#"{ "geometry": "POINT EMPTY" }"#; /// let my_type: MyType = serde_json::from_str(json).unwrap(); @@ -156,7 +156,7 @@ where geo_types::Geometry::try_from(wkt) .map_err(D::Error::custom) .and_then(|geom| { - use geo_types::Geometry::*; + use geo_types::GeometryTZM::*; match geom { Point(p) => Ok(Some(p)), MultiPoint(mp) if mp.0.is_empty() => Ok(None),