Remove functionality moved to geoarrow-js (#83)

* Use functionality moved to geoarrow-js

* fix import

* remove duplicative validation functions

* fmt

Author: kylebarron

examples/linestring/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@geoarrow/deck.gl-layers": "../../",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/multilinestring/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/multipoint/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/multipolygon/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@geoarrow/deck.gl-layers": "../../",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/point/package.json

@@ -8,7 +8,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/polygon/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@geoarrow/deck.gl-layers": "../../",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

examples/text/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@geoarrow/deck.gl-layers": "../../",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "deck.gl": "^8.9.23",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

package-lock.json

@@ -46,7 +46,7 @@
     "@deck.gl/geo-layers": "^8.9.23",
     "@deck.gl/layers": "^8.9.23",
     "@math.gl/polygon": "^3.6.2",
-    "apache-arrow": "^13.0.0"
+    "apache-arrow": ">=14"
   },
   "devDependencies": {
     "@deck.gl/aggregation-layers": "^8.9.23",
@@ -56,7 +56,7 @@
     "@math.gl/polygon": "^3.6.2",
     "@rollup/plugin-terser": "^0.4.3",
     "@rollup/plugin-typescript": "^11.1.2",
-    "apache-arrow": "^13.0.0",
+    "apache-arrow": ">=14",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
     "rollup": "^3.26.2",
@@ -72,5 +72,8 @@
   "volta": {
     "node": "20.8.0",
     "npm": "10.2.0"
+  },
+  "dependencies": {
+    "@geoarrow/geoarrow-js": "^0.1.0"
   }
 }

package.json

@@ -5,23 +5,17 @@ import {
   GetPickingInfoParams,
   Layer,
   LayersList,
+  assert,
 } from "@deck.gl/core/typed";
 import { ArcLayer } from "@deck.gl/layers/typed";
 import type { ArcLayerProps } from "@deck.gl/layers/typed";
 import * as arrow from "apache-arrow";
-import {
-  assignAccessor,
-  extractAccessorsFromProps,
-  getPointChild,
-} from "./utils.js";
+import * as ga from "@geoarrow/geoarrow-js";
+import { assignAccessor, extractAccessorsFromProps } from "./utils.js";
+import { child } from "@geoarrow/geoarrow-js";
 import { getPickingInfo } from "./picking.js";
-import {
-  ColorAccessor,
-  FloatAccessor,
-  GeoArrowPickingInfo,
-  PointVector,
-} from "./types.js";
-import { validateAccessors, validatePointType } from "./validate.js";
+import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "./types.js";
+import { validateAccessors } from "./validate.js";
 
 /** All properties supported by GeoArrowArcLayer */
 export type GeoArrowArcLayerProps = Omit<
@@ -45,12 +39,12 @@ type _GeoArrowArcLayerProps = {
   /**
    * Method called to retrieve the source position of each object.
    */
-  getSourcePosition: PointVector;
+  getSourcePosition: ga.vector.PointVector;
 
   /**
    * Method called to retrieve the target position of each object.
    */
-  getTargetPosition: PointVector;
+  getTargetPosition: ga.vector.PointVector;
 
   /**
    * The rgba color is in the format of `[r, g, b, [a]]`.
@@ -133,8 +127,8 @@ export class GeoArrowArcLayer<
 
       // Note: below we iterate over table batches anyways, so this layer won't
       // work as-is if data/table is null
-      validatePointType(sourcePosition.type);
-      validatePointType(targetPosition.type);
+      assert(ga.vector.isPointVector(sourcePosition));
+      assert(ga.vector.isPointVector(targetPosition));
     }
 
     // Exclude manually-set accessors
@@ -150,9 +144,9 @@ export class GeoArrowArcLayer<
       recordBatchIdx++
     ) {
       const sourceData = sourcePosition.data[recordBatchIdx];
-      const sourceValues = getPointChild(sourceData).values;
+      const sourceValues = child.getPointChild(sourceData).values;
       const targetData = targetPosition.data[recordBatchIdx];
-      const targetValues = getPointChild(targetData).values;
+      const targetValues = child.getPointChild(targetData).values;
 
       const props: ArcLayerProps = {
         // Note: because this is a composite layer and not doing the rendering