@loaders.gl/gis 4.0.3 → 4.1.0-alpha.1

package/dist/index.cjs

@@ -230,17 +230,15 @@ function getGeometryColumnsFromSchema(schema) {
 function getGeometryMetadataForField(field) {
   var _a, _b;
   let metadata = null;
-  const columnMetadata = (_a = field.metadata) == null ? void 0 : _a[GEOARROW_COLUMN_METADATA_METADATA];
-  if (columnMetadata) {
-    try {
-      metadata = JSON.parse(columnMetadata);
-    } catch (error) {
-      console.warn("Failed to parse GeoArrow metadata", error);
-    }
-  }
-  let geoEncoding = (_b = field.metadata) == null ? void 0 : _b[GEOARROW_COLUMN_METADATA_ENCODING];
+  let geoEncoding = (_a = field.metadata) == null ? void 0 : _a[GEOARROW_COLUMN_METADATA_ENCODING];
   if (geoEncoding) {
     geoEncoding = geoEncoding.toLowerCase();
+    if (geoEncoding === "wkb") {
+      geoEncoding = "geoarrow.wkb";
+    }
+    if (geoEncoding === "wkt") {
+      geoEncoding = "geoarrow.wkt";
+    }
     if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
       console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
     } else {
@@ -248,6 +246,14 @@ function getGeometryMetadataForField(field) {
       metadata.encoding = geoEncoding;
     }
   }
+  const columnMetadata = (_b = field.metadata) == null ? void 0 : _b[GEOARROW_COLUMN_METADATA_METADATA];
+  if (columnMetadata) {
+    try {
+      metadata = JSON.parse(columnMetadata);
+    } catch (error) {
+      console.warn("Failed to parse GeoArrow metadata", error);
+    }
+  }
   return metadata || null;
 }
 
@@ -282,7 +288,7 @@ function parseGeometry(geometry, columnMetadata, loaders) {
       const wkbLoader = loaders.find((loader) => loader.id === "wkb");
       const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
       const geojson = (_b = wkbLoader == null ? void 0 : wkbLoader.parseSync) == null ? void 0 : _b.call(wkbLoader, arrayBuffer, {
-        wkb: { shape: "geometry" }
+        wkb: { shape: "geojson-geometry" }
       });
       return geojson;
   }

package/dist/lib/geo/geoarrow-metadata.d.ts

@@ -1,15 +1,27 @@
 import { Schema, Field } from '@loaders.gl/schema';
 export type GeoArrowEncoding = 'geoarrow.multipolygon' | 'geoarrow.polygon' | 'geoarrow.multilinestring' | 'geoarrow.linestring' | 'geoarrow.multipoint' | 'geoarrow.point' | 'geoarrow.wkb' | 'geoarrow.wkt';
-/** Geospatial metadata for one column, extracted from Apache Arrow metadata */
+/**
+ * Geospatial metadata for one column, extracted from Apache Arrow metadata
+ * @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md
+ */
 export type GeoArrowMetadata = {
+    /** Encoding of geometry in this column */
     encoding?: GeoArrowEncoding;
+    /** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */
     crs?: Record<string, unknown>;
-    egdes?: 'spherical';
+    /** Edges are either spherical or omitted */
+    edges?: 'spherical';
     [key: string]: unknown;
 };
 /**
  * get geometry columns from arrow table
  */
 export declare function getGeometryColumnsFromSchema(schema: Schema): Record<string, GeoArrowMetadata>;
+/**
+ * Extracts GeoArrow metadata from a field
+ * @param field
+ * @returns
+ * @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md
+ */
 export declare function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null;
 //# sourceMappingURL=geoarrow-metadata.d.ts.map

package/dist/lib/geo/geoarrow-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geoarrow-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,GACxB,uBAAuB,GACvB,kBAAkB,GAClB,0BAA0B,GAC1B,qBAAqB,GACrB,qBAAqB,GACrB,gBAAgB,GAChB,cAAc,GACd,cAAc,CAAC;AAiBnB,+EAA+E;AAC/E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAS7F;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,KAAK,GAAG,gBAAgB,GAAG,IAAI,CA4BjF"}
+{"version":3,"file":"geoarrow-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,GACxB,uBAAuB,GACvB,kBAAkB,GAClB,0BAA0B,GAC1B,qBAAqB,GACrB,qBAAqB,GACrB,gBAAgB,GAChB,cAAc,GACd,cAAc,CAAC;AAiBnB;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,yHAAyH;IACzH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAS7F;AACD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,KAAK,GAAG,gBAAgB,GAAG,IAAI,CAmCjF"}

package/dist/lib/geo/geoarrow-metadata.js

@@ -14,17 +14,15 @@ export function getGeometryColumnsFromSchema(schema) {
 export function getGeometryMetadataForField(field) {
   var _field$metadata, _field$metadata2;
   let metadata = null;
-  const columnMetadata = (_field$metadata = field.metadata) === null || _field$metadata === void 0 ? void 0 : _field$metadata[GEOARROW_COLUMN_METADATA_METADATA];
-  if (columnMetadata) {
-    try {
-      metadata = JSON.parse(columnMetadata);
-    } catch (error) {
-      console.warn('Failed to parse GeoArrow metadata', error);
-    }
-  }
-  let geoEncoding = (_field$metadata2 = field.metadata) === null || _field$metadata2 === void 0 ? void 0 : _field$metadata2[GEOARROW_COLUMN_METADATA_ENCODING];
+  let geoEncoding = (_field$metadata = field.metadata) === null || _field$metadata === void 0 ? void 0 : _field$metadata[GEOARROW_COLUMN_METADATA_ENCODING];
   if (geoEncoding) {
     geoEncoding = geoEncoding.toLowerCase();
+    if (geoEncoding === 'wkb') {
+      geoEncoding = 'geoarrow.wkb';
+    }
+    if (geoEncoding === 'wkt') {
+      geoEncoding = 'geoarrow.wkt';
+    }
     if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
       console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
     } else {
@@ -32,6 +30,14 @@ export function getGeometryMetadataForField(field) {
       metadata.encoding = geoEncoding;
     }
   }
+  const columnMetadata = (_field$metadata2 = field.metadata) === null || _field$metadata2 === void 0 ? void 0 : _field$metadata2[GEOARROW_COLUMN_METADATA_METADATA];
+  if (columnMetadata) {
+    try {
+      metadata = JSON.parse(columnMetadata);
+    } catch (error) {
+      console.warn('Failed to parse GeoArrow metadata', error);
+    }
+  }
   return metadata || null;
 }
 //# sourceMappingURL=geoarrow-metadata.js.map

package/dist/lib/geo/geoarrow-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"geoarrow-metadata.js","names":["GEOARROW_ENCODINGS","GEOARROW_COLUMN_METADATA_ENCODING","GEOARROW_COLUMN_METADATA_METADATA","getGeometryColumnsFromSchema","schema","geometryColumns","field","fields","metadata","getGeometryMetadataForField","name","_field$metadata","_field$metadata2","columnMetadata","JSON","parse","error","console","warn","geoEncoding","toLowerCase","includes","encoding"],"sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {Schema, Field} from '@loaders.gl/schema';\n\nexport type GeoArrowEncoding =\n  | 'geoarrow.multipolygon'\n  | 'geoarrow.polygon'\n  | 'geoarrow.multilinestring'\n  | 'geoarrow.linestring'\n  | 'geoarrow.multipoint'\n  | 'geoarrow.point'\n  | 'geoarrow.wkb'\n  | 'geoarrow.wkt';\n\n/** Array containing all encodings */\nconst GEOARROW_ENCODINGS = [\n  'geoarrow.multipolygon',\n  'geoarrow.polygon',\n  'geoarrow.multilinestring',\n  'geoarrow.linestring',\n  'geoarrow.multipoint',\n  'geoarrow.point',\n  'geoarrow.wkb',\n  'geoarrow.wkt'\n];\n\nconst GEOARROW_COLUMN_METADATA_ENCODING = 'ARROW:extension:name';\nconst GEOARROW_COLUMN_METADATA_METADATA = 'ARROW:extension:metadata';\n\n/** Geospatial metadata for one column, extracted from Apache Arrow metadata */\nexport type GeoArrowMetadata = {\n  encoding?: GeoArrowEncoding;\n  crs?: Record<string, unknown>;\n  egdes?: 'spherical';\n  [key: string]: unknown;\n};\n\n/**\n * get geometry columns from arrow table\n */\nexport function getGeometryColumnsFromSchema(schema: Schema): Record<string, GeoArrowMetadata> {\n  const geometryColumns: Record<string, GeoArrowMetadata> = {};\n  for (const field of schema.fields) {\n    const metadata = getGeometryMetadataForField(field);\n    if (metadata) {\n      geometryColumns[field.name] = metadata;\n    }\n  }\n  return geometryColumns;\n}\n\nexport function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null {\n  let metadata: GeoArrowMetadata | null = null;\n\n  // Check for GeoArrow metadata\n  const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];\n  if (columnMetadata) {\n    try {\n      metadata = JSON.parse(columnMetadata);\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.warn('Failed to parse GeoArrow metadata', error);\n    }\n  }\n\n  // Check for GeoArrow column encoding\n  let geoEncoding = field.metadata?.[GEOARROW_COLUMN_METADATA_ENCODING];\n  if (geoEncoding) {\n    geoEncoding = geoEncoding.toLowerCase();\n    if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {\n      // eslint-disable-next-line no-console\n      console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);\n    } else {\n      metadata = metadata || ({} as GeoArrowMetadata);\n      metadata.encoding = geoEncoding as GeoArrowEncoding;\n    }\n  }\n\n  return metadata || null;\n}\n"],"mappings":"AAgBA,MAAMA,kBAAkB,GAAG,CACzB,uBAAuB,EACvB,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,cAAc,CACf;AAED,MAAMC,iCAAiC,GAAG,sBAAsB;AAChE,MAAMC,iCAAiC,GAAG,0BAA0B;AAapE,OAAO,SAASC,4BAA4BA,CAACC,MAAc,EAAoC;EAC7F,MAAMC,eAAiD,GAAG,CAAC,CAAC;EAC5D,KAAK,MAAMC,KAAK,IAAIF,MAAM,CAACG,MAAM,EAAE;IACjC,MAAMC,QAAQ,GAAGC,2BAA2B,CAACH,KAAK,CAAC;IACnD,IAAIE,QAAQ,EAAE;MACZH,eAAe,CAACC,KAAK,CAACI,IAAI,CAAC,GAAGF,QAAQ;IACxC;EACF;EACA,OAAOH,eAAe;AACxB;AAEA,OAAO,SAASI,2BAA2BA,CAACH,KAAY,EAA2B;EAAA,IAAAK,eAAA,EAAAC,gBAAA;EACjF,IAAIJ,QAAiC,GAAG,IAAI;EAG5C,MAAMK,cAAc,IAAAF,eAAA,GAAGL,KAAK,CAACE,QAAQ,cAAAG,eAAA,uBAAdA,eAAA,CAAiBT,iCAAiC,CAAC;EAC1E,IAAIW,cAAc,EAAE;IAClB,IAAI;MACFL,QAAQ,GAAGM,IAAI,CAACC,KAAK,CAACF,cAAc,CAAC;IACvC,CAAC,CAAC,OAAOG,KAAK,EAAE;MAEdC,OAAO,CAACC,IAAI,CAAC,mCAAmC,EAAEF,KAAK,CAAC;IAC1D;EACF;EAGA,IAAIG,WAAW,IAAAP,gBAAA,GAAGN,KAAK,CAACE,QAAQ,cAAAI,gBAAA,uBAAdA,gBAAA,CAAiBX,iCAAiC,CAAC;EACrE,IAAIkB,WAAW,EAAE;IACfA,WAAW,GAAGA,WAAW,CAACC,WAAW,CAAC,CAAC;IACvC,IAAI,CAACpB,kBAAkB,CAACqB,QAAQ,CAACF,WAAW,CAAC,EAAE;MAE7CF,OAAO,CAACC,IAAI,CAAE,8BAA6BC,WAAY,EAAC,CAAC;IAC3D,CAAC,MAAM;MACLX,QAAQ,GAAGA,QAAQ,IAAK,CAAC,CAAsB;MAC/CA,QAAQ,CAACc,QAAQ,GAAGH,WAA+B;IACrD;EACF;EAEA,OAAOX,QAAQ,IAAI,IAAI;AACzB"}
+{"version":3,"file":"geoarrow-metadata.js","names":["GEOARROW_ENCODINGS","GEOARROW_COLUMN_METADATA_ENCODING","GEOARROW_COLUMN_METADATA_METADATA","getGeometryColumnsFromSchema","schema","geometryColumns","field","fields","metadata","getGeometryMetadataForField","name","_field$metadata","_field$metadata2","geoEncoding","toLowerCase","includes","console","warn","encoding","columnMetadata","JSON","parse","error"],"sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {Schema, Field} from '@loaders.gl/schema';\n\nexport type GeoArrowEncoding =\n  | 'geoarrow.multipolygon'\n  | 'geoarrow.polygon'\n  | 'geoarrow.multilinestring'\n  | 'geoarrow.linestring'\n  | 'geoarrow.multipoint'\n  | 'geoarrow.point'\n  | 'geoarrow.wkb'\n  | 'geoarrow.wkt';\n\n/** Array containing all encodings */\nconst GEOARROW_ENCODINGS = [\n  'geoarrow.multipolygon',\n  'geoarrow.polygon',\n  'geoarrow.multilinestring',\n  'geoarrow.linestring',\n  'geoarrow.multipoint',\n  'geoarrow.point',\n  'geoarrow.wkb',\n  'geoarrow.wkt'\n];\n\nconst GEOARROW_COLUMN_METADATA_ENCODING = 'ARROW:extension:name';\nconst GEOARROW_COLUMN_METADATA_METADATA = 'ARROW:extension:metadata';\n\n/**\n * Geospatial metadata for one column, extracted from Apache Arrow metadata\n * @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md\n */\nexport type GeoArrowMetadata = {\n  /** Encoding of geometry in this column */\n  encoding?: GeoArrowEncoding;\n  /** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */\n  crs?: Record<string, unknown>;\n  /** Edges are either spherical or omitted */\n  edges?: 'spherical';\n  [key: string]: unknown;\n};\n\n/**\n * get geometry columns from arrow table\n */\nexport function getGeometryColumnsFromSchema(schema: Schema): Record<string, GeoArrowMetadata> {\n  const geometryColumns: Record<string, GeoArrowMetadata> = {};\n  for (const field of schema.fields) {\n    const metadata = getGeometryMetadataForField(field);\n    if (metadata) {\n      geometryColumns[field.name] = metadata;\n    }\n  }\n  return geometryColumns;\n}\n/**\n * Extracts GeoArrow metadata from a field\n * @param field\n * @returns\n * @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md\n */\nexport function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null {\n  let metadata: GeoArrowMetadata | null = null;\n\n  // Check for GeoArrow column encoding\n  let geoEncoding = field.metadata?.[GEOARROW_COLUMN_METADATA_ENCODING];\n  if (geoEncoding) {\n    geoEncoding = geoEncoding.toLowerCase();\n    // at time of testing, ogr2ogr uses WKB/WKT for encoding.\n    if (geoEncoding === 'wkb') {\n      geoEncoding = 'geoarrow.wkb';\n    }\n    if (geoEncoding === 'wkt') {\n      geoEncoding = 'geoarrow.wkt';\n    }\n    if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {\n      // eslint-disable-next-line no-console\n      console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);\n    } else {\n      metadata = metadata || ({} as GeoArrowMetadata);\n      metadata.encoding = geoEncoding as GeoArrowEncoding;\n    }\n  }\n\n  // Check for GeoArrow metadata\n  const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];\n  if (columnMetadata) {\n    try {\n      metadata = JSON.parse(columnMetadata);\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.warn('Failed to parse GeoArrow metadata', error);\n    }\n  }\n\n  return metadata || null;\n}\n"],"mappings":"AAgBA,MAAMA,kBAAkB,GAAG,CACzB,uBAAuB,EACvB,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,cAAc,CACf;AAED,MAAMC,iCAAiC,GAAG,sBAAsB;AAChE,MAAMC,iCAAiC,GAAG,0BAA0B;AAmBpE,OAAO,SAASC,4BAA4BA,CAACC,MAAc,EAAoC;EAC7F,MAAMC,eAAiD,GAAG,CAAC,CAAC;EAC5D,KAAK,MAAMC,KAAK,IAAIF,MAAM,CAACG,MAAM,EAAE;IACjC,MAAMC,QAAQ,GAAGC,2BAA2B,CAACH,KAAK,CAAC;IACnD,IAAIE,QAAQ,EAAE;MACZH,eAAe,CAACC,KAAK,CAACI,IAAI,CAAC,GAAGF,QAAQ;IACxC;EACF;EACA,OAAOH,eAAe;AACxB;AAOA,OAAO,SAASI,2BAA2BA,CAACH,KAAY,EAA2B;EAAA,IAAAK,eAAA,EAAAC,gBAAA;EACjF,IAAIJ,QAAiC,GAAG,IAAI;EAG5C,IAAIK,WAAW,IAAAF,eAAA,GAAGL,KAAK,CAACE,QAAQ,cAAAG,eAAA,uBAAdA,eAAA,CAAiBV,iCAAiC,CAAC;EACrE,IAAIY,WAAW,EAAE;IACfA,WAAW,GAAGA,WAAW,CAACC,WAAW,CAAC,CAAC;IAEvC,IAAID,WAAW,KAAK,KAAK,EAAE;MACzBA,WAAW,GAAG,cAAc;IAC9B;IACA,IAAIA,WAAW,KAAK,KAAK,EAAE;MACzBA,WAAW,GAAG,cAAc;IAC9B;IACA,IAAI,CAACb,kBAAkB,CAACe,QAAQ,CAACF,WAAW,CAAC,EAAE;MAE7CG,OAAO,CAACC,IAAI,CAAE,8BAA6BJ,WAAY,EAAC,CAAC;IAC3D,CAAC,MAAM;MACLL,QAAQ,GAAGA,QAAQ,IAAK,CAAC,CAAsB;MAC/CA,QAAQ,CAACU,QAAQ,GAAGL,WAA+B;IACrD;EACF;EAGA,MAAMM,cAAc,IAAAP,gBAAA,GAAGN,KAAK,CAACE,QAAQ,cAAAI,gBAAA,uBAAdA,gBAAA,CAAiBV,iCAAiC,CAAC;EAC1E,IAAIiB,cAAc,EAAE;IAClB,IAAI;MACFX,QAAQ,GAAGY,IAAI,CAACC,KAAK,CAACF,cAAc,CAAC;IACvC,CAAC,CAAC,OAAOG,KAAK,EAAE;MAEdN,OAAO,CAACC,IAAI,CAAC,mCAAmC,EAAEK,KAAK,CAAC;IAC1D;EACF;EAEA,OAAOd,QAAQ,IAAI,IAAI;AACzB"}

package/dist/lib/tables/convert-table-to-geojson.js

@@ -39,7 +39,7 @@ function parseGeometry(geometry, columnMetadata, loaders) {
       const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
       const geojson = wkbLoader === null || wkbLoader === void 0 ? void 0 : (_wkbLoader$parseSync = wkbLoader.parseSync) === null || _wkbLoader$parseSync === void 0 ? void 0 : _wkbLoader$parseSync.call(wkbLoader, arrayBuffer, {
         wkb: {
-          shape: 'geometry'
+          shape: 'geojson-geometry'
         }
       });
       return geojson;

package/dist/lib/tables/convert-table-to-geojson.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-table-to-geojson.js","names":["getTableLength","getTableRowAsObject","getGeoMetadata","convertWKBTableToGeoJSON","table","schema","loaders","geoMetadata","primaryColumn","primary_column","Error","columnMetadata","columns","features","length","rowIndex","row","geometry","parseGeometry","feature","type","properties","push","shape","_wktLoader$parseTextS","_wkbLoader$parseSync","encoding","wktLoader","find","loader","id","parseTextSync","call","wkbLoader","arrayBuffer","ArrayBuffer","isView","buffer","slice","byteOffset","byteLength","geojson","parseSync","wkb"],"sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {ArrayRowTable, GeoJSONTable, ObjectRowTable, Schema} from '@loaders.gl/schema';\nimport type {Feature, Geometry} from '@loaders.gl/schema';\nimport {getTableLength, getTableRowAsObject} from '@loaders.gl/schema';\n\nimport {GeoColumnMetadata, getGeoMetadata} from '../geo/geoparquet-metadata';\n\n/** TODO - move to loaders.gl/gis? */\nexport function convertWKBTableToGeoJSON(\n  table: ArrayRowTable | ObjectRowTable,\n  schema: Schema,\n  loaders: LoaderWithParser[]\n): GeoJSONTable {\n  const geoMetadata = getGeoMetadata(schema);\n  const primaryColumn = geoMetadata?.primary_column;\n  if (!primaryColumn) {\n    throw new Error('no geometry column');\n  }\n  const columnMetadata = geoMetadata.columns[primaryColumn];\n\n  const features: Feature[] = [];\n\n  const length = getTableLength(table);\n  for (let rowIndex = 0; rowIndex < length; rowIndex++) {\n    const row = getTableRowAsObject(table, rowIndex);\n    const geometry = parseGeometry(row[primaryColumn], columnMetadata, loaders);\n    delete row[primaryColumn];\n    const feature: Feature = {type: 'Feature', geometry: geometry!, properties: row};\n    features.push(feature);\n  }\n\n  return {shape: 'geojson-table', schema, type: 'FeatureCollection', features};\n}\n\nfunction parseGeometry(\n  geometry: unknown,\n  columnMetadata: GeoColumnMetadata,\n  loaders: LoaderWithParser[]\n): Geometry | null {\n  switch (columnMetadata.encoding) {\n    case 'wkt':\n      const wktLoader = loaders.find((loader) => loader.id === 'wkt');\n      return wktLoader?.parseTextSync?.(geometry as string) || null;\n    case 'wkb':\n    default:\n      const wkbLoader = loaders.find((loader) => loader.id === 'wkb');\n      const arrayBuffer = ArrayBuffer.isView(geometry)\n        ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength)\n        : (geometry as ArrayBuffer);\n      const geojson = wkbLoader?.parseSync?.(arrayBuffer, {\n        wkb: {shape: 'geometry'}\n      }) as unknown as Geometry;\n      return geojson; // binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n    // const binaryGeometry = WKBLoader.parseSync?.(geometry);\n    // ts-ignore\n    // return binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n  }\n}\n"],"mappings":"AAMA,SAAQA,cAAc,EAAEC,mBAAmB,QAAO,oBAAoB;AAAC,SAE5CC,cAAc;AAGzC,OAAO,SAASC,wBAAwBA,CACtCC,KAAqC,EACrCC,MAAc,EACdC,OAA2B,EACb;EACd,MAAMC,WAAW,GAAGL,cAAc,CAACG,MAAM,CAAC;EAC1C,MAAMG,aAAa,GAAGD,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEE,cAAc;EACjD,IAAI,CAACD,aAAa,EAAE;IAClB,MAAM,IAAIE,KAAK,CAAC,oBAAoB,CAAC;EACvC;EACA,MAAMC,cAAc,GAAGJ,WAAW,CAACK,OAAO,CAACJ,aAAa,CAAC;EAEzD,MAAMK,QAAmB,GAAG,EAAE;EAE9B,MAAMC,MAAM,GAAGd,cAAc,CAACI,KAAK,CAAC;EACpC,KAAK,IAAIW,QAAQ,GAAG,CAAC,EAAEA,QAAQ,GAAGD,MAAM,EAAEC,QAAQ,EAAE,EAAE;IACpD,MAAMC,GAAG,GAAGf,mBAAmB,CAACG,KAAK,EAAEW,QAAQ,CAAC;IAChD,MAAME,QAAQ,GAAGC,aAAa,CAACF,GAAG,CAACR,aAAa,CAAC,EAAEG,cAAc,EAAEL,OAAO,CAAC;IAC3E,OAAOU,GAAG,CAACR,aAAa,CAAC;IACzB,MAAMW,OAAgB,GAAG;MAACC,IAAI,EAAE,SAAS;MAAEH,QAAQ,EAAEA,QAAS;MAAEI,UAAU,EAAEL;IAAG,CAAC;IAChFH,QAAQ,CAACS,IAAI,CAACH,OAAO,CAAC;EACxB;EAEA,OAAO;IAACI,KAAK,EAAE,eAAe;IAAElB,MAAM;IAAEe,IAAI,EAAE,mBAAmB;IAAEP;EAAQ,CAAC;AAC9E;AAEA,SAASK,aAAaA,CACpBD,QAAiB,EACjBN,cAAiC,EACjCL,OAA2B,EACV;EAAA,IAAAkB,qBAAA,EAAAC,oBAAA;EACjB,QAAQd,cAAc,CAACe,QAAQ;IAC7B,KAAK,KAAK;MACR,MAAMC,SAAS,GAAGrB,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,OAAO,CAAAH,SAAS,aAATA,SAAS,wBAAAH,qBAAA,GAATG,SAAS,CAAEI,aAAa,cAAAP,qBAAA,uBAAxBA,qBAAA,CAAAQ,IAAA,CAAAL,SAAS,EAAkBV,QAAkB,CAAC,KAAI,IAAI;IAC/D,KAAK,KAAK;IACV;MACE,MAAMgB,SAAS,GAAG3B,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,MAAMI,WAAW,GAAGC,WAAW,CAACC,MAAM,CAACnB,QAAQ,CAAC,GAC5CA,QAAQ,CAACoB,MAAM,CAACC,KAAK,CAACrB,QAAQ,CAACsB,UAAU,EAAEtB,QAAQ,CAACsB,UAAU,GAAGtB,QAAQ,CAACuB,UAAU,CAAC,GACpFvB,QAAwB;MAC7B,MAAMwB,OAAO,GAAGR,SAAS,aAATA,SAAS,wBAAAR,oBAAA,GAATQ,SAAS,CAAES,SAAS,cAAAjB,oBAAA,uBAApBA,oBAAA,CAAAO,IAAA,CAAAC,SAAS,EAAcC,WAAW,EAAE;QAClDS,GAAG,EAAE;UAACpB,KAAK,EAAE;QAAU;MACzB,CAAC,CAAwB;MACzB,OAAOkB,OAAO;EAIlB;AACF"}
+{"version":3,"file":"convert-table-to-geojson.js","names":["getTableLength","getTableRowAsObject","getGeoMetadata","convertWKBTableToGeoJSON","table","schema","loaders","geoMetadata","primaryColumn","primary_column","Error","columnMetadata","columns","features","length","rowIndex","row","geometry","parseGeometry","feature","type","properties","push","shape","_wktLoader$parseTextS","_wkbLoader$parseSync","encoding","wktLoader","find","loader","id","parseTextSync","call","wkbLoader","arrayBuffer","ArrayBuffer","isView","buffer","slice","byteOffset","byteLength","geojson","parseSync","wkb"],"sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {ArrayRowTable, GeoJSONTable, ObjectRowTable, Schema} from '@loaders.gl/schema';\nimport type {Feature, Geometry} from '@loaders.gl/schema';\nimport {getTableLength, getTableRowAsObject} from '@loaders.gl/schema';\n\nimport {GeoColumnMetadata, getGeoMetadata} from '../geo/geoparquet-metadata';\n\n/** TODO - move to loaders.gl/gis? */\nexport function convertWKBTableToGeoJSON(\n  table: ArrayRowTable | ObjectRowTable,\n  schema: Schema,\n  loaders: LoaderWithParser[]\n): GeoJSONTable {\n  const geoMetadata = getGeoMetadata(schema);\n  const primaryColumn = geoMetadata?.primary_column;\n  if (!primaryColumn) {\n    throw new Error('no geometry column');\n  }\n  const columnMetadata = geoMetadata.columns[primaryColumn];\n\n  const features: Feature[] = [];\n\n  const length = getTableLength(table);\n  for (let rowIndex = 0; rowIndex < length; rowIndex++) {\n    const row = getTableRowAsObject(table, rowIndex);\n    const geometry = parseGeometry(row[primaryColumn], columnMetadata, loaders);\n    delete row[primaryColumn];\n    const feature: Feature = {type: 'Feature', geometry: geometry!, properties: row};\n    features.push(feature);\n  }\n\n  return {shape: 'geojson-table', schema, type: 'FeatureCollection', features};\n}\n\nfunction parseGeometry(\n  geometry: unknown,\n  columnMetadata: GeoColumnMetadata,\n  loaders: LoaderWithParser[]\n): Geometry | null {\n  switch (columnMetadata.encoding) {\n    case 'wkt':\n      const wktLoader = loaders.find((loader) => loader.id === 'wkt');\n      return wktLoader?.parseTextSync?.(geometry as string) || null;\n    case 'wkb':\n    default:\n      const wkbLoader = loaders.find((loader) => loader.id === 'wkb');\n      const arrayBuffer = ArrayBuffer.isView(geometry)\n        ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength)\n        : (geometry as ArrayBuffer);\n      const geojson = wkbLoader?.parseSync?.(arrayBuffer, {\n        wkb: {shape: 'geojson-geometry'}\n      }) as unknown as Geometry;\n      return geojson; // binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n    // const binaryGeometry = WKBLoader.parseSync?.(geometry);\n    // ts-ignore\n    // return binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n  }\n}\n"],"mappings":"AAMA,SAAQA,cAAc,EAAEC,mBAAmB,QAAO,oBAAoB;AAAC,SAE5CC,cAAc;AAGzC,OAAO,SAASC,wBAAwBA,CACtCC,KAAqC,EACrCC,MAAc,EACdC,OAA2B,EACb;EACd,MAAMC,WAAW,GAAGL,cAAc,CAACG,MAAM,CAAC;EAC1C,MAAMG,aAAa,GAAGD,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEE,cAAc;EACjD,IAAI,CAACD,aAAa,EAAE;IAClB,MAAM,IAAIE,KAAK,CAAC,oBAAoB,CAAC;EACvC;EACA,MAAMC,cAAc,GAAGJ,WAAW,CAACK,OAAO,CAACJ,aAAa,CAAC;EAEzD,MAAMK,QAAmB,GAAG,EAAE;EAE9B,MAAMC,MAAM,GAAGd,cAAc,CAACI,KAAK,CAAC;EACpC,KAAK,IAAIW,QAAQ,GAAG,CAAC,EAAEA,QAAQ,GAAGD,MAAM,EAAEC,QAAQ,EAAE,EAAE;IACpD,MAAMC,GAAG,GAAGf,mBAAmB,CAACG,KAAK,EAAEW,QAAQ,CAAC;IAChD,MAAME,QAAQ,GAAGC,aAAa,CAACF,GAAG,CAACR,aAAa,CAAC,EAAEG,cAAc,EAAEL,OAAO,CAAC;IAC3E,OAAOU,GAAG,CAACR,aAAa,CAAC;IACzB,MAAMW,OAAgB,GAAG;MAACC,IAAI,EAAE,SAAS;MAAEH,QAAQ,EAAEA,QAAS;MAAEI,UAAU,EAAEL;IAAG,CAAC;IAChFH,QAAQ,CAACS,IAAI,CAACH,OAAO,CAAC;EACxB;EAEA,OAAO;IAACI,KAAK,EAAE,eAAe;IAAElB,MAAM;IAAEe,IAAI,EAAE,mBAAmB;IAAEP;EAAQ,CAAC;AAC9E;AAEA,SAASK,aAAaA,CACpBD,QAAiB,EACjBN,cAAiC,EACjCL,OAA2B,EACV;EAAA,IAAAkB,qBAAA,EAAAC,oBAAA;EACjB,QAAQd,cAAc,CAACe,QAAQ;IAC7B,KAAK,KAAK;MACR,MAAMC,SAAS,GAAGrB,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,OAAO,CAAAH,SAAS,aAATA,SAAS,wBAAAH,qBAAA,GAATG,SAAS,CAAEI,aAAa,cAAAP,qBAAA,uBAAxBA,qBAAA,CAAAQ,IAAA,CAAAL,SAAS,EAAkBV,QAAkB,CAAC,KAAI,IAAI;IAC/D,KAAK,KAAK;IACV;MACE,MAAMgB,SAAS,GAAG3B,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,MAAMI,WAAW,GAAGC,WAAW,CAACC,MAAM,CAACnB,QAAQ,CAAC,GAC5CA,QAAQ,CAACoB,MAAM,CAACC,KAAK,CAACrB,QAAQ,CAACsB,UAAU,EAAEtB,QAAQ,CAACsB,UAAU,GAAGtB,QAAQ,CAACuB,UAAU,CAAC,GACpFvB,QAAwB;MAC7B,MAAMwB,OAAO,GAAGR,SAAS,aAATA,SAAS,wBAAAR,oBAAA,GAATQ,SAAS,CAAES,SAAS,cAAAjB,oBAAA,uBAApBA,oBAAA,CAAAO,IAAA,CAAAC,SAAS,EAAcC,WAAW,EAAE;QAClDS,GAAG,EAAE;UAACpB,KAAK,EAAE;QAAkB;MACjC,CAAC,CAAwB;MACzB,OAAOkB,OAAO;EAIlB;AACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/gis",
   "description": "Helpers for GIS category data",
-  "version": "4.0.3",
+  "version": "4.1.0-alpha.1",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -32,8 +32,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.0.3",
-    "@loaders.gl/schema": "4.0.3",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.1",
+    "@loaders.gl/schema": "4.1.0-alpha.1",
     "@mapbox/vector-tile": "^1.3.1",
     "@math.gl/polygon": "^4.0.0",
     "pbf": "^3.2.1"
@@ -41,5 +41,5 @@
   "devDependencies": {
     "@math.gl/proj4": "^4.0.0"
   },
-  "gitHead": "03c871839b36c997249dabae1844df53a35d3760"
+  "gitHead": "6a4d3da93d45115ad99861474a43c3f4a0b280a7"
 }

package/src/lib/geo/geoarrow-metadata.ts

@@ -28,11 +28,17 @@ const GEOARROW_ENCODINGS = [
 const GEOARROW_COLUMN_METADATA_ENCODING = 'ARROW:extension:name';
 const GEOARROW_COLUMN_METADATA_METADATA = 'ARROW:extension:metadata';
 
-/** Geospatial metadata for one column, extracted from Apache Arrow metadata */
+/**
+ * Geospatial metadata for one column, extracted from Apache Arrow metadata
+ * @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md
+ */
 export type GeoArrowMetadata = {
+  /** Encoding of geometry in this column */
   encoding?: GeoArrowEncoding;
+  /** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */
   crs?: Record<string, unknown>;
-  egdes?: 'spherical';
+  /** Edges are either spherical or omitted */
+  edges?: 'spherical';
   [key: string]: unknown;
 };
 
@@ -49,25 +55,26 @@ export function getGeometryColumnsFromSchema(schema: Schema): Record<string, Geo
   }
   return geometryColumns;
 }
-
+/**
+ * Extracts GeoArrow metadata from a field
+ * @param field
+ * @returns
+ * @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md
+ */
 export function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null {
   let metadata: GeoArrowMetadata | null = null;
 
-  // Check for GeoArrow metadata
-  const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];
-  if (columnMetadata) {
-    try {
-      metadata = JSON.parse(columnMetadata);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.warn('Failed to parse GeoArrow metadata', error);
-    }
-  }
-
   // Check for GeoArrow column encoding
   let geoEncoding = field.metadata?.[GEOARROW_COLUMN_METADATA_ENCODING];
   if (geoEncoding) {
     geoEncoding = geoEncoding.toLowerCase();
+    // at time of testing, ogr2ogr uses WKB/WKT for encoding.
+    if (geoEncoding === 'wkb') {
+      geoEncoding = 'geoarrow.wkb';
+    }
+    if (geoEncoding === 'wkt') {
+      geoEncoding = 'geoarrow.wkt';
+    }
     if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
       // eslint-disable-next-line no-console
       console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
@@ -77,5 +84,16 @@ export function getGeometryMetadataForField(field: Field): GeoArrowMetadata | nu
     }
   }
 
+  // Check for GeoArrow metadata
+  const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];
+  if (columnMetadata) {
+    try {
+      metadata = JSON.parse(columnMetadata);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.warn('Failed to parse GeoArrow metadata', error);
+    }
+  }
+
   return metadata || null;
 }

package/src/lib/tables/convert-table-to-geojson.ts

@@ -51,7 +51,7 @@ function parseGeometry(
         ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength)
         : (geometry as ArrayBuffer);
       const geojson = wkbLoader?.parseSync?.(arrayBuffer, {
-        wkb: {shape: 'geometry'}
+        wkb: {shape: 'geojson-geometry'}
       }) as unknown as Geometry;
       return geojson; // binaryGeometry ? binaryToGeometry(binaryGeometry) : null;
     // const binaryGeometry = WKBLoader.parseSync?.(geometry);