-

georust · Jul 21, 2020 · 2e57712 · 2e57712
1 parent 79553fc
commit 2e57712
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/feature.rs b/src/feature.rs
@@ -100,16 +100,16 @@ impl Serialize for Feature {
     }
 }
 
-impl<'de> Deserialize<'de> for Feature {
-    fn deserialize<D>(deserializer: D) -> Result<Feature, D::Error>
+impl<'de, Pos: Position> Deserialize<'de> for FeatureBase<Pos> {
+    fn deserialize<D>(deserializer: D) -> Result<FeatureBase<Pos>, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error as SerdeError;
 
         let val = JsonObject::deserialize(deserializer)?;
 
-        Feature::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
+        FeatureBase::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
     }
 }
 

diff --git a/src/feature_collection.rs b/src/feature_collection.rs
@@ -84,7 +84,7 @@ impl<'a> From<&'a FeatureCollection> for JsonObject {
     }
 }
 
-impl FeatureCollection {
+impl<Pos: Position> FeatureCollectionBase<Pos> {
     pub fn from_json_object(object: JsonObject) -> Result<Self, Error> {
         Self::try_from(object)
     }
@@ -112,7 +112,7 @@ impl<P: Position> TryFrom<JsonObject> for FeatureCollectionBase<P> {
     }
 }
 
-impl TryFrom<JsonValue> for FeatureCollection {
+impl<Pos: Position> TryFrom<JsonValue> for FeatureCollectionBase<Pos> {
     type Error = Error;
 
     fn try_from(value: JsonValue) -> Result<Self, Error> {
@@ -133,15 +133,15 @@ impl Serialize for FeatureCollection {
     }
 }
 
-impl<'de> Deserialize<'de> for FeatureCollection {
-    fn deserialize<D>(deserializer: D) -> Result<FeatureCollection, D::Error>
+impl<'de, Pos: Position> Deserialize<'de> for FeatureCollectionBase<Pos> {
+    fn deserialize<D>(deserializer: D) -> Result<FeatureCollectionBase<Pos>, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error as SerdeError;
 
         let val = JsonObject::deserialize(deserializer)?;
 
-        FeatureCollection::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
+        FeatureCollectionBase::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
     }
 }
diff --git a/src/geojson.rs b/src/geojson.rs
@@ -187,16 +187,16 @@ impl Serialize for GeoJson {
     }
 }
 
-impl<'de> Deserialize<'de> for GeoJson {
-    fn deserialize<D>(deserializer: D) -> Result<GeoJson, D::Error>
+impl<'de, Pos: Position> Deserialize<'de> for GeoJsonBase<Pos> {
+    fn deserialize<D>(deserializer: D) -> Result<GeoJsonBase<Pos>, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error as SerdeError;
 
         let val = JsonObject::deserialize(deserializer)?;
 
-        GeoJson::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
+        GeoJsonBase::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
     }
 }
 

diff --git a/src/geometry.rs b/src/geometry.rs
@@ -276,16 +276,16 @@ impl Serialize for Geometry {
     }
 }
 
-impl<'de> Deserialize<'de> for Geometry {
-    fn deserialize<D>(deserializer: D) -> Result<Geometry, D::Error>
+impl<'de, Pos: Position> Deserialize<'de> for GeometryBase<Pos> {
+    fn deserialize<D>(deserializer: D) -> Result<GeometryBase<Pos>, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error as SerdeError;
 
         let val = JsonObject::deserialize(deserializer)?;
 
-        Geometry::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
+        GeometryBase::from_json_object(val).map_err(|e| D::Error::custom(e.to_string()))
     }
 }