Move to upstream geo-traits (#841)

Author: kylebarron

Cargo.lock

@@ -64,6 +64,7 @@ futures = { version = "0.3", optional = true }
 gdal = { version = "0.17", optional = true }
 geo = "0.28"
 geo-index = "0.1.1"
+geo-traits = "0.1.1"
 geos = { version = "9.0", features = ["v3_10_0", "geo"], optional = true }
 geozero = { version = "0.14", features = ["with-wkb"] }
 half = { version = "2.4.1" }
@@ -95,7 +96,8 @@ sqlx = { version = "0.7", optional = true, default-features = false, features =
 ] }
 thiserror = "1"
 tokio = { version = "1", default-features = false, optional = true }
-wkt = "0.11"
+# wkt = "0.11"
+wkt = { git = "https://github.com/georust/wkt", branch = "kyle/geo-traits-writer" }
 
 
 [dev-dependencies]

Cargo.toml

@@ -89,6 +89,7 @@ bytes = { version = "1", optional = true }
 console_error_panic_hook = { version = "0.1.6", optional = true }
 futures = { version = "0.3.30", optional = true }
 geo = "0.28"
+geo-traits = "0.1.1"
 geoarrow = { path = "../" }
 geodesy = { version = "0.12", optional = true, features = ["js"] }
 object_store = { version = "0.11", optional = true }

js/Cargo.lock

@@ -3,7 +3,7 @@ use crate::error::{GeoArrowWasmError, WasmResult};
 use crate::io::parquet::options::JsParquetReaderOptions;
 use arrow_wasm::{RecordBatch, Table};
 use futures::stream::StreamExt;
-use geoarrow::geo_traits::CoordTrait;
+use geo_traits::CoordTrait;
 use geoarrow::io::parquet::metadata::GeoParquetBboxCovering;
 use geoarrow::io::parquet::{
     GeoParquetDatasetMetadata, GeoParquetReaderMetadata, GeoParquetReaderOptions,

js/Cargo.toml

@@ -18,6 +18,7 @@ arrow = "53"
 arrow-array = "53"
 arrow-buffer = "53"
 arrow-schema = "53"
+geo-traits = "0.1.1"
 geoarrow = { path = "../" }
 # Uncomment when publishing
 # geoarrow = { version = "0.4.0-beta.1" }

js/src/io/parquet/async.rs

@@ -50,6 +50,7 @@ pyo3-asyncio-0-21 = { version = "0.21", features = [
 ], optional = true }
 pythonize = "0.21"
 geo = "0.28"
+geo-traits = { workspace = true }
 geoarrow = { path = "../../", features = [
     "csv",
     "flatgeobuf",

python/Cargo.lock

@@ -8,8 +8,8 @@ use crate::io::object_store::PyObjectStore;
 use crate::io::parquet::options::create_options;
 use crate::util::table_to_pytable;
 
+use geo_traits::CoordTrait;
 use geoarrow::error::GeoArrowError;
-use geoarrow::geo_traits::CoordTrait;
 use geoarrow::io::parquet::metadata::GeoParquetBboxCovering;
 use geoarrow::io::parquet::{
     GeoParquetDatasetMetadata, GeoParquetReaderMetadata, GeoParquetReaderOptions,

python/Cargo.toml

@@ -2,10 +2,6 @@ use crate::algorithm::native::{Binary, Unary};
 use crate::array::*;
 use crate::datatypes::{Dimension, NativeType};
 use crate::error::GeoArrowError;
-use crate::geo_traits::{
-    GeometryCollectionTrait, GeometryTrait, LineStringTrait, MultiLineStringTrait, MultiPointTrait,
-    MultiPolygonTrait, PointTrait, PolygonTrait,
-};
 use crate::io::geo::{
     geometry_collection_to_geo, geometry_to_geo, line_string_to_geo, multi_line_string_to_geo,
     multi_point_to_geo, multi_polygon_to_geo, point_to_geo, polygon_to_geo,
@@ -15,6 +11,10 @@ use crate::NativeArray;
 use arrow_array::builder::BooleanBuilder;
 use arrow_array::BooleanArray;
 use geo::Contains as _Contains;
+use geo_traits::{
+    GeometryCollectionTrait, GeometryTrait, LineStringTrait, MultiLineStringTrait, MultiPointTrait,
+    MultiPolygonTrait, PointTrait, PolygonTrait,
+};
 
 /// Checks if `rhs` is completely contained within `self`.
 /// More formally, the interior of `rhs` has non-empty