Deduplicate extension name string (#223)

* Add extension name * deduplicate extension name --------- Co-authored-by: lewiszlw <[email protected]>
geoarrow · Nov 4, 2023 · d21d6c9 · d21d6c9
1 parent daaf386
commit d21d6c9
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/src/array/binary/array.rs b/src/array/binary/array.rs
@@ -59,7 +59,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for WKBArray<O> {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.wkb".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/geometrycollection/array.rs b/src/array/geometrycollection/array.rs
@@ -78,7 +78,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for GeometryCollectionArray<
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.geometrycollection".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/linestring/array.rs b/src/array/linestring/array.rs
@@ -128,7 +128,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for LineStringArray<O> {
         let mut field_metadata = HashMap::new();
         field_metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.linestring".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("", self.storage_type(), true).with_metadata(field_metadata))
     }

diff --git a/src/array/mixed/array.rs b/src/array/mixed/array.rs
@@ -229,7 +229,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for MixedGeometryArray<O> {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.mixed".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/multilinestring/array.rs b/src/array/multilinestring/array.rs
@@ -163,7 +163,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for MultiLineStringArray<O>
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.multilinestring".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/multipoint/array.rs b/src/array/multipoint/array.rs
@@ -127,7 +127,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for MultiPointArray<O> {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.multipoint".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/multipolygon/array.rs b/src/array/multipolygon/array.rs
@@ -195,7 +195,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for MultiPolygonArray<O> {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.multipolygon".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/point/array.rs b/src/array/point/array.rs
@@ -92,7 +92,7 @@ impl<'a> GeometryArrayTrait<'a> for PointArray {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.point".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/polygon/array.rs b/src/array/polygon/array.rs
@@ -163,7 +163,7 @@ impl<'a, O: OffsetSizeTrait> GeometryArrayTrait<'a> for PolygonArray<O> {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow.polygon".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }

diff --git a/src/array/rect/array.rs b/src/array/rect/array.rs
@@ -50,14 +50,15 @@ impl<'a> GeometryArrayTrait<'a> for RectArray {
         let mut metadata = HashMap::new();
         metadata.insert(
             "ARROW:extension:name".to_string(),
-            "geoarrow._rect".to_string(),
+            self.extension_name().to_string(),
         );
         Arc::new(Field::new("geometry", self.storage_type(), true).with_metadata(metadata))
     }
 
     fn extension_name(&self) -> &str {
         "geoarrow._rect"
     }
+
     fn into_arrow(self) -> Self::ArrowArray {
         let inner_field = self.inner_field();
         let validity = self.validity;