feat: Generic Precision

CHANGES.md

@@ -5,6 +5,7 @@
 * Add support for foreign members to `FeatureWriter`.
 * Added conversion from `Vec<Feature>` to `GeoJson`.
 * Changed `Serialize` impls to avoid creating intermediate `JsonObject`s.
+* Add support for generic precision
 
 ## 0.24.1
 

benches/parse.rs

@@ -21,7 +21,7 @@ fn parse_feature_collection_benchmark(c: &mut Criterion) {
     c.bench_function("FeatureReader::features (countries.geojson)", |b| {
         b.iter(|| {
             let feature_reader =
-                geojson::FeatureReader::from_reader(BufReader::new(geojson_str.as_bytes()));
+                geojson::FeatureReader::<_, f64>::from_reader(BufReader::new(geojson_str.as_bytes()));
             let mut count = 0;
             for feature in feature_reader.features() {
                 let feature = feature.unwrap();
@@ -41,7 +41,7 @@ fn parse_feature_collection_benchmark(c: &mut Criterion) {
                 name: String,
             }
             let feature_reader =
-                geojson::FeatureReader::from_reader(BufReader::new(geojson_str.as_bytes()));
+                geojson::FeatureReader::<_, f64>::from_reader(BufReader::new(geojson_str.as_bytes()));
 
             let mut count = 0;
             for feature in feature_reader.deserialize::<Country>().unwrap() {
@@ -66,7 +66,7 @@ fn parse_feature_collection_benchmark(c: &mut Criterion) {
                     name: String,
                 }
                 let feature_reader =
-                    geojson::FeatureReader::from_reader(BufReader::new(geojson_str.as_bytes()));
+                    geojson::FeatureReader::<_, f64>::from_reader(BufReader::new(geojson_str.as_bytes()));
 
                 let mut count = 0;
                 for feature in feature_reader.deserialize::<Country>().unwrap() {

examples/deserialize.rs

@@ -22,7 +22,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     // Write the structs back to GeoJSON
     let file_writer = BufWriter::new(File::create("example-output-countries.geojson")?);
-    geojson::ser::to_feature_collection_writer(file_writer, &countries)?;
+    geojson::ser::to_feature_collection_writer::<_, _, f64>(file_writer, &countries)?;
 
     Ok(())
 }

examples/deserialize_to_geo_types.rs

@@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     // Write the structs back to GeoJSON
     let file_writer = BufWriter::new(File::create("example-output-countries.geojson")?);
-    geojson::ser::to_feature_collection_writer(file_writer, &countries)?;
+    geojson::ser::to_feature_collection_writer::<_, _, f64>(file_writer, &countries)?;
 
     Ok(())
 }

examples/stream_reader_writer.rs

@@ -24,7 +24,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let reader = {
         let file_reader = BufReader::new(File::open("tests/fixtures/countries.geojson")?);
-        FeatureReader::from_reader(file_reader)
+        FeatureReader::<_, f64>::from_reader(file_reader)
     };
 
     let mut writer = {

src/conversion/from_geo_types.rs

@@ -1,14 +1,15 @@
 use geo_types::{self, CoordFloat};
+use serde::Serialize;
 
 use crate::{geometry, Feature, FeatureCollection};
 
 use crate::{LineStringType, PointType, PolygonType};
 use std::convert::From;
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Point<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Point<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(point: &geo_types::Point<T>) -> Self {
         let coords = create_point_type(point);
@@ -18,9 +19,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::MultiPoint<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::MultiPoint<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(multi_point: &geo_types::MultiPoint<T>) -> Self {
         let coords = multi_point
@@ -34,9 +35,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::LineString<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::LineString<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(line_string: &geo_types::LineString<T>) -> Self {
         let coords = create_line_string_type(line_string);
@@ -46,9 +47,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Line<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Line<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(line: &geo_types::Line<T>) -> Self {
         let coords = create_from_line_type(line);
@@ -58,9 +59,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Triangle<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Triangle<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(triangle: &geo_types::Triangle<T>) -> Self {
         let coords = create_from_triangle_type(triangle);
@@ -70,9 +71,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Rect<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Rect<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(rect: &geo_types::Rect<T>) -> Self {
         let coords = create_from_rect_type(rect);
@@ -82,9 +83,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::MultiLineString<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::MultiLineString<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(multi_line_string: &geo_types::MultiLineString<T>) -> Self {
         let coords = create_multi_line_string_type(multi_line_string);
@@ -94,9 +95,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Polygon<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Polygon<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(polygon: &geo_types::Polygon<T>) -> Self {
         let coords = create_polygon_type(polygon);
@@ -106,9 +107,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::MultiPolygon<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::MultiPolygon<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(multi_polygon: &geo_types::MultiPolygon<T>) -> Self {
         let coords = create_multi_polygon_type(multi_polygon);
@@ -118,9 +119,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::GeometryCollection<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::GeometryCollection<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(geometry_collection: &geo_types::GeometryCollection<T>) -> Self {
         let values = geometry_collection
@@ -134,12 +135,12 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::GeometryCollection<T>> for FeatureCollection
+impl<'a, T> From<&'a geo_types::GeometryCollection<T>> for FeatureCollection<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     fn from(geometry_collection: &geo_types::GeometryCollection<T>) -> Self {
-        let values: Vec<Feature> = geometry_collection
+        let values: Vec<Feature<T>> = geometry_collection
             .0
             .iter()
             .map(|geometry| geometry::Geometry::new(geometry::Value::from(geometry)).into())
@@ -154,9 +155,9 @@ where
 }
 
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-impl<'a, T> From<&'a geo_types::Geometry<T>> for geometry::Value
+impl<'a, T> From<&'a geo_types::Geometry<T>> for geometry::Value<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     /// Convert from `geo_types::Geometry` enums
     fn from(geometry: &'a geo_types::Geometry<T>) -> Self {
@@ -179,55 +180,55 @@ where
     }
 }
 
-fn create_point_type<T>(point: &geo_types::Point<T>) -> PointType
+fn create_point_type<T>(point: &geo_types::Point<T>) -> PointType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
-    let x: f64 = point.x().to_f64().unwrap();
-    let y: f64 = point.y().to_f64().unwrap();
+    let x = point.x();
+    let y = point.y();
 
     vec![x, y]
 }
 
-fn create_line_string_type<T>(line_string: &geo_types::LineString<T>) -> LineStringType
+fn create_line_string_type<T>(line_string: &geo_types::LineString<T>) -> LineStringType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     line_string
         .points_iter()
         .map(|point| create_point_type(&point))
         .collect()
 }
 
-fn create_from_line_type<T>(line_string: &geo_types::Line<T>) -> LineStringType
+fn create_from_line_type<T>(line_string: &geo_types::Line<T>) -> LineStringType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     vec![
         create_point_type(&line_string.start_point()),
         create_point_type(&line_string.end_point()),
     ]
 }
 
-fn create_from_triangle_type<T>(triangle: &geo_types::Triangle<T>) -> PolygonType
+fn create_from_triangle_type<T>(triangle: &geo_types::Triangle<T>) -> PolygonType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     create_polygon_type(&triangle.to_polygon())
 }
 
-fn create_from_rect_type<T>(rect: &geo_types::Rect<T>) -> PolygonType
+fn create_from_rect_type<T>(rect: &geo_types::Rect<T>) -> PolygonType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     create_polygon_type(&rect.to_polygon())
 }
 
 fn create_multi_line_string_type<T>(
     multi_line_string: &geo_types::MultiLineString<T>,
-) -> Vec<LineStringType>
+) -> Vec<LineStringType<T>>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     multi_line_string
         .0
@@ -236,9 +237,9 @@ where
         .collect()
 }
 
-fn create_polygon_type<T>(polygon: &geo_types::Polygon<T>) -> PolygonType
+fn create_polygon_type<T>(polygon: &geo_types::Polygon<T>) -> PolygonType<T>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     let mut coords = vec![polygon
         .exterior()
@@ -256,9 +257,9 @@ where
     coords
 }
 
-fn create_multi_polygon_type<T>(multi_polygon: &geo_types::MultiPolygon<T>) -> Vec<PolygonType>
+fn create_multi_polygon_type<T>(multi_polygon: &geo_types::MultiPolygon<T>) -> Vec<PolygonType<T>>
 where
-    T: CoordFloat,
+    T: CoordFloat + Serialize,
 {
     multi_polygon
         .0

src/conversion/mod.rs

@@ -24,8 +24,10 @@ use std::convert::TryInto;
 macro_rules! assert_almost_eq {
     ($x:expr, $y:expr, $epsilon:expr) => {{
         use num_traits::Zero;
-        let a = $x.abs();
-        let b = $y.abs();
+        let x = $x as f64;
+        let y = $y as f64;
+        let a = x.abs();
+        let b = y.abs();
         let delta = (a - b).abs();
 
         if a.is_infinite() || a.is_nan() || b.is_infinite() || b.is_nan() {
@@ -66,10 +68,10 @@ macro_rules! assert_almost_eq {
 macro_rules! try_from_owned_value {
     ($to:ty) => {
         #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-        impl<T: CoordFloat> TryFrom<geometry::Value> for $to {
-            type Error = Error;
+        impl<T: CoordFloat + serde::Serialize> TryFrom<geometry::Value<T>> for $to {
+            type Error = Error<T>;
 
-            fn try_from(value: geometry::Value) -> Result<Self> {
+            fn try_from(value: geometry::Value<T>) -> Result<Self, T> {
                 (&value).try_into()
             }
         }
@@ -80,9 +82,9 @@ pub(crate) mod from_geo_types;
 pub(crate) mod to_geo_types;
 
 // Process top-level `GeoJSON` items, returning a geo_types::GeometryCollection or an Error
-fn process_geojson<T>(gj: &GeoJson) -> Result<geo_types::GeometryCollection<T>>
+fn process_geojson<T>(gj: &GeoJson<T>) -> Result<geo_types::GeometryCollection<T>, T>
 where
-    T: CoordFloat,
+    T: CoordFloat + serde::Serialize,
 {
     match gj {
         FeatureCollection(collection) => Ok(GeometryCollection(
@@ -92,7 +94,7 @@ where
                 // Only pass on non-empty geometries
                 .filter_map(|feature| feature.geometry.as_ref())
                 .map(|geometry| geometry.clone().try_into())
-                .collect::<Result<_>>()?,
+                .collect::<Result<_, T>>()?,
         )),
         Feature(feature) => {
             if let Some(geometry) = &feature.geometry {
@@ -139,9 +141,9 @@ where
 /// let mut collection: GeometryCollection<f64> = quick_collection(&geojson).unwrap();
 /// ```
 #[cfg_attr(docsrs, doc(cfg(feature = "geo-types")))]
-pub fn quick_collection<T>(gj: &GeoJson) -> Result<geo_types::GeometryCollection<T>>
+pub fn quick_collection<T>(gj: &GeoJson<T>) -> Result<geo_types::GeometryCollection<T>, T>
 where
-    T: CoordFloat,
+    T: CoordFloat + serde::Serialize,
 {
     process_geojson(gj)
 }