Remove geoarrow crate from JS bindings deps (#1133)

For #1102 and
#1126

Author: kylebarron

js/Cargo.lock

@@ -26,7 +26,7 @@ data = []
 
 geodesy = ["dep:geodesy"]
 debug = ["console_error_panic_hook"]
-io_flatgeobuf = ["geoarrow/flatgeobuf", "table"]
+# io_flatgeobuf = ["geoarrow/flatgeobuf", "table"]
 io_geojson = ["table"]
 io_http = []
 io_object_store = [
@@ -96,7 +96,6 @@ console_error_panic_hook = { version = "0.1.6", optional = true }
 futures = { version = "0.3.30", optional = true }
 geo = "0.30"
 geo-traits = "0.2"
-geoarrow = { path = "../rust/geoarrow" }
 geoarrow-schema = { path = "../rust/geoarrow-schema" }
 geoarrow-array = { path = "../rust/geoarrow-array" }
 geoarrow-geoparquet = { path = "../rust/geoarrow-geoparquet", optional = true }

js/Cargo.toml

@@ -1,83 +1,27 @@
-use arrow_buffer::ScalarBuffer;
+use geoarrow_array::array::{CoordBuffer, InterleavedCoordBuffer, SeparatedCoordBuffer};
 use geoarrow_schema::Dimension;
 use wasm_bindgen::prelude::*;
 
-// TODO: remove InterleavedCoordBuffer and SeparatedCoordBuffer structs?
-
-/// An immutable buffer of interleaved coordinates in WebAssembly memory.
-#[wasm_bindgen]
-pub struct InterleavedCoordBuffer(pub(crate) geoarrow::array::InterleavedCoordBuffer);
-
-#[wasm_bindgen]
-impl InterleavedCoordBuffer {
-    #[wasm_bindgen(constructor)]
-    pub fn new(coords: Vec<f64>) -> Self {
-        Self(geoarrow::array::InterleavedCoordBuffer::new(
-            coords.into(),
-            Dimension::XY,
-        ))
-    }
-}
-
-/// An immutable buffer of separated coordinates in WebAssembly memory.
-#[wasm_bindgen]
-pub struct SeparatedCoordBuffer(pub(crate) geoarrow::array::SeparatedCoordBuffer);
-
-#[wasm_bindgen]
-impl SeparatedCoordBuffer {
-    #[wasm_bindgen(constructor)]
-    pub fn new(x: Vec<f64>, y: Vec<f64>) -> Self {
-        Self(geoarrow::array::SeparatedCoordBuffer::new(
-            [
-                x.into(),
-                y.into(),
-                ScalarBuffer::from(vec![]),
-                ScalarBuffer::from(vec![]),
-            ],
-            Dimension::XY,
-        ))
-    }
-}
+use crate::dimension::JsDimension;
 
 /// An immutable buffer of coordinates in WebAssembly memory, that can be either interleaved or
 /// separated.
 #[wasm_bindgen]
 #[allow(dead_code)]
-pub struct CoordBuffer(pub(crate) geoarrow::array::CoordBuffer);
+pub struct JsCoordBuffer(CoordBuffer);
 
 #[wasm_bindgen]
-impl CoordBuffer {
+impl JsCoordBuffer {
     /// Create a new CoordBuffer from a `Float64Array` of interleaved XY coordinates
     #[wasm_bindgen(js_name = fromInterleaved)]
-    pub fn from_interleaved(coords: Vec<f64>) -> Self {
-        let buffer = geoarrow::array::InterleavedCoordBuffer::new(coords.into(), Dimension::XY);
-        Self(geoarrow::array::CoordBuffer::Interleaved(buffer))
+    pub fn from_interleaved(coords: Vec<f64>, dim: JsDimension) -> Self {
+        Self(InterleavedCoordBuffer::new(coords.into(), dim.into()).into())
     }
 
     /// Create a new CoordBuffer from two `Float64Array`s of X and Y
     #[wasm_bindgen(js_name = fromSeparated)]
     pub fn from_separated(x: Vec<f64>, y: Vec<f64>) -> Self {
-        let buffer = geoarrow::array::SeparatedCoordBuffer::new(
-            [
-                x.into(),
-                y.into(),
-                ScalarBuffer::from(vec![]),
-                ScalarBuffer::from(vec![]),
-            ],
-            Dimension::XY,
-        );
-        Self(geoarrow::array::CoordBuffer::Separated(buffer))
-    }
-
-    /// Create a new CoordBuffer from an `InterleavedCoordBuffer` object
-    #[wasm_bindgen(js_name = fromInterleavedCoords)]
-    pub fn from_interleaved_coords(coords: InterleavedCoordBuffer) -> Self {
-        Self(geoarrow::array::CoordBuffer::Interleaved(coords.0))
-    }
-
-    /// Create a new CoordBuffer from a `SeparatedCoordBuffer` object
-    #[wasm_bindgen(js_name = fromSeparatedCoords)]
-    pub fn from_separated_coords(coords: SeparatedCoordBuffer) -> Self {
-        Self(geoarrow::array::CoordBuffer::Separated(coords.0))
+        let cb = SeparatedCoordBuffer::from_vec(vec![x.into(), y.into()], Dimension::XY).unwrap();
+        Self(cb.into())
     }
 }

js/src/broadcasting/affine.rs

@@ -1,3 +1,3 @@
-pub mod coord;
+mod coord;
 
-pub use coord::{CoordBuffer, InterleavedCoordBuffer, SeparatedCoordBuffer};
+pub use coord::JsCoordBuffer;

js/src/broadcasting/linestring.rs

@@ -0,0 +1,23 @@
+use geoarrow_array::GeoArrowType;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(js_name = GeoArrowType)]
+pub struct JsGeoArrowType(GeoArrowType);
+
+impl JsGeoArrowType {
+    pub fn new(geoarrow_type: GeoArrowType) -> Self {
+        Self(geoarrow_type)
+    }
+}
+
+impl From<JsGeoArrowType> for GeoArrowType {
+    fn from(value: JsGeoArrowType) -> Self {
+        value.0
+    }
+}
+
+impl From<GeoArrowType> for JsGeoArrowType {
+    fn from(value: GeoArrowType) -> Self {
+        Self(value)
+    }
+}