@loaders.gl/parquet 4.0.0 → 4.0.1

package/dist/index.cjs

@@ -32,7 +32,6 @@ var src_exports = {};
 __export(src_exports, {
   Buffer: () => Buffer3,
   BufferPolyfill: () => Buffer2,
-  GEOPARQUET_METADATA_JSON_SCHEMA: () => GEOPARQUET_METADATA_JSON_SCHEMA,
   ParquetColumnarLoader: () => ParquetColumnarLoader2,
   ParquetEncoder: () => ParquetEncoder,
   ParquetLoader: () => ParquetLoader2,
@@ -42,11 +41,8 @@ __export(src_exports, {
   _ParquetWriter: () => ParquetWriter,
   convertParquetSchema: () => convertParquetSchema,
   convertParquetToArrowSchema: () => convertParquetSchema,
-  getGeoMetadata: () => getGeoMetadata,
   installBufferPolyfill: () => installBufferPolyfill,
-  preloadCompressions: () => preloadCompressions,
-  setGeoMetadata: () => setGeoMetadata,
-  unpackGeoMetadata: () => unpackGeoMetadata
+  preloadCompressions: () => preloadCompressions
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -1821,6 +1817,8 @@ ParquetColumnarLoader.Buffer = Buffer;
 
 // src/lib/parsers/parse-parquet-to-rows.ts
 var import_loader_utils = require("@loaders.gl/loader-utils");
+var import_gis2 = require("@loaders.gl/gis");
+var import_wkt = require("@loaders.gl/wkt");
 
 // src/parquetjs/codecs/plain.ts
 var import_int53 = __toESM(require("int53"), 1);
@@ -7188,149 +7186,17 @@ function getSchemaMetadata(parquetMetadata) {
   return metadata;
 }
 
-// src/lib/geo/decode-geo-metadata.ts
-function parseJSONStringMetadata(schema, metadataKey) {
-  const stringifiedMetadata = schema.metadata[metadataKey];
-  if (!stringifiedMetadata) {
-    return null;
-  }
-  try {
-    const metadata = JSON.parse(stringifiedMetadata);
-    if (!metadata || typeof metadata !== "object") {
-      return null;
-    }
-    return metadata;
-  } catch {
-    return null;
-  }
-}
-function unpackJSONStringMetadata(schema, metadataKey) {
-  const json = parseJSONStringMetadata(schema, metadataKey);
-  for (const [key, value] of Object.entries(json || {})) {
-    schema.metadata[`${metadataKey}.${key}`] = typeof value === "string" ? value : JSON.stringify(value);
-  }
-}
-function getGeoMetadata(schema) {
-  const geoMetadata = parseJSONStringMetadata(schema, "geo");
-  return geoMetadata;
-}
-function setGeoMetadata(schema, geoMetadata) {
-  const stringifiedGeoMetadata = JSON.stringify(geoMetadata);
-  schema.metadata.geo = stringifiedGeoMetadata;
-}
-function unpackGeoMetadata(schema) {
-  const geoMetadata = getGeoMetadata(schema);
-  if (!geoMetadata) {
-    return;
-  }
-  const { version, primary_column, columns } = geoMetadata;
-  if (version) {
-    schema.metadata["geo.version"] = version;
-  }
-  if (primary_column) {
-    schema.metadata["geo.primary_column"] = primary_column;
-  }
-  schema.metadata["geo.columns"] = Object.keys(columns || {}).join("");
-  for (const [columnName, columnMetadata] of Object.entries(columns || {})) {
-    const field = schema.fields.find((field2) => field2.name === columnName);
-    if (field) {
-      if (field.name === primary_column) {
-        setFieldMetadata(field, "geo.primary_field", "true");
-      }
-      unpackGeoFieldMetadata(field, columnMetadata);
-    }
-  }
-}
-function unpackGeoFieldMetadata(field, columnMetadata) {
-  for (const [key, value] of Object.entries(columnMetadata || {})) {
-    switch (key) {
-      case "geometry_type":
-        setFieldMetadata(field, `geo.${key}`, value.join(","));
-        break;
-      case "bbox":
-        setFieldMetadata(field, `geo.crs.${key}`, JSON.stringify(value));
-        break;
-      case "crs":
-        for (const [crsKey, crsValue] of Object.entries(value || {})) {
-          switch (crsKey) {
-            case "id":
-              const crsId = typeof crsValue === "object" ? (
-                // @ts-ignore
-                `${crsValue == null ? void 0 : crsValue.authority}:${crsValue == null ? void 0 : crsValue.code}`
-              ) : JSON.stringify(crsValue);
-              setFieldMetadata(field, `geo.crs.${crsKey}`, crsId);
-              break;
-            default:
-              setFieldMetadata(
-                field,
-                `geo.crs.${crsKey}`,
-                typeof crsValue === "string" ? crsValue : JSON.stringify(crsValue)
-              );
-              break;
-          }
-        }
-        break;
-      case "edges":
-      default:
-        setFieldMetadata(
-          field,
-          `geo.${key}`,
-          typeof value === "string" ? value : JSON.stringify(value)
-        );
-    }
-  }
-}
-function setFieldMetadata(field, key, value) {
-  field.metadata = field.metadata || {};
-  field.metadata[key] = value;
-}
-
 // src/lib/parsers/get-parquet-schema.ts
+var import_gis = require("@loaders.gl/gis");
 async function getSchemaFromParquetReader(reader) {
   const parquetSchema = await reader.getSchema();
   const parquetMetadata = await reader.getFileMetadata();
   const schema = convertParquetSchema(parquetSchema, parquetMetadata);
-  unpackGeoMetadata(schema);
-  unpackJSONStringMetadata(schema, "pandas");
+  (0, import_gis.unpackGeoMetadata)(schema);
+  (0, import_gis.unpackJSONStringMetadata)(schema, "pandas");
   return schema;
 }
 
-// src/lib/geo/decode-geo-column.ts
-var import_schema2 = require("@loaders.gl/schema");
-var import_wkt = require("@loaders.gl/wkt");
-function convertWKBTableToGeoJSON(table, schema) {
-  const geoMetadata = getGeoMetadata(schema);
-  const primaryColumn = geoMetadata == null ? void 0 : geoMetadata.primary_column;
-  if (!primaryColumn) {
-    throw new Error("no geometry column");
-  }
-  const columnMetadata = geoMetadata.columns[primaryColumn];
-  const features = [];
-  const length = (0, import_schema2.getTableLength)(table);
-  for (let rowIndex = 0; rowIndex < length; rowIndex++) {
-    const row = (0, import_schema2.getTableRowAsObject)(table, rowIndex);
-    const geometry = parseGeometry(row[primaryColumn], columnMetadata);
-    delete row[primaryColumn];
-    const feature = { type: "Feature", geometry, properties: row };
-    features.push(feature);
-  }
-  return { shape: "geojson-table", schema, type: "FeatureCollection", features };
-}
-function parseGeometry(geometry, columnMetadata) {
-  var _a, _b, _c, _d;
-  switch (columnMetadata.encoding) {
-    case "wkt":
-      return ((_b = (_a = import_wkt.WKTLoader).parseTextSync) == null ? void 0 : _b.call(_a, geometry)) || null;
-    case "wkb":
-    default:
-      const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
-      const geojson = (_d = (_c = import_wkt.WKBLoader).parseSync) == null ? void 0 : _d.call(_c, arrayBuffer, {
-        wkb: { shape: "geometry" }
-      });
-      return geojson;
-  }
-}
-
 // src/lib/parsers/parse-parquet-to-rows.ts
 async function parseParquet(arrayBuffer, options) {
   var _a, _b;
@@ -7359,7 +7225,7 @@ async function parseParquet(arrayBuffer, options) {
       return objectRowTable;
     case "geojson-table":
       try {
-        return convertWKBTableToGeoJSON(objectRowTable, schema);
+        return (0, import_gis2.convertWKBTableToGeoJSON)(objectRowTable, schema, [import_wkt.WKTLoader, import_wkt.WKBLoader]);
       } catch (error) {
         return objectRowTable;
       }
@@ -7810,68 +7676,6 @@ function encodeFooter(schema, rowCount, rowGroups, userMetadata) {
   return footerEncoded;
 }
 
-// src/lib/geo/geoparquet-metadata-schema.ts
-var GEOPARQUET_METADATA_JSON_SCHEMA = {
-  $schema: "http://json-schema.org/draft-07/schema#",
-  title: "GeoParquet",
-  description: "Parquet metadata included in the geo field.",
-  type: "object",
-  required: ["version", "primary_column", "columns"],
-  properties: {
-    version: { type: "string", const: "1.0.0-beta.1" },
-    primary_column: { type: "string", minLength: 1 },
-    columns: {
-      type: "object",
-      minProperties: 1,
-      patternProperties: {
-        ".+": {
-          type: "object",
-          required: ["encoding", "geometry_types"],
-          properties: {
-            encoding: { type: "string", const: "WKB" },
-            geometry_types: {
-              type: "array",
-              uniqueItems: true,
-              items: {
-                type: "string",
-                pattern: "^(GeometryCollection|(Multi)?(Point|LineString|Polygon))( Z)?$"
-              }
-            },
-            crs: {
-              oneOf: [
-                {
-                  $ref: "https://proj.org/schemas/v0.5/projjson.schema.json"
-                },
-                { type: "null" }
-              ]
-            },
-            edges: { type: "string", enum: ["planar", "spherical"] },
-            orientation: { type: "string", const: "counterclockwise" },
-            bbox: {
-              type: "array",
-              items: { type: "number" },
-              oneOf: [
-                {
-                  description: "2D bbox consisting of (xmin, ymin, xmax, ymax)",
-                  minItems: 4,
-                  maxItems: 4
-                },
-                {
-                  description: "3D bbox consisting of (xmin, ymin, zmin, xmax, ymax, zmax)",
-                  minItems: 6,
-                  maxItems: 6
-                }
-              ]
-            },
-            epoch: { type: "number" }
-          }
-        }
-      },
-      additionalProperties: false
-    }
-  }
-};
-
 // src/index.ts
 var ParquetLoader2 = {
   ...ParquetLoader,

package/dist/index.d.ts

@@ -13,8 +13,5 @@ export { ParquetSchema } from './parquetjs/schema/schema';
 export { ParquetReader } from './parquetjs/parser/parquet-reader';
 export { ParquetEncoder } from './parquetjs/encoder/parquet-encoder';
 export { convertParquetSchema, convertParquetSchema as convertParquetToArrowSchema } from './lib/arrow/convert-schema-from-parquet';
-export { GEOPARQUET_METADATA_JSON_SCHEMA } from './lib/geo/geoparquet-metadata-schema';
-export type { GeoMetadata } from './lib/geo/decode-geo-metadata';
-export { getGeoMetadata, setGeoMetadata, unpackGeoMetadata } from './lib/geo/decode-geo-metadata';
 export { BufferPolyfill, installBufferPolyfill } from './buffer-polyfill';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,2CAA2C,CAAC;AAEjE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EACL,aAAa,IAAI,mBAAmB,EAEpC,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAG7B,6BAA6B;AAC7B,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAC1C,cAAc,GAAG,YAAY,EAC7B,mBAAmB,GAAG,iBAAiB,EACvC,oBAAoB,CAMrB,CAAC;AAEF,6BAA6B;AAC7B,eAAO,MAAM,qBAAqB,EAAE,gBAAgB,CAClD,aAAa,EACb,kBAAkB,EAClB,oBAAoB,CAMrB,CAAC;AAcF,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAKjE,OAAO,EAAC,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,IAAI,2BAA2B,EACpD,MAAM,yCAAyC,CAAC;AAKjD,OAAO,EAAC,+BAA+B,EAAC,MAAM,sCAAsC,CAAC;AAErF,YAAY,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAGhG,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAC,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAC,MAAM,2CAA2C,CAAC;AAEjE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EACV,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EACL,aAAa,IAAI,mBAAmB,EAEpC,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAC,mBAAmB,EAAC,CAAC;AAG7B,6BAA6B;AAC7B,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAC1C,cAAc,GAAG,YAAY,EAC7B,mBAAmB,GAAG,iBAAiB,EACvC,oBAAoB,CAMrB,CAAC;AAEF,6BAA6B;AAC7B,eAAO,MAAM,qBAAqB,EAAE,gBAAgB,CAClD,aAAa,EACb,kBAAkB,EAClB,oBAAoB,CAMrB,CAAC;AAcF,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAKjE,OAAO,EAAC,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,IAAI,2BAA2B,EACpD,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAC,MAAM,mBAAmB,CAAC"}

package/dist/index.js

@@ -19,7 +19,5 @@ export { ParquetSchema } from "./parquetjs/schema/schema.js";
 export { ParquetReader } from "./parquetjs/parser/parquet-reader.js";
 export { ParquetEncoder } from "./parquetjs/encoder/parquet-encoder.js";
 export { convertParquetSchema, convertParquetSchema as convertParquetToArrowSchema } from "./lib/arrow/convert-schema-from-parquet.js";
-export { GEOPARQUET_METADATA_JSON_SCHEMA } from "./lib/geo/geoparquet-metadata-schema.js";
-export { getGeoMetadata, setGeoMetadata, unpackGeoMetadata } from "./lib/geo/decode-geo-metadata.js";
 export { BufferPolyfill, installBufferPolyfill } from "./buffer-polyfill/index.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Buffer","ParquetLoader","ParquetWorkerLoader","ParquetColumnarWorkerLoader","parseParquet","parseParquetFileInBatches","parseParquetInColumns","parseParquetFileInColumnarBatches","parse","parseFileInBatches","ParquetColumnarLoader","ParquetWriter","_ParquetWriter","preloadCompressions","ParquetSchema","ParquetReader","ParquetEncoder","convertParquetSchema","convertParquetToArrowSchema","GEOPARQUET_METADATA_JSON_SCHEMA","getGeoMetadata","setGeoMetadata","unpackGeoMetadata","BufferPolyfill","installBufferPolyfill"],"sources":["../src/index.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nexport {Buffer} from './buffer-polyfill/install-buffer-polyfill';\n\nimport type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {\n  ObjectRowTable,\n  ObjectRowTableBatch,\n  ColumnarTable,\n  ColumnarTableBatch,\n  GeoJSONTable,\n  GeoJSONTableBatch\n} from '@loaders.gl/schema';\n// import type {Table as ApacheArrowTable} from 'apache-arrow';\n\n// ParquetLoader\n\nimport {\n  ParquetLoader as ParquetWorkerLoader,\n  ParquetLoader as ParquetColumnarWorkerLoader,\n  ParquetLoaderOptions\n} from './parquet-loader';\nimport {parseParquet, parseParquetFileInBatches} from './lib/parsers/parse-parquet-to-rows';\nimport {\n  parseParquetInColumns,\n  parseParquetFileInColumnarBatches\n} from './lib/parsers/parse-parquet-to-columns';\n\n// import type {ParquetWasmLoaderOptions} from './lib/wasm/parse-parquet-wasm';\n// import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';\n// import {ParquetWasmLoader as ParquetWasmWorkerLoader} from './parquet-wasm-loader';\n\nexport {ParquetWorkerLoader};\n// export {ParquetWasmWorkerLoader};\n\n/** ParquetJS table loader */\nexport const ParquetLoader: LoaderWithParser<\n  ObjectRowTable | GeoJSONTable,\n  ObjectRowTableBatch | GeoJSONTableBatch,\n  ParquetLoaderOptions\n> = {\n  ...ParquetWorkerLoader,\n  parse: parseParquet,\n  // @ts-expect-error\n  parseFileInBatches: parseParquetFileInBatches\n};\n\n/** ParquetJS table loader */\nexport const ParquetColumnarLoader: LoaderWithParser<\n  ColumnarTable,\n  ColumnarTableBatch,\n  ParquetLoaderOptions\n> = {\n  ...ParquetColumnarWorkerLoader,\n  parse: parseParquetInColumns,\n  // @ts-expect-error\n  parseFileInBatches: parseParquetFileInColumnarBatches\n};\n\n// export const ParquetWasmLoader: LoaderWithParser<\n//   ApacheArrowTable,\n//   never,\n//   ParquetWasmLoaderOptions\n// > = {\n//   ...ParquetWasmWorkerLoader,\n//   // @ts-expect-error Getting strange errors in wasm\n//   parse: () => {} // parseParquetWasm\n// };\n\n// ParquetWriter\n\nexport {ParquetWriter as _ParquetWriter} from './parquet-writer';\n// export {ParquetWasmWriter} from './parquet-wasm-writer';\n\n// EXPERIMENTAL - expose the internal parquetjs API\n\nexport {preloadCompressions} from './parquetjs/compression';\n\nexport {ParquetSchema} from './parquetjs/schema/schema';\nexport {ParquetReader} from './parquetjs/parser/parquet-reader';\nexport {ParquetEncoder} from './parquetjs/encoder/parquet-encoder';\n\nexport {\n  convertParquetSchema,\n  convertParquetSchema as convertParquetToArrowSchema\n} from './lib/arrow/convert-schema-from-parquet';\n\n// Geo Metadata\n// import {default as GEOPARQUET_METADATA_SCHEMA} from './lib/geo/geoparquet-metadata-schema.json';\n// export {GEOPARQUET_METADATA_SCHEMA};\nexport {GEOPARQUET_METADATA_JSON_SCHEMA} from './lib/geo/geoparquet-metadata-schema';\n\nexport type {GeoMetadata} from './lib/geo/decode-geo-metadata';\nexport {getGeoMetadata, setGeoMetadata, unpackGeoMetadata} from './lib/geo/decode-geo-metadata';\n\n// Experimental\nexport {BufferPolyfill, installBufferPolyfill} from './buffer-polyfill';\n"],"mappings":"SAGQA,MAAM;AAAA,SAgBZC,aAAa,IAAIC,mBAAmB,EACpCD,aAAa,IAAIE,2BAA2B;AAAA,SAGtCC,YAAY,EAAEC,yBAAyB;AAAA,SAE7CC,qBAAqB,EACrBC,iCAAiC;AAOnC,SAAQL,mBAAmB;AAI3B,OAAO,MAAMD,aAIZ,GAAG;EACF,GAAGC,mBAAmB;EACtBM,KAAK,EAAEJ,YAAY;EAEnBK,kBAAkB,EAAEJ;AACtB,CAAC;AAGD,OAAO,MAAMK,qBAIZ,GAAG;EACF,GAAGP,2BAA2B;EAC9BK,KAAK,EAAEF,qBAAqB;EAE5BG,kBAAkB,EAAEF;AACtB,CAAC;AAAC,SAcMI,aAAa,IAAIC,cAAc;AAAA,SAK/BC,mBAAmB;AAAA,SAEnBC,aAAa;AAAA,SACbC,aAAa;AAAA,SACbC,cAAc;AAAA,SAGpBC,oBAAoB,EACpBA,oBAAoB,IAAIC,2BAA2B;AAAA,SAM7CC,+BAA+B;AAAA,SAG/BC,cAAc,EAAEC,cAAc,EAAEC,iBAAiB;AAAA,SAGjDC,cAAc,EAAEC,qBAAqB"}
+{"version":3,"file":"index.js","names":["Buffer","ParquetLoader","ParquetWorkerLoader","ParquetColumnarWorkerLoader","parseParquet","parseParquetFileInBatches","parseParquetInColumns","parseParquetFileInColumnarBatches","parse","parseFileInBatches","ParquetColumnarLoader","ParquetWriter","_ParquetWriter","preloadCompressions","ParquetSchema","ParquetReader","ParquetEncoder","convertParquetSchema","convertParquetToArrowSchema","BufferPolyfill","installBufferPolyfill"],"sources":["../src/index.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nexport {Buffer} from './buffer-polyfill/install-buffer-polyfill';\n\nimport type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {\n  ObjectRowTable,\n  ObjectRowTableBatch,\n  ColumnarTable,\n  ColumnarTableBatch,\n  GeoJSONTable,\n  GeoJSONTableBatch\n} from '@loaders.gl/schema';\n// import type {Table as ApacheArrowTable} from 'apache-arrow';\n\n// ParquetLoader\n\nimport {\n  ParquetLoader as ParquetWorkerLoader,\n  ParquetLoader as ParquetColumnarWorkerLoader,\n  ParquetLoaderOptions\n} from './parquet-loader';\nimport {parseParquet, parseParquetFileInBatches} from './lib/parsers/parse-parquet-to-rows';\nimport {\n  parseParquetInColumns,\n  parseParquetFileInColumnarBatches\n} from './lib/parsers/parse-parquet-to-columns';\n\n// import type {ParquetWasmLoaderOptions} from './lib/wasm/parse-parquet-wasm';\n// import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';\n// import {ParquetWasmLoader as ParquetWasmWorkerLoader} from './parquet-wasm-loader';\n\nexport {ParquetWorkerLoader};\n// export {ParquetWasmWorkerLoader};\n\n/** ParquetJS table loader */\nexport const ParquetLoader: LoaderWithParser<\n  ObjectRowTable | GeoJSONTable,\n  ObjectRowTableBatch | GeoJSONTableBatch,\n  ParquetLoaderOptions\n> = {\n  ...ParquetWorkerLoader,\n  parse: parseParquet,\n  // @ts-expect-error\n  parseFileInBatches: parseParquetFileInBatches\n};\n\n/** ParquetJS table loader */\nexport const ParquetColumnarLoader: LoaderWithParser<\n  ColumnarTable,\n  ColumnarTableBatch,\n  ParquetLoaderOptions\n> = {\n  ...ParquetColumnarWorkerLoader,\n  parse: parseParquetInColumns,\n  // @ts-expect-error\n  parseFileInBatches: parseParquetFileInColumnarBatches\n};\n\n// export const ParquetWasmLoader: LoaderWithParser<\n//   ApacheArrowTable,\n//   never,\n//   ParquetWasmLoaderOptions\n// > = {\n//   ...ParquetWasmWorkerLoader,\n//   // @ts-expect-error Getting strange errors in wasm\n//   parse: () => {} // parseParquetWasm\n// };\n\n// ParquetWriter\n\nexport {ParquetWriter as _ParquetWriter} from './parquet-writer';\n// export {ParquetWasmWriter} from './parquet-wasm-writer';\n\n// EXPERIMENTAL - expose the internal parquetjs API\n\nexport {preloadCompressions} from './parquetjs/compression';\n\nexport {ParquetSchema} from './parquetjs/schema/schema';\nexport {ParquetReader} from './parquetjs/parser/parquet-reader';\nexport {ParquetEncoder} from './parquetjs/encoder/parquet-encoder';\n\nexport {\n  convertParquetSchema,\n  convertParquetSchema as convertParquetToArrowSchema\n} from './lib/arrow/convert-schema-from-parquet';\n\n// Experimental\nexport {BufferPolyfill, installBufferPolyfill} from './buffer-polyfill';\n"],"mappings":"SAGQA,MAAM;AAAA,SAgBZC,aAAa,IAAIC,mBAAmB,EACpCD,aAAa,IAAIE,2BAA2B;AAAA,SAGtCC,YAAY,EAAEC,yBAAyB;AAAA,SAE7CC,qBAAqB,EACrBC,iCAAiC;AAOnC,SAAQL,mBAAmB;AAI3B,OAAO,MAAMD,aAIZ,GAAG;EACF,GAAGC,mBAAmB;EACtBM,KAAK,EAAEJ,YAAY;EAEnBK,kBAAkB,EAAEJ;AACtB,CAAC;AAGD,OAAO,MAAMK,qBAIZ,GAAG;EACF,GAAGP,2BAA2B;EAC9BK,KAAK,EAAEF,qBAAqB;EAE5BG,kBAAkB,EAAEF;AACtB,CAAC;AAAC,SAcMI,aAAa,IAAIC,cAAc;AAAA,SAK/BC,mBAAmB;AAAA,SAEnBC,aAAa;AAAA,SACbC,aAAa;AAAA,SACbC,cAAc;AAAA,SAGpBC,oBAAoB,EACpBA,oBAAoB,IAAIC,2BAA2B;AAAA,SAI7CC,cAAc,EAAEC,qBAAqB"}

package/dist/lib/parsers/get-parquet-schema.js

@@ -1,5 +1,5 @@
 import { convertParquetSchema } from "../arrow/convert-schema-from-parquet.js";
-import { unpackGeoMetadata, unpackJSONStringMetadata } from "../geo/decode-geo-metadata.js";
+import { unpackGeoMetadata, unpackJSONStringMetadata } from '@loaders.gl/gis';
 export async function getSchemaFromParquetReader(reader) {
   const parquetSchema = await reader.getSchema();
   const parquetMetadata = await reader.getFileMetadata();

package/dist/lib/parsers/get-parquet-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-parquet-schema.js","names":["convertParquetSchema","unpackGeoMetadata","unpackJSONStringMetadata","getSchemaFromParquetReader","reader","parquetSchema","getSchema","parquetMetadata","getFileMetadata","schema"],"sources":["../../../src/lib/parsers/get-parquet-schema.ts"],"sourcesContent":["// loaders.gl\nimport {Schema} from '@loaders.gl/schema';\nimport {ParquetReader} from '../../parquetjs/parser/parquet-reader';\nimport {convertParquetSchema} from '../arrow/convert-schema-from-parquet';\nimport {unpackGeoMetadata, unpackJSONStringMetadata} from '../geo/decode-geo-metadata';\n\nexport async function getSchemaFromParquetReader(reader: ParquetReader): Promise<Schema> {\n  const parquetSchema = await reader.getSchema();\n  const parquetMetadata = await reader.getFileMetadata();\n  const schema = convertParquetSchema(parquetSchema, parquetMetadata);\n  unpackGeoMetadata(schema);\n  unpackJSONStringMetadata(schema, 'pandas');\n  return schema;\n}\n"],"mappings":"SAGQA,oBAAoB;AAAA,SACpBC,iBAAiB,EAAEC,wBAAwB;AAEnD,OAAO,eAAeC,0BAA0BA,CAACC,MAAqB,EAAmB;EACvF,MAAMC,aAAa,GAAG,MAAMD,MAAM,CAACE,SAAS,CAAC,CAAC;EAC9C,MAAMC,eAAe,GAAG,MAAMH,MAAM,CAACI,eAAe,CAAC,CAAC;EACtD,MAAMC,MAAM,GAAGT,oBAAoB,CAACK,aAAa,EAAEE,eAAe,CAAC;EACnEN,iBAAiB,CAACQ,MAAM,CAAC;EACzBP,wBAAwB,CAACO,MAAM,EAAE,QAAQ,CAAC;EAC1C,OAAOA,MAAM;AACf"}
+{"version":3,"file":"get-parquet-schema.js","names":["convertParquetSchema","unpackGeoMetadata","unpackJSONStringMetadata","getSchemaFromParquetReader","reader","parquetSchema","getSchema","parquetMetadata","getFileMetadata","schema"],"sources":["../../../src/lib/parsers/get-parquet-schema.ts"],"sourcesContent":["// loaders.gl\nimport {Schema} from '@loaders.gl/schema';\nimport {ParquetReader} from '../../parquetjs/parser/parquet-reader';\nimport {convertParquetSchema} from '../arrow/convert-schema-from-parquet';\nimport {unpackGeoMetadata, unpackJSONStringMetadata} from '@loaders.gl/gis';\n\nexport async function getSchemaFromParquetReader(reader: ParquetReader): Promise<Schema> {\n  const parquetSchema = await reader.getSchema();\n  const parquetMetadata = await reader.getFileMetadata();\n  const schema = convertParquetSchema(parquetSchema, parquetMetadata);\n  unpackGeoMetadata(schema);\n  unpackJSONStringMetadata(schema, 'pandas');\n  return schema;\n}\n"],"mappings":"SAGQA,oBAAoB;AAC5B,SAAQC,iBAAiB,EAAEC,wBAAwB,QAAO,iBAAiB;AAE3E,OAAO,eAAeC,0BAA0BA,CAACC,MAAqB,EAAmB;EACvF,MAAMC,aAAa,GAAG,MAAMD,MAAM,CAACE,SAAS,CAAC,CAAC;EAC9C,MAAMC,eAAe,GAAG,MAAMH,MAAM,CAACI,eAAe,CAAC,CAAC;EACtD,MAAMC,MAAM,GAAGT,oBAAoB,CAACK,aAAa,EAAEE,eAAe,CAAC;EACnEN,iBAAiB,CAACQ,MAAM,CAAC;EACzBP,wBAAwB,CAACO,MAAM,EAAE,QAAQ,CAAC;EAC1C,OAAOA,MAAM;AACf"}

package/dist/lib/parsers/parse-parquet-to-rows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-parquet-to-rows.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-parquet-to-rows.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AACrF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAC,aAAa,EAAC,MAAM,uCAAuC,CAAC;AAKpE,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,GAAG,YAAY,CAAC,CAyCxC;AAED,wBAAuB,yBAAyB,CAC9C,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,aAAa,CAAC,mBAAmB,CAAC,CAYpC"}
+{"version":3,"file":"parse-parquet-to-rows.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-parquet-to-rows.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAIrF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAC,aAAa,EAAC,MAAM,uCAAuC,CAAC;AAIpE,wBAAsB,YAAY,CAChC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,cAAc,GAAG,YAAY,CAAC,CAyCxC;AAED,wBAAuB,yBAAyB,CAC9C,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,aAAa,CAAC,mBAAmB,CAAC,CAYpC"}

package/dist/lib/parsers/parse-parquet-to-rows.js

@@ -1,8 +1,9 @@
 import { BlobFile } from '@loaders.gl/loader-utils';
+import { convertWKBTableToGeoJSON } from '@loaders.gl/gis';
+import { WKTLoader, WKBLoader } from '@loaders.gl/wkt';
 import { ParquetReader } from "../../parquetjs/parser/parquet-reader.js";
 import { getSchemaFromParquetReader } from "./get-parquet-schema.js";
 import { installBufferPolyfill } from "../../buffer-polyfill/index.js";
-import { convertWKBTableToGeoJSON } from "../geo/decode-geo-column.js";
 export async function parseParquet(arrayBuffer, options) {
   var _options$parquet, _options$parquet2;
   installBufferPolyfill();
@@ -30,7 +31,7 @@ export async function parseParquet(arrayBuffer, options) {
       return objectRowTable;
     case 'geojson-table':
       try {
-        return convertWKBTableToGeoJSON(objectRowTable, schema);
+        return convertWKBTableToGeoJSON(objectRowTable, schema, [WKTLoader, WKBLoader]);
       } catch (error) {
         return objectRowTable;
       }

package/dist/lib/parsers/parse-parquet-to-rows.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-parquet-to-rows.js","names":["BlobFile","ParquetReader","getSchemaFromParquetReader","installBufferPolyfill","convertWKBTableToGeoJSON","parseParquet","arrayBuffer","options","_options$parquet","_options$parquet2","blob","Blob","file","reader","preserveBinary","parquet","schema","rows","rowBatches","rowBatchIterator","rowBatch","row","push","objectRowTable","shape","data","error","Error","parseParquetFileInBatches","batchType","length"],"sources":["../../../src/lib/parsers/parse-parquet-to-rows.ts"],"sourcesContent":["// import type {LoaderWithParser, Loader, LoaderOptions} from '@loaders.gl/loader-utils';\n// import {ColumnarTableBatch} from '@loaders.gl/schema';\nimport {BlobFile} from '@loaders.gl/loader-utils';\nimport {GeoJSONTable, ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';\nimport type {ParquetLoaderOptions} from '../../parquet-loader';\nimport type {ParquetRow} from '../../parquetjs/schema/declare';\nimport {ParquetReader} from '../../parquetjs/parser/parquet-reader';\nimport {getSchemaFromParquetReader} from './get-parquet-schema';\nimport {installBufferPolyfill} from '../../buffer-polyfill';\nimport {convertWKBTableToGeoJSON} from '../geo/decode-geo-column';\n\nexport async function parseParquet(\n  arrayBuffer: ArrayBuffer,\n  options?: ParquetLoaderOptions\n): Promise<ObjectRowTable | GeoJSONTable> {\n  installBufferPolyfill();\n\n  const blob = new Blob([arrayBuffer]);\n  const file = new BlobFile(blob);\n  const reader = new ParquetReader(file, {\n    preserveBinary: options?.parquet?.preserveBinary\n  });\n\n  const schema = await getSchemaFromParquetReader(reader);\n\n  const rows: ParquetRow[] = [];\n\n  const rowBatches = reader.rowBatchIterator(options?.parquet);\n  for await (const rowBatch of rowBatches) {\n    // we have only one input batch so return\n    for (const row of rowBatch) {\n      rows.push(row);\n    }\n  }\n  const objectRowTable: ObjectRowTable = {\n    shape: 'object-row-table',\n    schema,\n    data: rows\n  };\n\n  const shape = options?.parquet?.shape;\n  switch (shape) {\n    case 'object-row-table':\n      return objectRowTable;\n\n    case 'geojson-table':\n      try {\n        return convertWKBTableToGeoJSON(objectRowTable, schema);\n      } catch (error) {\n        return objectRowTable;\n      }\n\n    default:\n      throw new Error(shape);\n  }\n}\n\nexport async function* parseParquetFileInBatches(\n  reader: ParquetReader,\n  options?: ParquetLoaderOptions\n): AsyncIterable<ObjectRowTableBatch> {\n  const schema = await getSchemaFromParquetReader(reader);\n  const rowBatches = reader.rowBatchIterator(options?.parquet);\n  for await (const rows of rowBatches) {\n    yield {\n      batchType: 'data',\n      shape: 'object-row-table',\n      schema,\n      data: rows,\n      length: rows.length\n    };\n  }\n}\n"],"mappings":"AAEA,SAAQA,QAAQ,QAAO,0BAA0B;AAAC,SAI1CC,aAAa;AAAA,SACbC,0BAA0B;AAAA,SAC1BC,qBAAqB;AAAA,SACrBC,wBAAwB;AAEhC,OAAO,eAAeC,YAAYA,CAChCC,WAAwB,EACxBC,OAA8B,EACU;EAAA,IAAAC,gBAAA,EAAAC,iBAAA;EACxCN,qBAAqB,CAAC,CAAC;EAEvB,MAAMO,IAAI,GAAG,IAAIC,IAAI,CAAC,CAACL,WAAW,CAAC,CAAC;EACpC,MAAMM,IAAI,GAAG,IAAIZ,QAAQ,CAACU,IAAI,CAAC;EAC/B,MAAMG,MAAM,GAAG,IAAIZ,aAAa,CAACW,IAAI,EAAE;IACrCE,cAAc,EAAEP,OAAO,aAAPA,OAAO,wBAAAC,gBAAA,GAAPD,OAAO,CAAEQ,OAAO,cAAAP,gBAAA,uBAAhBA,gBAAA,CAAkBM;EACpC,CAAC,CAAC;EAEF,MAAME,MAAM,GAAG,MAAMd,0BAA0B,CAACW,MAAM,CAAC;EAEvD,MAAMI,IAAkB,GAAG,EAAE;EAE7B,MAAMC,UAAU,GAAGL,MAAM,CAACM,gBAAgB,CAACZ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEQ,OAAO,CAAC;EAC5D,WAAW,MAAMK,QAAQ,IAAIF,UAAU,EAAE;IAEvC,KAAK,MAAMG,GAAG,IAAID,QAAQ,EAAE;MAC1BH,IAAI,CAACK,IAAI,CAACD,GAAG,CAAC;IAChB;EACF;EACA,MAAME,cAA8B,GAAG;IACrCC,KAAK,EAAE,kBAAkB;IACzBR,MAAM;IACNS,IAAI,EAAER;EACR,CAAC;EAED,MAAMO,KAAK,GAAGjB,OAAO,aAAPA,OAAO,wBAAAE,iBAAA,GAAPF,OAAO,CAAEQ,OAAO,cAAAN,iBAAA,uBAAhBA,iBAAA,CAAkBe,KAAK;EACrC,QAAQA,KAAK;IACX,KAAK,kBAAkB;MACrB,OAAOD,cAAc;IAEvB,KAAK,eAAe;MAClB,IAAI;QACF,OAAOnB,wBAAwB,CAACmB,cAAc,EAAEP,MAAM,CAAC;MACzD,CAAC,CAAC,OAAOU,KAAK,EAAE;QACd,OAAOH,cAAc;MACvB;IAEF;MACE,MAAM,IAAII,KAAK,CAACH,KAAK,CAAC;EAC1B;AACF;AAEA,OAAO,gBAAgBI,yBAAyBA,CAC9Cf,MAAqB,EACrBN,OAA8B,EACM;EACpC,MAAMS,MAAM,GAAG,MAAMd,0BAA0B,CAACW,MAAM,CAAC;EACvD,MAAMK,UAAU,GAAGL,MAAM,CAACM,gBAAgB,CAACZ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEQ,OAAO,CAAC;EAC5D,WAAW,MAAME,IAAI,IAAIC,UAAU,EAAE;IACnC,MAAM;MACJW,SAAS,EAAE,MAAM;MACjBL,KAAK,EAAE,kBAAkB;MACzBR,MAAM;MACNS,IAAI,EAAER,IAAI;MACVa,MAAM,EAAEb,IAAI,CAACa;IACf,CAAC;EACH;AACF"}
+{"version":3,"file":"parse-parquet-to-rows.js","names":["BlobFile","convertWKBTableToGeoJSON","WKTLoader","WKBLoader","ParquetReader","getSchemaFromParquetReader","installBufferPolyfill","parseParquet","arrayBuffer","options","_options$parquet","_options$parquet2","blob","Blob","file","reader","preserveBinary","parquet","schema","rows","rowBatches","rowBatchIterator","rowBatch","row","push","objectRowTable","shape","data","error","Error","parseParquetFileInBatches","batchType","length"],"sources":["../../../src/lib/parsers/parse-parquet-to-rows.ts"],"sourcesContent":["// import type {LoaderWithParser, Loader, LoaderOptions} from '@loaders.gl/loader-utils';\n// import {ColumnarTableBatch} from '@loaders.gl/schema';\nimport {BlobFile} from '@loaders.gl/loader-utils';\nimport {GeoJSONTable, ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';\nimport {convertWKBTableToGeoJSON} from '@loaders.gl/gis';\nimport {WKTLoader, WKBLoader} from '@loaders.gl/wkt';\n\nimport type {ParquetLoaderOptions} from '../../parquet-loader';\nimport type {ParquetRow} from '../../parquetjs/schema/declare';\nimport {ParquetReader} from '../../parquetjs/parser/parquet-reader';\nimport {getSchemaFromParquetReader} from './get-parquet-schema';\nimport {installBufferPolyfill} from '../../buffer-polyfill';\n\nexport async function parseParquet(\n  arrayBuffer: ArrayBuffer,\n  options?: ParquetLoaderOptions\n): Promise<ObjectRowTable | GeoJSONTable> {\n  installBufferPolyfill();\n\n  const blob = new Blob([arrayBuffer]);\n  const file = new BlobFile(blob);\n  const reader = new ParquetReader(file, {\n    preserveBinary: options?.parquet?.preserveBinary\n  });\n\n  const schema = await getSchemaFromParquetReader(reader);\n\n  const rows: ParquetRow[] = [];\n\n  const rowBatches = reader.rowBatchIterator(options?.parquet);\n  for await (const rowBatch of rowBatches) {\n    // we have only one input batch so return\n    for (const row of rowBatch) {\n      rows.push(row);\n    }\n  }\n  const objectRowTable: ObjectRowTable = {\n    shape: 'object-row-table',\n    schema,\n    data: rows\n  };\n\n  const shape = options?.parquet?.shape;\n  switch (shape) {\n    case 'object-row-table':\n      return objectRowTable;\n\n    case 'geojson-table':\n      try {\n        return convertWKBTableToGeoJSON(objectRowTable, schema, [WKTLoader, WKBLoader]);\n      } catch (error) {\n        return objectRowTable;\n      }\n\n    default:\n      throw new Error(shape);\n  }\n}\n\nexport async function* parseParquetFileInBatches(\n  reader: ParquetReader,\n  options?: ParquetLoaderOptions\n): AsyncIterable<ObjectRowTableBatch> {\n  const schema = await getSchemaFromParquetReader(reader);\n  const rowBatches = reader.rowBatchIterator(options?.parquet);\n  for await (const rows of rowBatches) {\n    yield {\n      batchType: 'data',\n      shape: 'object-row-table',\n      schema,\n      data: rows,\n      length: rows.length\n    };\n  }\n}\n"],"mappings":"AAEA,SAAQA,QAAQ,QAAO,0BAA0B;AAEjD,SAAQC,wBAAwB,QAAO,iBAAiB;AACxD,SAAQC,SAAS,EAAEC,SAAS,QAAO,iBAAiB;AAAC,SAI7CC,aAAa;AAAA,SACbC,0BAA0B;AAAA,SAC1BC,qBAAqB;AAE7B,OAAO,eAAeC,YAAYA,CAChCC,WAAwB,EACxBC,OAA8B,EACU;EAAA,IAAAC,gBAAA,EAAAC,iBAAA;EACxCL,qBAAqB,CAAC,CAAC;EAEvB,MAAMM,IAAI,GAAG,IAAIC,IAAI,CAAC,CAACL,WAAW,CAAC,CAAC;EACpC,MAAMM,IAAI,GAAG,IAAId,QAAQ,CAACY,IAAI,CAAC;EAC/B,MAAMG,MAAM,GAAG,IAAIX,aAAa,CAACU,IAAI,EAAE;IACrCE,cAAc,EAAEP,OAAO,aAAPA,OAAO,wBAAAC,gBAAA,GAAPD,OAAO,CAAEQ,OAAO,cAAAP,gBAAA,uBAAhBA,gBAAA,CAAkBM;EACpC,CAAC,CAAC;EAEF,MAAME,MAAM,GAAG,MAAMb,0BAA0B,CAACU,MAAM,CAAC;EAEvD,MAAMI,IAAkB,GAAG,EAAE;EAE7B,MAAMC,UAAU,GAAGL,MAAM,CAACM,gBAAgB,CAACZ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEQ,OAAO,CAAC;EAC5D,WAAW,MAAMK,QAAQ,IAAIF,UAAU,EAAE;IAEvC,KAAK,MAAMG,GAAG,IAAID,QAAQ,EAAE;MAC1BH,IAAI,CAACK,IAAI,CAACD,GAAG,CAAC;IAChB;EACF;EACA,MAAME,cAA8B,GAAG;IACrCC,KAAK,EAAE,kBAAkB;IACzBR,MAAM;IACNS,IAAI,EAAER;EACR,CAAC;EAED,MAAMO,KAAK,GAAGjB,OAAO,aAAPA,OAAO,wBAAAE,iBAAA,GAAPF,OAAO,CAAEQ,OAAO,cAAAN,iBAAA,uBAAhBA,iBAAA,CAAkBe,KAAK;EACrC,QAAQA,KAAK;IACX,KAAK,kBAAkB;MACrB,OAAOD,cAAc;IAEvB,KAAK,eAAe;MAClB,IAAI;QACF,OAAOxB,wBAAwB,CAACwB,cAAc,EAAEP,MAAM,EAAE,CAAChB,SAAS,EAAEC,SAAS,CAAC,CAAC;MACjF,CAAC,CAAC,OAAOyB,KAAK,EAAE;QACd,OAAOH,cAAc;MACvB;IAEF;MACE,MAAM,IAAII,KAAK,CAACH,KAAK,CAAC;EAC1B;AACF;AAEA,OAAO,gBAAgBI,yBAAyBA,CAC9Cf,MAAqB,EACrBN,OAA8B,EACM;EACpC,MAAMS,MAAM,GAAG,MAAMb,0BAA0B,CAACU,MAAM,CAAC;EACvD,MAAMK,UAAU,GAAGL,MAAM,CAACM,gBAAgB,CAACZ,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEQ,OAAO,CAAC;EAC5D,WAAW,MAAME,IAAI,IAAIC,UAAU,EAAE;IACnC,MAAM;MACJW,SAAS,EAAE,MAAM;MACjBL,KAAK,EAAE,kBAAkB;MACzBR,MAAM;MACNS,IAAI,EAAER,IAAI;MACVa,MAAM,EAAEb,IAAI,CAACa;IACf,CAAC;EACH;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/parquet",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Framework-independent loader for Apache Parquet files",
   "license": "MIT",
   "type": "module",
@@ -57,12 +57,12 @@
     "base64-js and ieee754 are used by buffer polyfill"
   ],
   "dependencies": {
-    "@loaders.gl/bson": "4.0.0",
-    "@loaders.gl/compression": "4.0.0",
-    "@loaders.gl/gis": "4.0.0",
-    "@loaders.gl/loader-utils": "4.0.0",
-    "@loaders.gl/schema": "4.0.0",
-    "@loaders.gl/wkt": "4.0.0",
+    "@loaders.gl/bson": "4.0.1",
+    "@loaders.gl/compression": "4.0.1",
+    "@loaders.gl/gis": "4.0.1",
+    "@loaders.gl/loader-utils": "4.0.1",
+    "@loaders.gl/schema": "4.0.1",
+    "@loaders.gl/wkt": "4.0.1",
     "async-mutex": "^0.2.2",
     "base64-js": "^1.3.1",
     "brotli": "^1.3.2",
@@ -88,5 +88,5 @@
     "@types/varint": "^5.0.0",
     "apache-arrow": "^13.0.0"
   },
-  "gitHead": "9b4211dc0ecd4134a1638ac0a29c5ea9008fd971"
+  "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
 }

package/src/index.ts

@@ -86,13 +86,5 @@ export {
   convertParquetSchema as convertParquetToArrowSchema
 } from './lib/arrow/convert-schema-from-parquet';
 
-// Geo Metadata
-// import {default as GEOPARQUET_METADATA_SCHEMA} from './lib/geo/geoparquet-metadata-schema.json';
-// export {GEOPARQUET_METADATA_SCHEMA};
-export {GEOPARQUET_METADATA_JSON_SCHEMA} from './lib/geo/geoparquet-metadata-schema';
-
-export type {GeoMetadata} from './lib/geo/decode-geo-metadata';
-export {getGeoMetadata, setGeoMetadata, unpackGeoMetadata} from './lib/geo/decode-geo-metadata';
-
 // Experimental
 export {BufferPolyfill, installBufferPolyfill} from './buffer-polyfill';

package/src/lib/parsers/get-parquet-schema.ts

@@ -2,7 +2,7 @@
 import {Schema} from '@loaders.gl/schema';
 import {ParquetReader} from '../../parquetjs/parser/parquet-reader';
 import {convertParquetSchema} from '../arrow/convert-schema-from-parquet';
-import {unpackGeoMetadata, unpackJSONStringMetadata} from '../geo/decode-geo-metadata';
+import {unpackGeoMetadata, unpackJSONStringMetadata} from '@loaders.gl/gis';
 
 export async function getSchemaFromParquetReader(reader: ParquetReader): Promise<Schema> {
   const parquetSchema = await reader.getSchema();

package/src/lib/parsers/parse-parquet-to-rows.ts

@@ -2,12 +2,14 @@
 // import {ColumnarTableBatch} from '@loaders.gl/schema';
 import {BlobFile} from '@loaders.gl/loader-utils';
 import {GeoJSONTable, ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';
+import {convertWKBTableToGeoJSON} from '@loaders.gl/gis';
+import {WKTLoader, WKBLoader} from '@loaders.gl/wkt';
+
 import type {ParquetLoaderOptions} from '../../parquet-loader';
 import type {ParquetRow} from '../../parquetjs/schema/declare';
 import {ParquetReader} from '../../parquetjs/parser/parquet-reader';
 import {getSchemaFromParquetReader} from './get-parquet-schema';
 import {installBufferPolyfill} from '../../buffer-polyfill';
-import {convertWKBTableToGeoJSON} from '../geo/decode-geo-column';
 
 export async function parseParquet(
   arrayBuffer: ArrayBuffer,
@@ -45,7 +47,7 @@ export async function parseParquet(
 
     case 'geojson-table':
       try {
-        return convertWKBTableToGeoJSON(objectRowTable, schema);
+        return convertWKBTableToGeoJSON(objectRowTable, schema, [WKTLoader, WKBLoader]);
       } catch (error) {
         return objectRowTable;
       }

package/dist/lib/geo/decode-geo-column.d.ts

@@ -1,4 +0,0 @@
-import type { ArrayRowTable, GeoJSONTable, ObjectRowTable, Schema } from '@loaders.gl/schema';
-/** TODO - move to loaders.gl/gis? */
-export declare function convertWKBTableToGeoJSON(table: ArrayRowTable | ObjectRowTable, schema: Schema): GeoJSONTable;
-//# sourceMappingURL=decode-geo-column.d.ts.map

package/dist/lib/geo/decode-geo-column.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"decode-geo-column.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/decode-geo-column.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAQ5F,qCAAqC;AACrC,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,aAAa,GAAG,cAAc,EACrC,MAAM,EAAE,MAAM,GACb,YAAY,CAoBd"}

package/dist/lib/geo/decode-geo-column.js

@@ -1,47 +0,0 @@
-import { getTableLength, getTableRowAsObject } from '@loaders.gl/schema';
-import { WKBLoader, WKTLoader } from '@loaders.gl/wkt';
-import { getGeoMetadata } from "./decode-geo-metadata.js";
-export function convertWKBTableToGeoJSON(table, schema) {
-  const geoMetadata = getGeoMetadata(schema);
-  const primaryColumn = geoMetadata === null || geoMetadata === void 0 ? void 0 : geoMetadata.primary_column;
-  if (!primaryColumn) {
-    throw new Error('no geometry column');
-  }
-  const columnMetadata = geoMetadata.columns[primaryColumn];
-  const features = [];
-  const length = getTableLength(table);
-  for (let rowIndex = 0; rowIndex < length; rowIndex++) {
-    const row = getTableRowAsObject(table, rowIndex);
-    const geometry = parseGeometry(row[primaryColumn], columnMetadata);
-    delete row[primaryColumn];
-    const feature = {
-      type: 'Feature',
-      geometry: geometry,
-      properties: row
-    };
-    features.push(feature);
-  }
-  return {
-    shape: 'geojson-table',
-    schema,
-    type: 'FeatureCollection',
-    features
-  };
-}
-function parseGeometry(geometry, columnMetadata) {
-  var _WKTLoader$parseTextS, _WKBLoader$parseSync;
-  switch (columnMetadata.encoding) {
-    case 'wkt':
-      return ((_WKTLoader$parseTextS = WKTLoader.parseTextSync) === null || _WKTLoader$parseTextS === void 0 ? void 0 : _WKTLoader$parseTextS.call(WKTLoader, geometry)) || null;
-    case 'wkb':
-    default:
-      const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
-      const geojson = (_WKBLoader$parseSync = WKBLoader.parseSync) === null || _WKBLoader$parseSync === void 0 ? void 0 : _WKBLoader$parseSync.call(WKBLoader, arrayBuffer, {
-        wkb: {
-          shape: 'geometry'
-        }
-      });
-      return geojson;
-  }
-}
-//# sourceMappingURL=decode-geo-column.js.map

package/dist/lib/geo/decode-geo-column.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"decode-geo-column.js","names":["getTableLength","getTableRowAsObject","WKBLoader","WKTLoader","getGeoMetadata","convertWKBTableToGeoJSON","table","schema","geoMetadata","primaryColumn","primary_column","Error","columnMetadata","columns","features","length","rowIndex","row","geometry","parseGeometry","feature","type","properties","push","shape","_WKTLoader$parseTextS","_WKBLoader$parseSync","encoding","parseTextSync","call","arrayBuffer","ArrayBuffer","isView","buffer","slice","byteOffset","byteLength","geojson","parseSync","wkb"],"sources":["../../../src/lib/geo/decode-geo-column.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\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// import {binaryToGeometry} from '@loaders.gl/gis';\nimport {WKBLoader, WKTLoader} from '@loaders.gl/wkt';\n\nimport {GeoColumnMetadata, getGeoMetadata} from './decode-geo-metadata';\n\n/** TODO - move to loaders.gl/gis? */\nexport function convertWKBTableToGeoJSON(\n  table: ArrayRowTable | ObjectRowTable,\n  schema: Schema\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);\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(geometry: unknown, columnMetadata: GeoColumnMetadata): Geometry | null {\n  switch (columnMetadata.encoding) {\n    case 'wkt':\n      return WKTLoader.parseTextSync?.(geometry as string) || null;\n    case 'wkb':\n    default:\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":"AAKA,SAAQA,cAAc,EAAEC,mBAAmB,QAAO,oBAAoB;AAEtE,SAAQC,SAAS,EAAEC,SAAS,QAAO,iBAAiB;AAAC,SAE1BC,cAAc;AAGzC,OAAO,SAASC,wBAAwBA,CACtCC,KAAqC,EACrCC,MAAc,EACA;EACd,MAAMC,WAAW,GAAGJ,cAAc,CAACG,MAAM,CAAC;EAC1C,MAAME,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,GAAGf,cAAc,CAACM,KAAK,CAAC;EACpC,KAAK,IAAIU,QAAQ,GAAG,CAAC,EAAEA,QAAQ,GAAGD,MAAM,EAAEC,QAAQ,EAAE,EAAE;IACpD,MAAMC,GAAG,GAAGhB,mBAAmB,CAACK,KAAK,EAAEU,QAAQ,CAAC;IAChD,MAAME,QAAQ,GAAGC,aAAa,CAACF,GAAG,CAACR,aAAa,CAAC,EAAEG,cAAc,CAAC;IAClE,OAAOK,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;IAAEjB,MAAM;IAAEc,IAAI,EAAE,mBAAmB;IAAEP;EAAQ,CAAC;AAC9E;AAEA,SAASK,aAAaA,CAACD,QAAiB,EAAEN,cAAiC,EAAmB;EAAA,IAAAa,qBAAA,EAAAC,oBAAA;EAC5F,QAAQd,cAAc,CAACe,QAAQ;IAC7B,KAAK,KAAK;MACR,OAAO,EAAAF,qBAAA,GAAAtB,SAAS,CAACyB,aAAa,cAAAH,qBAAA,uBAAvBA,qBAAA,CAAAI,IAAA,CAAA1B,SAAS,EAAiBe,QAAkB,CAAC,KAAI,IAAI;IAC9D,KAAK,KAAK;IACV;MACE,MAAMY,WAAW,GAAGC,WAAW,CAACC,MAAM,CAACd,QAAQ,CAAC,GAC5CA,QAAQ,CAACe,MAAM,CAACC,KAAK,CAAChB,QAAQ,CAACiB,UAAU,EAAEjB,QAAQ,CAACiB,UAAU,GAAGjB,QAAQ,CAACkB,UAAU,CAAC,GACpFlB,QAAwB;MAC7B,MAAMmB,OAAO,IAAAX,oBAAA,GAAGxB,SAAS,CAACoC,SAAS,cAAAZ,oBAAA,uBAAnBA,oBAAA,CAAAG,IAAA,CAAA3B,SAAS,EAAa4B,WAAW,EAAE;QACjDS,GAAG,EAAE;UAACf,KAAK,EAAE;QAAU;MACzB,CAAC,CAAwB;MACzB,OAAOa,OAAO;EAIlB;AACF"}

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

@@ -1,44 +0,0 @@
-import { Schema } from '@loaders.gl/schema';
-type GeometryType = 'Point' | 'LineString' | 'Polygon' | 'MultiPoint' | 'MultiLineString' | 'MultiPolygon' | 'GeometryCollection' | 'Point Z' | 'LineString Z' | 'Polygon Z' | 'MultiPoint Z' | 'MultiLineString Z' | 'MultiPolygon Z' | 'GeometryCollection Z';
-/**
- * A geoarrow / geoparquet geo metadata object
- * (stored in stringified form in the top level metadata 'geo' key)
- * @see https://github.com/opengeospatial/geoparquet/blob/main/format-specs/geoparquet.md
- * @see https://github.com/geoarrow/geoarrow/blob/main/metadata.md
- * */
-export type GeoMetadata = {
-    version?: string;
-    primary_column?: string;
-    columns: Record<string, GeoColumnMetadata>;
-    [key: string]: unknown;
-};
-/** A geoarrow / geoparquet geo metadata for one geometry column  */
-export type GeoColumnMetadata = {
-    encoding: 'wkb' | 'wkt';
-    geometry_types: GeometryType[];
-    crs?: object | null;
-    orientation?: 'counterclockwise';
-    bbox?: [number, number, number, number] | [number, number, number, number, number, number];
-    edges?: 'planar' | 'spherical';
-    epoch?: number;
-    [key: string]: unknown;
-};
-/** Parse a key with stringified arrow metadata */
-export declare function parseJSONStringMetadata(schema: Schema, metadataKey: string): Record<string, unknown> | null;
-export declare function unpackJSONStringMetadata(schema: Schema, metadataKey: string): void;
-/**
- * Reads the GeoMetadata object from the metadata
- * @note geoarrow / parquet schema is stringified into a single key-value pair in the parquet metadata */
-export declare function getGeoMetadata(schema: Schema): GeoMetadata | null;
-/**
- * Stores a geoarrow / geoparquet geo metadata object in the schema
- * @note geoarrow / geoparquet geo metadata is a single stringified JSON field
- */
-export declare function setGeoMetadata(schema: Schema, geoMetadata: GeoMetadata): void;
-/**
- * Unpacks geo metadata into separate metadata fields (parses the long JSON string)
- * @note geoarrow / parquet schema is stringified into a single key-value pair in the parquet metadata
- */
-export declare function unpackGeoMetadata(schema: Schema): void;
-export {};
-//# sourceMappingURL=decode-geo-metadata.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"decode-geo-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/decode-geo-metadata.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAQ,MAAM,oBAAoB,CAAC;AAIjD,KAAK,YAAY,GACb,OAAO,GACP,YAAY,GACZ,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,oBAAoB,GACpB,SAAS,GACT,cAAc,GACd,WAAW,GACX,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,sBAAsB,CAAC;AAE3B;;;;;KAKK;AACL,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,cAAc,EAAE,YAAY,EAAE,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3F,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,kDAAkD;AAClD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAehC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAMlF;AAID;;yGAEyG;AACzG,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAGjE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAG7E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA6BtD"}