@loaders.gl/geospatial 5.0.0-beta.10 → 5.0.0-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dbf-loader-types.cjs +1 -1
- package/dist/dbf-loader.cjs +2 -4
- package/dist/dbf-loader.cjs.map +2 -2
- package/dist/dbf-worker.js +22 -79
- package/dist/flatgeobuf/flatgeobuf-loader-types.cjs +1 -1
- package/dist/flatgeobuf/flatgeobuf-loader-types.js +1 -1
- package/dist/flatgeobuf/lib/parse-flatgeobuf.cjs +6 -20
- package/dist/flatgeobuf/lib/parse-flatgeobuf.cjs.map +2 -2
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts +4 -4
- package/dist/flatgeobuf/lib/parse-flatgeobuf.d.ts.map +1 -1
- package/dist/flatgeobuf/lib/parse-flatgeobuf.js +9 -22
- package/dist/flatgeobuf/lib/parse-flatgeobuf.js.map +1 -1
- package/dist/flatgeobuf-loader-types.cjs +1 -1
- package/dist/flatgeobuf-worker.js +655 -77
- package/dist/geopackage/geopackage-source-loader.cjs +1 -1
- package/dist/geopackage/geopackage-source-loader.cjs.map +2 -2
- package/dist/geopackage/geopackage-source-loader.js +1 -1
- package/dist/geopackage/geopackage-source-loader.js.map +1 -1
- package/dist/geopackage/lib/parse-geopackage.cjs +2 -6
- package/dist/geopackage/lib/parse-geopackage.cjs.map +2 -2
- package/dist/geopackage/lib/parse-geopackage.d.ts +3 -3
- package/dist/geopackage/lib/parse-geopackage.d.ts.map +1 -1
- package/dist/geopackage/lib/parse-geopackage.js +2 -6
- package/dist/geopackage/lib/parse-geopackage.js.map +1 -1
- package/dist/geopackage-source-loader.cjs +1 -1
- package/dist/geopackage-source-loader.cjs.map +2 -2
- package/dist/gpx-loader-types.cjs +1 -1
- package/dist/kml/gpx-loader-types.cjs +1 -1
- package/dist/kml/gpx-loader-types.js +1 -1
- package/dist/kml/kml-loader-types.cjs +1 -1
- package/dist/kml/kml-loader-types.js +1 -1
- package/dist/kml/kml-writer.cjs +1 -1
- package/dist/kml/kml-writer.js +1 -1
- package/dist/kml/kmz-loader-types.cjs +1 -1
- package/dist/kml/kmz-loader-types.js +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.cjs +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.cjs.map +2 -2
- package/dist/kml/lib/feature-collection-to-arrow.js +1 -1
- package/dist/kml/lib/feature-collection-to-arrow.js.map +1 -1
- package/dist/kml/tcx-loader-types.cjs +1 -1
- package/dist/kml/tcx-loader-types.js +1 -1
- package/dist/kml-loader-types.cjs +1 -1
- package/dist/kml-writer.cjs +1 -1
- package/dist/kmz-loader-types.cjs +1 -1
- package/dist/shapefile/dbf-loader-types.cjs +1 -1
- package/dist/shapefile/dbf-loader-types.js +1 -1
- package/dist/shapefile/dbf-loader.cjs +2 -4
- package/dist/shapefile/dbf-loader.cjs.map +2 -2
- package/dist/shapefile/dbf-loader.d.ts.map +1 -1
- package/dist/shapefile/dbf-loader.js +3 -5
- package/dist/shapefile/dbf-loader.js.map +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.cjs +1 -5
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.d.ts +5 -4
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js +2 -6
- package/dist/shapefile/lib/parsers/build-geoarrow-geometry-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.d.ts +4 -3
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/build-wkb-geometry-arrow.js.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.cjs +7 -10
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.cjs.map +2 -2
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.d.ts +3 -3
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.d.ts.map +1 -1
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.js +11 -9
- package/dist/shapefile/lib/parsers/parse-shp-to-arrow.js.map +1 -1
- package/dist/shapefile/lib/shapefile-worker-transport.cjs +0 -3
- package/dist/shapefile/lib/shapefile-worker-transport.cjs.map +2 -2
- package/dist/shapefile/lib/shapefile-worker-transport.d.ts.map +1 -1
- package/dist/shapefile/lib/shapefile-worker-transport.js +1 -5
- package/dist/shapefile/lib/shapefile-worker-transport.js.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.cjs +53 -48
- package/dist/shapefile/shapefile-arrow-loader.cjs.map +2 -2
- package/dist/shapefile/shapefile-arrow-loader.d.ts +5 -3
- package/dist/shapefile/shapefile-arrow-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-arrow-loader.js +54 -52
- package/dist/shapefile/shapefile-arrow-loader.js.map +1 -1
- package/dist/shapefile/shapefile-loader-types.cjs +1 -1
- package/dist/shapefile/shapefile-loader-types.d.ts +4 -4
- package/dist/shapefile/shapefile-loader-types.js +1 -1
- package/dist/shapefile/shapefile-loader.cjs +19 -55
- package/dist/shapefile/shapefile-loader.cjs.map +2 -2
- package/dist/shapefile/shapefile-loader.d.ts +5 -42
- package/dist/shapefile/shapefile-loader.d.ts.map +1 -1
- package/dist/shapefile/shapefile-loader.js +22 -64
- package/dist/shapefile/shapefile-loader.js.map +1 -1
- package/dist/shapefile/shp-loader-types.cjs +1 -1
- package/dist/shapefile/shp-loader-types.js +1 -1
- package/dist/shapefile/shp-loader.cjs +1 -44
- package/dist/shapefile/shp-loader.cjs.map +2 -2
- package/dist/shapefile/shp-loader.d.ts +1 -115
- package/dist/shapefile/shp-loader.d.ts.map +1 -1
- package/dist/shapefile/shp-loader.js +1 -48
- package/dist/shapefile/shp-loader.js.map +1 -1
- package/dist/shapefile-arrow-loader.cjs +53 -48
- package/dist/shapefile-arrow-loader.cjs.map +2 -2
- package/dist/shapefile-loader-types.cjs +1 -1
- package/dist/shapefile-loader.cjs +19 -55
- package/dist/shapefile-loader.cjs.map +2 -2
- package/dist/shapefile-worker.js +117 -272
- package/dist/shp-loader-types.cjs +1 -1
- package/dist/shp-loader.cjs +1 -44
- package/dist/shp-loader.cjs.map +2 -2
- package/dist/shp-worker.js +16964 -17085
- package/dist/tcx-loader-types.cjs +1 -1
- package/dist/wkt/lib/version.cjs +1 -1
- package/dist/wkt/lib/version.js +1 -1
- package/dist/wkt-worker.js +1 -1
- package/dist/workers/shapefile-worker.cjs +3 -3
- package/dist/workers/shapefile-worker.cjs.map +2 -2
- package/dist/workers/shapefile-worker.js +4 -4
- package/dist/workers/shapefile-worker.js.map +1 -1
- package/dist/workers/shp-worker.cjs +1 -1
- package/dist/workers/shp-worker.cjs.map +2 -2
- package/dist/workers/shp-worker.js +2 -2
- package/dist/workers/shp-worker.js.map +1 -1
- package/package.json +6 -6
- package/src/flatgeobuf/lib/parse-flatgeobuf.ts +15 -33
- package/src/geopackage/geopackage-source-loader.ts +1 -1
- package/src/geopackage/lib/parse-geopackage.ts +4 -9
- package/src/kml/lib/feature-collection-to-arrow.ts +1 -1
- package/src/shapefile/dbf-loader.ts +4 -7
- package/src/shapefile/lib/parsers/build-geoarrow-geometry-arrow.ts +5 -9
- package/src/shapefile/lib/parsers/build-wkb-geometry-arrow.ts +4 -3
- package/src/shapefile/lib/parsers/parse-shp-to-arrow.ts +14 -20
- package/src/shapefile/lib/shapefile-worker-transport.ts +1 -6
- package/src/shapefile/shapefile-arrow-loader.ts +76 -70
- package/src/shapefile/shapefile-loader.ts +40 -90
- package/src/shapefile/shp-loader.ts +7 -61
- package/src/workers/shapefile-worker.ts +4 -4
- package/src/workers/shp-worker.ts +2 -2
|
@@ -35,7 +35,7 @@ __export(dbf_loader_types_exports, {
|
|
|
35
35
|
module.exports = __toCommonJS(dbf_loader_types_exports);
|
|
36
36
|
|
|
37
37
|
// src/shapefile/dbf-loader-types.ts
|
|
38
|
-
var VERSION = true ? "5.0.0-beta.
|
|
38
|
+
var VERSION = true ? "5.0.0-beta.11" : "latest";
|
|
39
39
|
async function preloadDBFLoader() {
|
|
40
40
|
const { DBFLoaderWithParser } = await import("@loaders.gl/geospatial/dbf");
|
|
41
41
|
return DBFLoaderWithParser;
|
package/dist/dbf-loader.cjs
CHANGED
|
@@ -58,8 +58,7 @@ function getDBFShape(options) {
|
|
|
58
58
|
return options?.dbf?.shape || "arrow";
|
|
59
59
|
}
|
|
60
60
|
function deserializeDBFWorkerResult(result, options) {
|
|
61
|
-
const
|
|
62
|
-
const table = "shape" in value ? value.data : value;
|
|
61
|
+
const table = (0, import_shapefile_worker_transport.deserializeShapefileWorkerResult)(result);
|
|
63
62
|
const shape = getDBFShape(options);
|
|
64
63
|
if (shape === "arrow") return table;
|
|
65
64
|
const rows = table.toArray().map((row) => row.toJSON());
|
|
@@ -69,8 +68,7 @@ function deserializeDBFWorkerResult(result, options) {
|
|
|
69
68
|
return { shape: "object-row-table", schema, data: rows };
|
|
70
69
|
}
|
|
71
70
|
function deserializeDBFWorkerBatch(result, options) {
|
|
72
|
-
const
|
|
73
|
-
const batch = "shape" in value ? value.data.batches[0] ?? (0, import_schema_utils.makeArrowMetadataBatch)(value.data.schema) : value;
|
|
71
|
+
const batch = (0, import_shapefile_worker_transport.deserializeShapefileWorkerResult)(result);
|
|
74
72
|
return batch instanceof import_apache_arrow.RecordBatch && getDBFShape(options) !== "arrow" ? batch.toArray().map((row) => row.toJSON()) : batch;
|
|
75
73
|
}
|
|
76
74
|
var DBFLoaderWithParser = DBFColumnLoader;
|
package/dist/dbf-loader.cjs.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/dbf-loader.ts", "../src/shapefile/dbf-loader.ts"],
|
|
4
|
-
"sourcesContent": ["export * from './shapefile/dbf-loader.js';\n", "// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Table, RecordBatch} from 'apache-arrow';\nimport {convertArrowToSchema
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACIA,0BAAiC;AACjC,
|
|
4
|
+
"sourcesContent": ["export * from './shapefile/dbf-loader.js';\n", "// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Table, RecordBatch} from 'apache-arrow';\nimport {convertArrowToSchema} from '@loaders.gl/core/schema-utils';\nimport type {Loader, LoaderWithParser, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';\nimport type {ObjectRowTable} from '@loaders.gl/core/schema';\nimport {\n parseDBF as parseDBFToObjectRows,\n parseDBFInBatches as parseDBFToObjectRowsInBatches\n} from './lib/parsers/parse-dbf';\nimport {\n parseDBF as parseDBFToArrow,\n parseDBFInBatches as parseDBFToArrowInBatches\n} from './lib/parsers/parse-dbf-to-arrow';\nimport type {DBFHeader, DBFRowsOutput, DBFTableOutput} from './lib/parsers/types';\nimport {DBFLoader as DBFWorkerLoaderMetadata} from './dbf-loader-types';\nimport {DBFLoader as DBFLoaderMetadata} from './dbf-loader-types';\nimport {\n deserializeShapefileWorkerResult,\n serializeShapefileWorkerBatch,\n serializeShapefileWorkerResult\n} from './lib/shapefile-worker-transport';\n\nconst {preload: _DBFWorkerLoaderPreload, ...DBFWorkerLoaderMetadataWithoutPreload} =\n DBFWorkerLoaderMetadata;\nconst {preload: _DBFLoaderPreload, ...DBFLoaderMetadataWithoutPreload} = DBFLoaderMetadata;\n\nexport type DBFLoaderOptions = StrictLoaderOptions & {\n dbf?: {\n encoding?: string;\n shape?: 'rows' | 'table' | 'object-row-table' | 'arrow';\n batchSize?: number;\n /** Override the URL to the worker bundle (by default loads from unpkg.com) */\n workerUrl?: string;\n };\n};\n\n/**\n * DBFLoaderWithParser - DBF files are used to contain non-geometry columns in Shapefiles\n */\nexport const DBFWorkerLoaderWithParser = {\n ...DBFWorkerLoaderMetadataWithoutPreload\n} as const satisfies Loader<any, any, DBFLoaderOptions>;\n\n/** DBF file loader */\nexport const DBFColumnLoader = {\n ...DBFLoaderMetadataWithoutPreload,\n dataType: null as unknown as DBFRowsOutput | DBFTableOutput | ObjectRowTable | Table,\n batchType: null as unknown as DBFHeader | DBFRowsOutput | DBFTableOutput | RecordBatch,\n parse: async (arrayBuffer, options) =>\n getDBFShape(options) === 'arrow'\n ? parseDBFToArrow(arrayBuffer, options)\n : parseDBFToObjectRows(arrayBuffer, options),\n parseSync: (arrayBuffer, options) =>\n getDBFShape(options) === 'arrow'\n ? parseDBFToArrow(arrayBuffer, options)\n : parseDBFToObjectRows(arrayBuffer, options),\n parseInBatches(\n arrayBufferIterator:\n | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n | Iterable<ArrayBufferLike | ArrayBufferView>,\n options?: DBFLoaderOptions\n ) {\n const batchOptions =\n typeof options?.core?.batchSize === 'number'\n ? {...options, dbf: {...options.dbf, batchSize: options.core.batchSize}}\n : options;\n return getDBFShape(batchOptions) === 'arrow'\n ? parseDBFToArrowInBatches(arrayBufferIterator, batchOptions)\n : parseDBFToObjectRowsInBatches(arrayBufferIterator, batchOptions);\n },\n serializeWorkerResult: serializeShapefileWorkerResult,\n deserializeWorkerResult: deserializeDBFWorkerResult,\n serializeWorkerBatch: serializeShapefileWorkerBatch,\n deserializeWorkerBatch: deserializeDBFWorkerBatch\n} as const satisfies LoaderWithParser<\n DBFRowsOutput | DBFTableOutput | ObjectRowTable | Table,\n DBFHeader | DBFRowsOutput | DBFTableOutput | RecordBatch,\n DBFLoaderOptions\n>;\n\nfunction getDBFShape(options?: DBFLoaderOptions): NonNullable<DBFLoaderOptions['dbf']>['shape'] {\n return options?.dbf?.shape || 'arrow';\n}\n\n/** Converts hydrated Arrow scalars to the requested legacy row output on the caller. */\nfunction deserializeDBFWorkerResult(result: unknown, options?: DBFLoaderOptions) {\n const table = deserializeShapefileWorkerResult<Table>(result);\n const shape = getDBFShape(options);\n if (shape === 'arrow') return table;\n const rows = table.toArray().map(row => row.toJSON());\n if (shape === 'rows') return rows;\n const schema = convertArrowToSchema(table.schema);\n if (shape === 'table') return {schema, rows};\n return {shape: 'object-row-table' as const, schema, data: rows};\n}\n\n/** Keeps legacy header events and materializes row arrays only on the caller. */\nfunction deserializeDBFWorkerBatch(result: unknown, options?: DBFLoaderOptions) {\n const batch = deserializeShapefileWorkerResult<DBFHeader | RecordBatch>(result);\n return batch instanceof RecordBatch && getDBFShape(options) !== 'arrow'\n ? batch.toArray().map(row => row.toJSON())\n : batch;\n}\n\n/** Exposes native Arrow tables and batches. */\nexport const DBFLoaderWithParser = DBFColumnLoader;\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACIA,0BAAiC;AACjC,0BAAmC;AAGnC,uBAGO;AACP,gCAGO;AAEP,8BAAmD;AACnD,IAAAA,2BAA6C;AAC7C,wCAIO;AAEP,IAAM,EAAC,SAAS,yBAAyB,GAAG,sCAAqC,IAC/E,wBAAAC;AACF,IAAM,EAAC,SAAS,mBAAmB,GAAG,gCAA+B,IAAI,yBAAAC;AAelE,IAAM,4BAA4B;AAAA,EACvC,GAAG;AACL;AAGO,IAAM,kBAAkB;AAAA,EAC7B,GAAG;AAAA,EACH,UAAU;AAAA,EACV,WAAW;AAAA,EACX,OAAO,OAAO,aAAa,YACzB,YAAY,OAAO,MAAM,cACrB,0BAAAC,UAAgB,aAAa,OAAO,QACpC,iBAAAC,UAAqB,aAAa,OAAO;AAAA,EAC/C,WAAW,CAAC,aAAa,YACvB,YAAY,OAAO,MAAM,cACrB,0BAAAD,UAAgB,aAAa,OAAO,QACpC,iBAAAC,UAAqB,aAAa,OAAO;AAAA,EAC/C,eACE,qBAGA,SACA;AACA,UAAM,eACJ,OAAO,SAAS,MAAM,cAAc,WAChC,EAAC,GAAG,SAAS,KAAK,EAAC,GAAG,QAAQ,KAAK,WAAW,QAAQ,KAAK,UAAS,EAAC,IACrE;AACN,WAAO,YAAY,YAAY,MAAM,cACjC,0BAAAC,mBAAyB,qBAAqB,YAAY,QAC1D,iBAAAC,mBAA8B,qBAAqB,YAAY;AAAA,EACrE;AAAA,EACA,uBAAuB;AAAA,EACvB,yBAAyB;AAAA,EACzB,sBAAsB;AAAA,EACtB,wBAAwB;AAC1B;AAMA,SAAS,YAAY,SAA2E;AAC9F,SAAO,SAAS,KAAK,SAAS;AAChC;AAGA,SAAS,2BAA2B,QAAiB,SAA4B;AAC/E,QAAM,YAAQ,oEAAwC,MAAM;AAC5D,QAAM,QAAQ,YAAY,OAAO;AACjC,MAAI,UAAU,QAAS,QAAO;AAC9B,QAAM,OAAO,MAAM,QAAQ,EAAE,IAAI,SAAO,IAAI,OAAO,CAAC;AACpD,MAAI,UAAU,OAAQ,QAAO;AAC7B,QAAM,aAAS,0CAAqB,MAAM,MAAM;AAChD,MAAI,UAAU,QAAS,QAAO,EAAC,QAAQ,KAAI;AAC3C,SAAO,EAAC,OAAO,oBAA6B,QAAQ,MAAM,KAAI;AAChE;AAGA,SAAS,0BAA0B,QAAiB,SAA4B;AAC9E,QAAM,YAAQ,oEAA0D,MAAM;AAC9E,SAAO,iBAAiB,mCAAe,YAAY,OAAO,MAAM,UAC5D,MAAM,QAAQ,EAAE,IAAI,SAAO,IAAI,OAAO,CAAC,IACvC;AACN;AAGO,IAAM,sBAAsB;",
|
|
6
6
|
"names": ["import_dbf_loader_types", "DBFWorkerLoaderMetadata", "DBFLoaderMetadata", "parseDBFToArrow", "parseDBFToObjectRows", "parseDBFToArrowInBatches", "parseDBFToObjectRowsInBatches"]
|
|
7
7
|
}
|
package/dist/dbf-worker.js
CHANGED
|
@@ -16878,13 +16878,9 @@ return true;`);
|
|
|
16878
16878
|
function snapshotArrowSchema(schema) {
|
|
16879
16879
|
return deserializeArrowSchema(serializeArrowSchema(schema));
|
|
16880
16880
|
}
|
|
16881
|
-
function makeArrowMetadataBatch(schema) {
|
|
16882
|
-
return new RecordBatch3(snapshotArrowSchema(schema), void 0);
|
|
16883
|
-
}
|
|
16884
16881
|
var init_arrow_metadata = __esm({
|
|
16885
16882
|
"../core/src/schema-utils/lib/arrow/arrow-metadata.ts"() {
|
|
16886
16883
|
"use strict";
|
|
16887
|
-
init_Arrow_dom();
|
|
16888
16884
|
init_convert_arrow_schema();
|
|
16889
16885
|
}
|
|
16890
16886
|
});
|
|
@@ -16968,7 +16964,6 @@ return true;`);
|
|
|
16968
16964
|
"use strict";
|
|
16969
16965
|
init_convert_arrow_schema();
|
|
16970
16966
|
init_arrow_table_builder();
|
|
16971
|
-
init_arrow_metadata();
|
|
16972
16967
|
}
|
|
16973
16968
|
});
|
|
16974
16969
|
|
|
@@ -17544,7 +17539,7 @@ return true;`);
|
|
|
17544
17539
|
var init_dbf_loader_types = __esm({
|
|
17545
17540
|
"src/shapefile/dbf-loader-types.ts"() {
|
|
17546
17541
|
"use strict";
|
|
17547
|
-
VERSION = true ? "5.0.0-beta.
|
|
17542
|
+
VERSION = true ? "5.0.0-beta.11" : "latest";
|
|
17548
17543
|
DBFLoader = {
|
|
17549
17544
|
name: "DBF",
|
|
17550
17545
|
dataType: null,
|
|
@@ -17621,6 +17616,20 @@ return true;`);
|
|
|
17621
17616
|
}
|
|
17622
17617
|
});
|
|
17623
17618
|
|
|
17619
|
+
// ../../node_modules/@math.gl/arrow/dist/arrow/arrow-column-utils.js
|
|
17620
|
+
function isArrowTable2(value) {
|
|
17621
|
+
const table = value;
|
|
17622
|
+
return Boolean(table && Number.isInteger(table.numRows) && Array.isArray(table.batches) && Array.isArray(table.schema?.fields) && typeof table.get === "function" && typeof table.getChild === "function");
|
|
17623
|
+
}
|
|
17624
|
+
function isArrowRecordBatch2(value) {
|
|
17625
|
+
const batch = value;
|
|
17626
|
+
return Boolean(batch && Number.isInteger(batch.numRows) && Array.isArray(batch.schema?.fields) && Array.isArray(batch.data?.children) && typeof batch.get === "function" && typeof batch.getChild === "function");
|
|
17627
|
+
}
|
|
17628
|
+
var init_arrow_column_utils = __esm({
|
|
17629
|
+
"../../node_modules/@math.gl/arrow/dist/arrow/arrow-column-utils.js"() {
|
|
17630
|
+
}
|
|
17631
|
+
});
|
|
17632
|
+
|
|
17624
17633
|
// ../../node_modules/@math.gl/arrow/dist/arrow/split-arrow-buffers.js
|
|
17625
17634
|
function splitArrowBuffers(input, options = {}) {
|
|
17626
17635
|
const retainedBuffers = /* @__PURE__ */ new Set();
|
|
@@ -17642,12 +17651,6 @@ return true;`);
|
|
|
17642
17651
|
}
|
|
17643
17652
|
return splitArrowDataBuffers(input, context);
|
|
17644
17653
|
}
|
|
17645
|
-
function isArrowTable2(input) {
|
|
17646
|
-
return "batches" in input;
|
|
17647
|
-
}
|
|
17648
|
-
function isArrowRecordBatch2(input) {
|
|
17649
|
-
return "schema" in input && "data" in input && !Array.isArray(input.data);
|
|
17650
|
-
}
|
|
17651
17654
|
function isArrowVector2(input) {
|
|
17652
17655
|
return "data" in input && Array.isArray(input.data);
|
|
17653
17656
|
}
|
|
@@ -17719,6 +17722,7 @@ return true;`);
|
|
|
17719
17722
|
init_Arrow_dom();
|
|
17720
17723
|
init_arrow_record_batch();
|
|
17721
17724
|
init_arrow_data();
|
|
17725
|
+
init_arrow_column_utils();
|
|
17722
17726
|
}
|
|
17723
17727
|
});
|
|
17724
17728
|
|
|
@@ -17831,12 +17835,6 @@ return true;`);
|
|
|
17831
17835
|
}
|
|
17832
17836
|
});
|
|
17833
17837
|
|
|
17834
|
-
// ../../node_modules/@math.gl/arrow/dist/arrow/arrow-column-utils.js
|
|
17835
|
-
var init_arrow_column_utils = __esm({
|
|
17836
|
-
"../../node_modules/@math.gl/arrow/dist/arrow/arrow-column-utils.js"() {
|
|
17837
|
-
}
|
|
17838
|
-
});
|
|
17839
|
-
|
|
17840
17838
|
// ../../node_modules/@math.gl/arrow/dist/arrow/index.js
|
|
17841
17839
|
var init_arrow = __esm({
|
|
17842
17840
|
"../../node_modules/@math.gl/arrow/dist/arrow/index.js"() {
|
|
@@ -17861,27 +17859,6 @@ return true;`);
|
|
|
17861
17859
|
});
|
|
17862
17860
|
|
|
17863
17861
|
// ../core/src/arrow-worker-transport.ts
|
|
17864
|
-
function serializeArrowWorkerTable(result) {
|
|
17865
|
-
if (!isArrowTableWrapper(result)) {
|
|
17866
|
-
throw new Error("Workers require Arrow table output");
|
|
17867
|
-
}
|
|
17868
|
-
const { data, shape: _shape, ...metadata } = result;
|
|
17869
|
-
return {
|
|
17870
|
-
transport: "arrow-column-envelope",
|
|
17871
|
-
metadata: structuredClone(metadata),
|
|
17872
|
-
...serializeWorkerColumns(data, { copy: "all" })
|
|
17873
|
-
};
|
|
17874
|
-
}
|
|
17875
|
-
function deserializeArrowWorkerTable(result) {
|
|
17876
|
-
if (isArrowWorkerEnvelope(result)) {
|
|
17877
|
-
return { ...result.metadata, shape: "arrow-table", data: hydrateWorkerTable(result) };
|
|
17878
|
-
}
|
|
17879
|
-
if (isLegacyArrowWorkerEnvelope(result)) {
|
|
17880
|
-
const { arrowBatchMetadata: _snapshots, data: _columns, ...metadata } = result;
|
|
17881
|
-
return { ...metadata, data: hydrateWorkerTable(result) };
|
|
17882
|
-
}
|
|
17883
|
-
throw new Error("Workers require Arrow column transport");
|
|
17884
|
-
}
|
|
17885
17862
|
function serializeNativeArrowWorkerResult(result, options = { copy: "all" }) {
|
|
17886
17863
|
const batch = result instanceof RecordBatch3;
|
|
17887
17864
|
if (!batch && !(result instanceof Table)) {
|
|
@@ -17903,41 +17880,19 @@ return true;`);
|
|
|
17903
17880
|
const data = hydrateWorkerTable(payload.columns);
|
|
17904
17881
|
return payload.transport === "arrow-record-batch" ? data.batches[0] : data;
|
|
17905
17882
|
}
|
|
17906
|
-
function isArrowTableWrapper(value) {
|
|
17907
|
-
const table = value;
|
|
17908
|
-
return Boolean(
|
|
17909
|
-
table && table.shape === "arrow-table" && table.data && typeof table.data === "object" && "batches" in table.data
|
|
17910
|
-
);
|
|
17911
|
-
}
|
|
17912
17883
|
function hasArrowWorkerColumns(value) {
|
|
17913
17884
|
const columns = value;
|
|
17914
17885
|
return columns?.data?.transport === "arrow-js" && Array.isArray(columns.data.batches);
|
|
17915
17886
|
}
|
|
17916
|
-
function isArrowWorkerEnvelope(value) {
|
|
17917
|
-
return value?.transport === "arrow-column-envelope" && hasArrowWorkerColumns(value);
|
|
17918
|
-
}
|
|
17919
|
-
function isLegacyArrowWorkerEnvelope(value) {
|
|
17920
|
-
return value?.shape === "arrow-table" && hasArrowWorkerColumns(value);
|
|
17921
|
-
}
|
|
17922
17887
|
function serializeWorkerColumns(table, options) {
|
|
17923
17888
|
return {
|
|
17924
17889
|
arrowBatchMetadata: snapshotBatchMetadata(table),
|
|
17925
|
-
data:
|
|
17890
|
+
data: dehydrateArrowTable(table, options)
|
|
17926
17891
|
};
|
|
17927
17892
|
}
|
|
17928
|
-
function dehydrateWorkerTable(table, options) {
|
|
17929
|
-
const payload = dehydrateArrowTable(table, options);
|
|
17930
|
-
if (table.numCols === 0) {
|
|
17931
|
-
for (const [index, batch] of table.batches.entries()) {
|
|
17932
|
-
payload.batches[index].length = batch.numRows;
|
|
17933
|
-
}
|
|
17934
|
-
}
|
|
17935
|
-
return payload;
|
|
17936
|
-
}
|
|
17937
17893
|
function snapshotBatchMetadata(table) {
|
|
17938
17894
|
return table.batches.map((batch) => ({
|
|
17939
|
-
schema: tableToIPC(new Table(batch.schema, []))
|
|
17940
|
-
metadata: Array.from(batch.metadata)
|
|
17895
|
+
schema: tableToIPC(new Table(batch.schema, []))
|
|
17941
17896
|
}));
|
|
17942
17897
|
}
|
|
17943
17898
|
function hydrateWorkerTable(result) {
|
|
@@ -17945,18 +17900,11 @@ return true;`);
|
|
|
17945
17900
|
const table = hydrateArrowTable(data);
|
|
17946
17901
|
const batches = table.batches.map((batch, index) => {
|
|
17947
17902
|
const snapshot = arrowBatchMetadata?.[index];
|
|
17948
|
-
|
|
17903
|
+
return snapshot ? createRecordBatchWithMetadata(
|
|
17949
17904
|
tableFromIPC(snapshot.schema).schema,
|
|
17950
17905
|
batch.data,
|
|
17951
|
-
new Map(snapshot.metadata)
|
|
17906
|
+
snapshot.metadata ? new Map(snapshot.metadata) : getRecordBatchMetadata(batch)
|
|
17952
17907
|
) : batch;
|
|
17953
|
-
const rowCount = data.batches[index].length;
|
|
17954
|
-
if (restored.numCols === 0 && restored.numRows !== rowCount) {
|
|
17955
|
-
Object.defineProperty(restored, "data", {
|
|
17956
|
-
value: new Data(new Struct([]), 0, rowCount, 0, void 0, [])
|
|
17957
|
-
});
|
|
17958
|
-
}
|
|
17959
|
-
return restored;
|
|
17960
17908
|
});
|
|
17961
17909
|
return new Table(table.schema, batches);
|
|
17962
17910
|
}
|
|
@@ -17972,7 +17920,6 @@ return true;`);
|
|
|
17972
17920
|
function serializeShapefileWorkerResult(result) {
|
|
17973
17921
|
if (result instanceof Table || result instanceof RecordBatch3)
|
|
17974
17922
|
return serializeNativeArrowWorkerResult(result);
|
|
17975
|
-
if (result?.shape === "arrow-table") return serializeArrowWorkerTable(result);
|
|
17976
17923
|
if (Array.isArray(result) && result.every((value) => value === null || value instanceof Uint8Array)) {
|
|
17977
17924
|
return { transport: "shp-wkb", geometries: result.map((value) => value?.slice() ?? null) };
|
|
17978
17925
|
}
|
|
@@ -17992,8 +17939,6 @@ return true;`);
|
|
|
17992
17939
|
function deserializeShapefileWorkerResult(result) {
|
|
17993
17940
|
if (result?.transport === "arrow-table-columns" || result?.transport === "arrow-record-batch")
|
|
17994
17941
|
return deserializeNativeArrowWorkerResult(result);
|
|
17995
|
-
if (result?.transport === "arrow-column-envelope" || result?.shape === "arrow-table")
|
|
17996
|
-
return deserializeArrowWorkerTable(result);
|
|
17997
17942
|
if (result?.transport === "shapefile-header") return result.header;
|
|
17998
17943
|
if (result?.transport === "shp-wkb") {
|
|
17999
17944
|
return result.header ? {
|
|
@@ -18021,8 +17966,7 @@ return true;`);
|
|
|
18021
17966
|
return options?.dbf?.shape || "arrow";
|
|
18022
17967
|
}
|
|
18023
17968
|
function deserializeDBFWorkerResult(result, options) {
|
|
18024
|
-
const
|
|
18025
|
-
const table = "shape" in value ? value.data : value;
|
|
17969
|
+
const table = deserializeShapefileWorkerResult(result);
|
|
18026
17970
|
const shape = getDBFShape(options);
|
|
18027
17971
|
if (shape === "arrow") return table;
|
|
18028
17972
|
const rows = table.toArray().map((row) => row.toJSON());
|
|
@@ -18032,8 +17976,7 @@ return true;`);
|
|
|
18032
17976
|
return { shape: "object-row-table", schema, data: rows };
|
|
18033
17977
|
}
|
|
18034
17978
|
function deserializeDBFWorkerBatch(result, options) {
|
|
18035
|
-
const
|
|
18036
|
-
const batch = "shape" in value ? value.data.batches[0] ?? makeArrowMetadataBatch(value.data.schema) : value;
|
|
17979
|
+
const batch = deserializeShapefileWorkerResult(result);
|
|
18037
17980
|
return batch instanceof RecordBatch3 && getDBFShape(options) !== "arrow" ? batch.toArray().map((row) => row.toJSON()) : batch;
|
|
18038
17981
|
}
|
|
18039
17982
|
var _DBFWorkerLoaderPreload, DBFWorkerLoaderMetadataWithoutPreload, _DBFLoaderPreload, DBFLoaderMetadataWithoutPreload, DBFWorkerLoaderWithParser, DBFColumnLoader, DBFLoaderWithParser;
|
|
@@ -34,7 +34,7 @@ __export(flatgeobuf_loader_types_exports, {
|
|
|
34
34
|
});
|
|
35
35
|
module.exports = __toCommonJS(flatgeobuf_loader_types_exports);
|
|
36
36
|
var import_flatgeobuf_format = require("./flatgeobuf-format.cjs");
|
|
37
|
-
var VERSION = true ? "5.0.0-beta.
|
|
37
|
+
var VERSION = true ? "5.0.0-beta.11" : "latest";
|
|
38
38
|
var FGB_MAGIC_NUMBER = [102, 103, 98, 3, 102, 103, 98, 1];
|
|
39
39
|
async function preload() {
|
|
40
40
|
const { FlatGeobufLoaderWithParser } = await import("@loaders.gl/geospatial/flatgeobuf-loader");
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { FlatGeobufFormat } from "./flatgeobuf-format.js";
|
|
5
5
|
// __VERSION__ is injected by babel-plugin-version-inline
|
|
6
6
|
// @ts-ignore TS2304: Cannot find name '__VERSION__'.
|
|
7
|
-
const VERSION = typeof "5.0.0-beta.
|
|
7
|
+
const VERSION = typeof "5.0.0-beta.11" !== 'undefined' ? "5.0.0-beta.11" : 'latest';
|
|
8
8
|
// FGB\3FGB\1
|
|
9
9
|
const FGB_MAGIC_NUMBER = [0x66, 0x67, 0x62, 0x03, 0x66, 0x67, 0x62, 0x01];
|
|
10
10
|
/** Preloads the parser-bearing FlatGeobuf loader implementation. */
|
|
@@ -55,7 +55,7 @@ function parseFlatGeobuf(arrayBuffer, options) {
|
|
|
55
55
|
const arrowTable = parseFlatGeobufToArrowTable(arrayBuffer, options);
|
|
56
56
|
switch (options.shape) {
|
|
57
57
|
case "arrow":
|
|
58
|
-
return arrowTable
|
|
58
|
+
return arrowTable;
|
|
59
59
|
case "geojson-table":
|
|
60
60
|
return makeGeoJsonTable(arrayBuffer, options);
|
|
61
61
|
case "binary-geometry":
|
|
@@ -63,16 +63,7 @@ function parseFlatGeobuf(arrayBuffer, options) {
|
|
|
63
63
|
makeGeoJsonTable(arrayBuffer, options).features
|
|
64
64
|
);
|
|
65
65
|
case "columnar-table":
|
|
66
|
-
return
|
|
67
|
-
shape: "columnar-table",
|
|
68
|
-
schema: arrowTable.schema,
|
|
69
|
-
data: Object.fromEntries(
|
|
70
|
-
(arrowTable.schema?.fields || []).map((field) => [
|
|
71
|
-
field.name,
|
|
72
|
-
arrowTable.data.getChild(field.name)?.toArray()
|
|
73
|
-
])
|
|
74
|
-
)
|
|
75
|
-
};
|
|
66
|
+
return (0, import_schema_utils.convertArrowToTable)(arrowTable, "columnar-table");
|
|
76
67
|
default:
|
|
77
68
|
throw new Error(`Unsupported FlatGeobuf output shape ${options.shape}`);
|
|
78
69
|
}
|
|
@@ -120,29 +111,24 @@ function parseFlatGeobufToArrowTable(arrayBuffer, options = {}) {
|
|
|
120
111
|
void 0,
|
|
121
112
|
[...propertyData, geometryData]
|
|
122
113
|
);
|
|
123
|
-
return
|
|
124
|
-
shape: "arrow-table",
|
|
125
|
-
schema,
|
|
126
|
-
data: new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)])
|
|
127
|
-
};
|
|
114
|
+
return new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)]);
|
|
128
115
|
}
|
|
129
116
|
function queryFlatGeobufArrowTable(arrayBuffer, options = {}) {
|
|
130
117
|
throwIfAborted(options.signal);
|
|
131
118
|
const sourceTable = parseFlatGeobufToArrowTable(arrayBuffer, {
|
|
132
119
|
boundingBox: options.boundingBox
|
|
133
120
|
});
|
|
134
|
-
const sourceColumnNames = sourceTable.
|
|
121
|
+
const sourceColumnNames = sourceTable.schema.fields.map((field) => field.name);
|
|
135
122
|
const plan = (0, import_loader_utils.planTableQuery)(sourceColumnNames, options);
|
|
136
123
|
const scanStep = plan.find((step) => step.kind === "scan");
|
|
137
124
|
const projectStep = plan.find((step) => step.kind === "project");
|
|
138
125
|
if (!scanStep || scanStep.kind !== "scan" || !projectStep || projectStep.kind !== "project") {
|
|
139
126
|
throw new Error("FlatGeobuf query planner produced an invalid plan.");
|
|
140
127
|
}
|
|
141
|
-
if (!sourceTable.schema) throw new Error("FlatGeobuf query source is missing a schema.");
|
|
142
128
|
const predicateStep = plan.find((step) => step.kind === "filter");
|
|
143
129
|
const limitStep = plan.find((step) => step.kind === "limit");
|
|
144
130
|
return (0, import_schema_utils.queryArrowTable)(
|
|
145
|
-
sourceTable
|
|
131
|
+
sourceTable,
|
|
146
132
|
{
|
|
147
133
|
predicate: predicateStep?.kind === "filter" ? predicateStep.predicate : void 0,
|
|
148
134
|
columns: projectStep.columns,
|
|
@@ -154,7 +140,7 @@ function queryFlatGeobufArrowTable(arrayBuffer, options = {}) {
|
|
|
154
140
|
async function* parseFlatGeobufInBatches(stream, options) {
|
|
155
141
|
const arrayBuffer = await new Response(stream).arrayBuffer();
|
|
156
142
|
const table = parseFlatGeobufToArrowTable(arrayBuffer, options);
|
|
157
|
-
yield
|
|
143
|
+
yield* table.batches;
|
|
158
144
|
}
|
|
159
145
|
function makeArrowSchema(header, options) {
|
|
160
146
|
const fields = header.columns.map((column) => ({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/flatgeobuf/lib/parse-flatgeobuf.ts"],
|
|
4
|
-
"sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport * as arrow from 'apache-arrow';\nimport {projectionEngine} from '@math.gl/geospatial/projection';\nimport type {Projection} from '@math.gl/geospatial/projection';\nimport type {ReadonlyCRSDefinition} from '@math.gl/geospatial/crs';\nimport type {\n ArrowTable,\n ArrowTableBatch,\n Feature,\n Field,\n Schema,\n Table\n} from '@loaders.gl/core/schema';\nimport {\n filterColumnarRowIndices,\n makeTableScanBatch,\n planTableQuery,\n CRSReprojectionError,\n type CRSReprojectionOptions,\n type ColumnarPredicate,\n type TableQueryOptions\n} from '@loaders.gl/core/loader-utils';\nimport {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/core/arrow-geometry/legacy-binary';\nimport {transformGeoJsonCoords} from '@loaders.gl/core/arrow-geometry/legacy-binary';\nimport {\n encodeWKBGeometryValue,\n makeWKBGeometryField,\n setWKBGeometryColumnMetadata\n} from '@loaders.gl/core/arrow-geometry/geometry-field';\nimport {makeWKBGeometryDataFromArray} from '@loaders.gl/core/arrow-geometry/wkb-arrow-utils';\nimport {convertFeaturesToGeoArrowTable} from '@loaders.gl/core/arrow-geometry/feature-table';\nimport {type GeoParquetGeometryType} from '@loaders.gl/core/schema';\nimport {WKBBuilder} from '@loaders.gl/core/arrow-geometry';\nimport {convertSchemaToArrow, queryArrowTable} from '@loaders.gl/core/schema-utils';\nimport {\n decodeFlatGeobufGeometry,\n FlatGeobufColumnType,\n FlatGeobufGeometryType,\n getFlatGeobufGeometryBounds,\n getFlatGeobufCRSIdentifier,\n readFlatGeobufFeatures,\n readFlatGeobufHeader,\n writeFlatGeobufGeometryToWKB,\n type FlatGeobufHeader\n} from './flatgeobuf-reader';\n\nconst GEOMETRY_COLUMN_NAME = 'geometry';\n\nexport type ParseFlatGeobufOptions = CRSReprojectionOptions & {\n shape?: 'geojson-table' | 'columnar-table' | 'binary-geometry' | 'arrow';\n boundingBox?: [[number, number], [number, number]];\n /** Preferred encoding for Arrow geometry output. */\n geoarrow?: {encodingPreference?: import('@loaders.gl/core/schema').GeoArrowEncodingPreference};\n};\n\n/** Portable FlatGeobuf query options, with an indexed spatial envelope. */\nexport type FlatGeobufQueryOptions<PredicateT extends ColumnarPredicate = ColumnarPredicate> =\n TableQueryOptions<PredicateT> &\n Readonly<{\n /** Bounding box used to prune features before property decoding. */\n boundingBox?: [[number, number], [number, number]];\n /** Cancels parsing before or during feature materialization. */\n signal?: AbortSignal;\n }>;\n\n/** Parses a FlatGeobuf buffer through the Arrow-native decode pipeline. */\nexport function parseFlatGeobuf(\n arrayBuffer: ArrayBuffer,\n options: ParseFlatGeobufOptions\n): Table | any {\n const arrowTable = parseFlatGeobufToArrowTable(arrayBuffer, options);\n switch (options.shape) {\n case 'arrow':\n return arrowTable.data;\n case 'geojson-table':\n return makeGeoJsonTable(arrayBuffer, options);\n case 'binary-geometry':\n return convertGeojsonToBinaryFeatureCollection(\n makeGeoJsonTable(arrayBuffer, options).features\n );\n case 'columnar-table':\n return {\n shape: 'columnar-table',\n schema: arrowTable.schema,\n data: Object.fromEntries(\n (arrowTable.schema?.fields || []).map(field => [\n field.name,\n arrowTable.data.getChild(field.name)?.toArray()\n ])\n )\n } as Table;\n default:\n throw new Error(`Unsupported FlatGeobuf output shape ${options.shape}`);\n }\n}\n\n/** Parses FlatGeobuf into compact GeoArrow WKB and Apache Arrow buffers. */\nexport function parseFlatGeobufToArrowTable(\n arrayBuffer: ArrayBuffer,\n options: ParseFlatGeobufOptions = {}\n): ArrowTable {\n const preference = options.geoarrow?.encodingPreference;\n if (preference && preference !== 'geoarrow.wkb') {\n return convertFeaturesToGeoArrowTable(makeGeoJsonTable(arrayBuffer, options).features, {\n encodingPreference: preference\n });\n }\n const header = readFlatGeobufHeader(arrayBuffer);\n const projection = getProjection(header, options.reproject, options.targetCrs || 'WGS84');\n const schema = makeArrowSchema(\n header,\n projection ? {targetCrs: options.targetCrs || 'WGS84'} : undefined\n );\n const features = [...readFlatGeobufFeatures(arrayBuffer, header)].filter(feature =>\n matchesBoundingBox(arrayBuffer, feature.geometryOffset, header, options.boundingBox)\n );\n const geometryWriters = features.map(feature =>\n feature.geometryOffset === undefined\n ? null\n : (builder: WKBBuilder) =>\n writeFlatGeobufGeometryToWKB(builder, arrayBuffer, feature.geometryOffset, header)\n );\n const geometryArray = WKBBuilder.buildGeometryArray(geometryWriters, {\n hasZ: header.hasZ,\n transform: projection ? coordinate => projection.projectSync(coordinate) : undefined\n });\n const arrowSchema = convertSchemaToArrow(schema);\n const propertyBuilders = arrowSchema.fields\n .slice(0, -1)\n .map(field => arrow.makeBuilder({type: field.type, nullValues: [null]}));\n for (const feature of features) {\n for (let index = 0; index < header.columns.length; index++)\n propertyBuilders[index].append(feature.properties[header.columns[index].name] ?? null);\n }\n const propertyData = propertyBuilders.map(builder => {\n const data = builder.flush();\n builder.finish();\n return data;\n });\n const geometryData = makeWKBGeometryDataFromArray(geometryArray);\n const structData = new arrow.Data(\n new arrow.Struct(arrowSchema.fields),\n 0,\n features.length,\n 0,\n undefined,\n [...propertyData, geometryData]\n );\n return {\n shape: 'arrow-table',\n schema,\n data: new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)])\n };\n}\n\n/** Executes a portable projection, residual predicate, and limit over FlatGeobuf features. */\nexport function queryFlatGeobufArrowTable(\n arrayBuffer: ArrayBuffer,\n options: FlatGeobufQueryOptions = {}\n): arrow.Table {\n throwIfAborted(options.signal);\n const sourceTable = parseFlatGeobufToArrowTable(arrayBuffer, {\n boundingBox: options.boundingBox\n });\n const sourceColumnNames = sourceTable.data.schema.fields.map(field => field.name);\n const plan = planTableQuery(sourceColumnNames, options);\n const scanStep = plan.find(step => step.kind === 'scan');\n const projectStep = plan.find(step => step.kind === 'project');\n if (!scanStep || scanStep.kind !== 'scan' || !projectStep || projectStep.kind !== 'project') {\n throw new Error('FlatGeobuf query planner produced an invalid plan.');\n }\n if (!sourceTable.schema) throw new Error('FlatGeobuf query source is missing a schema.');\n const predicateStep = plan.find(step => step.kind === 'filter');\n const limitStep = plan.find(step => step.kind === 'limit');\n return queryArrowTable(\n sourceTable.data,\n {\n predicate: predicateStep?.kind === 'filter' ? predicateStep.predicate : undefined,\n columns: projectStep.columns,\n limit: limitStep?.kind === 'limit' ? limitStep.limit : undefined\n },\n (predicate, columns, rowCount) => filterColumnarRowIndices(predicate, columns, rowCount)\n );\n}\n\n/** Loads FlatGeobuf as small Arrow batches; each batch is a stable-schema table. */\nexport async function* parseFlatGeobufInBatches(\n stream: ReadableStream,\n options: ParseFlatGeobufOptions\n): AsyncGenerator<ArrowTableBatch> {\n const arrayBuffer = await new Response(stream).arrayBuffer();\n const table = parseFlatGeobufToArrowTable(arrayBuffer, options);\n yield makeTableScanBatch(table);\n}\n\n/** Creates the public Arrow schema from FlatGeobuf header metadata. */\nexport function makeArrowSchema(\n header: FlatGeobufHeader | any,\n options?: {targetCrs?: ReadonlyCRSDefinition}\n): Schema {\n const fields: Field[] = header.columns.map(column => ({\n name: column.name,\n type: getArrowType(column.type),\n nullable: column.nullable,\n metadata: {\n title: column.title || '',\n description: column.description || '',\n width: String(column.width),\n precision: String(column.precision),\n scale: String(column.scale),\n unique: String(column.unique),\n primary_key: String(column.primaryKey)\n }\n }));\n fields.push(makeWKBGeometryField(GEOMETRY_COLUMN_NAME));\n const schemaMetadata: Record<string, string> = {\n title: header.title || '',\n description: header.description || '',\n crs: serializeCRSMetadata(header.crs || {}),\n metadata: header.metadata || '',\n geometryType: String(header.geometryType),\n indexNodeSize: String(header.indexNodeSize),\n featureCount: String(header.featuresCount),\n bounds: header.envelope?.join(',') || ''\n };\n if (options?.targetCrs !== undefined) {\n schemaMetadata.sourceCrs = serializeCRSMetadata(header.crs || {});\n schemaMetadata.crs = serializeCRSMetadata(options.targetCrs);\n }\n const schema: Schema = {\n fields,\n metadata: schemaMetadata\n };\n setWKBGeometryColumnMetadata(schema.metadata!, {\n geometryColumnName: GEOMETRY_COLUMN_NAME,\n geometryTypes: [getGeometryType(header.geometryType, header.hasZ)]\n });\n return schema;\n}\n\n/** Serializes a CRS metadata value without adding quotes around identifier strings. */\nfunction serializeCRSMetadata(crs: ReadonlyCRSDefinition | Record<string, unknown>): string {\n return typeof crs === 'string' ? crs : JSON.stringify(crs);\n}\n\n/** Encodes one legacy source-loader feature as a WKB Arrow object row. */\nexport function makeArrowRow(feature: Feature, _header?: unknown): Record<string, unknown> {\n return {\n ...(feature.properties || {}),\n [GEOMETRY_COLUMN_NAME]: encodeWKBGeometryValue(feature.geometry)\n };\n}\n\nfunction makeGeoJsonTable(arrayBuffer: ArrayBuffer, options: ParseFlatGeobufOptions) {\n const header = readFlatGeobufHeader(arrayBuffer);\n let features: Feature[] = [];\n for (const feature of readFlatGeobufFeatures(arrayBuffer, header)) {\n if (!matchesBoundingBox(arrayBuffer, feature.geometryOffset, header, options.boundingBox))\n continue;\n features.push({\n type: 'Feature',\n properties: feature.properties,\n geometry: decodeFlatGeobufGeometry(arrayBuffer, feature.geometryOffset, header)\n });\n }\n const projection = getProjection(header, options.reproject, options.targetCrs || 'WGS84');\n if (projection)\n features = transformGeoJsonCoords(features, coordinates => projection.projectSync(coordinates));\n return {\n shape: 'geojson-table' as const,\n schema: makePropertySchema(header),\n type: 'FeatureCollection' as const,\n features\n };\n}\n\nfunction throwIfAborted(signal?: AbortSignal): void {\n if (signal?.aborted) {\n const error = new Error('Aborted');\n error.name = 'AbortError';\n throw error;\n }\n}\n\nfunction getGeometryType(type: FlatGeobufGeometryType, hasZ: boolean): GeoParquetGeometryType {\n const names: Record<FlatGeobufGeometryType, string> = {\n 0: 'Geometry',\n 1: 'Point',\n 2: 'LineString',\n 3: 'Polygon',\n 4: 'MultiPoint',\n 5: 'MultiLineString',\n 6: 'MultiPolygon',\n 7: 'GeometryCollection'\n };\n return `${names[type]}${hasZ ? ' Z' : ''}` as GeoParquetGeometryType;\n}\nfunction getArrowType(type: FlatGeobufColumnType): Field['type'] {\n switch (type) {\n case FlatGeobufColumnType.Byte:\n return 'int8';\n case FlatGeobufColumnType.UByte:\n return 'uint8';\n case FlatGeobufColumnType.Bool:\n return 'bool';\n case FlatGeobufColumnType.Short:\n return 'int16';\n case FlatGeobufColumnType.UShort:\n return 'uint16';\n case FlatGeobufColumnType.Int:\n return 'int32';\n case FlatGeobufColumnType.UInt:\n return 'uint32';\n case FlatGeobufColumnType.Long:\n return 'int64';\n case FlatGeobufColumnType.ULong:\n return 'uint64';\n case FlatGeobufColumnType.Float:\n return 'float32';\n case FlatGeobufColumnType.Double:\n return 'float64';\n case FlatGeobufColumnType.String:\n case FlatGeobufColumnType.Json:\n return 'utf8';\n case FlatGeobufColumnType.DateTime:\n return 'date-millisecond';\n case FlatGeobufColumnType.Binary:\n return 'binary';\n default:\n return 'null';\n }\n}\nexport function getProjection(\n header: FlatGeobufHeader | any,\n reproject = false,\n targetCrs: ReadonlyCRSDefinition = 'WGS84'\n): Projection | undefined {\n if (!reproject) return undefined;\n const sourceCrs = header.crs?.wkt || getFlatGeobufCRSIdentifier(header.crs);\n if (!sourceCrs) {\n throw new CRSReprojectionError(\n 'missing-source-crs',\n 'FlatGeobuf reprojection requires a source CRS in the file header',\n {targetCrs}\n );\n }\n try {\n return projectionEngine.createProjection({\n from: sourceCrs,\n to: targetCrs as ReadonlyCRSDefinition\n });\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n throw new CRSReprojectionError(\n 'transformation-failed',\n `FlatGeobuf reprojection failed: ${message}`,\n {sourceCrs, targetCrs, cause: error}\n );\n }\n}\nfunction matchesBoundingBox(\n arrayBuffer: ArrayBuffer,\n geometryOffset: number | undefined,\n header: FlatGeobufHeader,\n boundingBox?: [[number, number], [number, number]]\n): boolean {\n if (!boundingBox) return true;\n const bounds = getFlatGeobufGeometryBounds(arrayBuffer, geometryOffset, header);\n return Boolean(\n bounds &&\n bounds[2] >= boundingBox[0][0] &&\n bounds[0] <= boundingBox[1][0] &&\n bounds[3] >= boundingBox[0][1] &&\n bounds[1] <= boundingBox[1][1]\n );\n}\nfunction makePropertySchema(header: FlatGeobufHeader): Schema {\n const schema = makeArrowSchema(header);\n return {...schema, fields: schema.fields.slice(0, -1)};\n}\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,YAAuB;AACvB,wBAA+B;
|
|
4
|
+
"sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport * as arrow from 'apache-arrow';\nimport {projectionEngine} from '@math.gl/geospatial/projection';\nimport type {Projection} from '@math.gl/geospatial/projection';\nimport type {ReadonlyCRSDefinition} from '@math.gl/geospatial/crs';\nimport type {Feature, Field, Schema, Table} from '@loaders.gl/core/schema';\nimport {\n filterColumnarRowIndices,\n planTableQuery,\n CRSReprojectionError,\n type CRSReprojectionOptions,\n type ColumnarPredicate,\n type TableQueryOptions\n} from '@loaders.gl/core/loader-utils';\nimport {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/core/arrow-geometry/legacy-binary';\nimport {transformGeoJsonCoords} from '@loaders.gl/core/arrow-geometry/legacy-binary';\nimport {\n encodeWKBGeometryValue,\n makeWKBGeometryField,\n setWKBGeometryColumnMetadata\n} from '@loaders.gl/core/arrow-geometry/geometry-field';\nimport {makeWKBGeometryDataFromArray} from '@loaders.gl/core/arrow-geometry/wkb-arrow-utils';\nimport {convertFeaturesToGeoArrowTable} from '@loaders.gl/core/arrow-geometry/feature-table';\nimport {type GeoParquetGeometryType} from '@loaders.gl/core/schema';\nimport {WKBBuilder} from '@loaders.gl/core/arrow-geometry';\nimport {\n convertArrowToTable,\n convertSchemaToArrow,\n queryArrowTable\n} from '@loaders.gl/core/schema-utils';\nimport {\n decodeFlatGeobufGeometry,\n FlatGeobufColumnType,\n FlatGeobufGeometryType,\n getFlatGeobufGeometryBounds,\n getFlatGeobufCRSIdentifier,\n readFlatGeobufFeatures,\n readFlatGeobufHeader,\n writeFlatGeobufGeometryToWKB,\n type FlatGeobufHeader\n} from './flatgeobuf-reader';\n\nconst GEOMETRY_COLUMN_NAME = 'geometry';\n\nexport type ParseFlatGeobufOptions = CRSReprojectionOptions & {\n shape?: 'geojson-table' | 'columnar-table' | 'binary-geometry' | 'arrow';\n boundingBox?: [[number, number], [number, number]];\n /** Preferred encoding for Arrow geometry output. */\n geoarrow?: {encodingPreference?: import('@loaders.gl/core/schema').GeoArrowEncodingPreference};\n};\n\n/** Portable FlatGeobuf query options, with an indexed spatial envelope. */\nexport type FlatGeobufQueryOptions<PredicateT extends ColumnarPredicate = ColumnarPredicate> =\n TableQueryOptions<PredicateT> &\n Readonly<{\n /** Bounding box used to prune features before property decoding. */\n boundingBox?: [[number, number], [number, number]];\n /** Cancels parsing before or during feature materialization. */\n signal?: AbortSignal;\n }>;\n\n/** Parses a FlatGeobuf buffer through the Arrow-native decode pipeline. */\nexport function parseFlatGeobuf(\n arrayBuffer: ArrayBuffer,\n options: ParseFlatGeobufOptions\n): Table | any {\n const arrowTable = parseFlatGeobufToArrowTable(arrayBuffer, options);\n switch (options.shape) {\n case 'arrow':\n return arrowTable;\n case 'geojson-table':\n return makeGeoJsonTable(arrayBuffer, options);\n case 'binary-geometry':\n return convertGeojsonToBinaryFeatureCollection(\n makeGeoJsonTable(arrayBuffer, options).features\n );\n case 'columnar-table':\n return convertArrowToTable(arrowTable, 'columnar-table');\n default:\n throw new Error(`Unsupported FlatGeobuf output shape ${options.shape}`);\n }\n}\n\n/** Parses FlatGeobuf into compact GeoArrow WKB and Apache Arrow buffers. */\nexport function parseFlatGeobufToArrowTable(\n arrayBuffer: ArrayBuffer,\n options: ParseFlatGeobufOptions = {}\n): arrow.Table {\n const preference = options.geoarrow?.encodingPreference;\n if (preference && preference !== 'geoarrow.wkb') {\n return convertFeaturesToGeoArrowTable(makeGeoJsonTable(arrayBuffer, options).features, {\n encodingPreference: preference\n });\n }\n const header = readFlatGeobufHeader(arrayBuffer);\n const projection = getProjection(header, options.reproject, options.targetCrs || 'WGS84');\n const schema = makeArrowSchema(\n header,\n projection ? {targetCrs: options.targetCrs || 'WGS84'} : undefined\n );\n const features = [...readFlatGeobufFeatures(arrayBuffer, header)].filter(feature =>\n matchesBoundingBox(arrayBuffer, feature.geometryOffset, header, options.boundingBox)\n );\n const geometryWriters = features.map(feature =>\n feature.geometryOffset === undefined\n ? null\n : (builder: WKBBuilder) =>\n writeFlatGeobufGeometryToWKB(builder, arrayBuffer, feature.geometryOffset, header)\n );\n const geometryArray = WKBBuilder.buildGeometryArray(geometryWriters, {\n hasZ: header.hasZ,\n transform: projection ? coordinate => projection.projectSync(coordinate) : undefined\n });\n const arrowSchema = convertSchemaToArrow(schema);\n const propertyBuilders = arrowSchema.fields\n .slice(0, -1)\n .map(field => arrow.makeBuilder({type: field.type, nullValues: [null]}));\n for (const feature of features) {\n for (let index = 0; index < header.columns.length; index++)\n propertyBuilders[index].append(feature.properties[header.columns[index].name] ?? null);\n }\n const propertyData = propertyBuilders.map(builder => {\n const data = builder.flush();\n builder.finish();\n return data;\n });\n const geometryData = makeWKBGeometryDataFromArray(geometryArray);\n const structData = new arrow.Data(\n new arrow.Struct(arrowSchema.fields),\n 0,\n features.length,\n 0,\n undefined,\n [...propertyData, geometryData]\n );\n return new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)]);\n}\n\n/** Executes a portable projection, residual predicate, and limit over FlatGeobuf features. */\nexport function queryFlatGeobufArrowTable(\n arrayBuffer: ArrayBuffer,\n options: FlatGeobufQueryOptions = {}\n): arrow.Table {\n throwIfAborted(options.signal);\n const sourceTable = parseFlatGeobufToArrowTable(arrayBuffer, {\n boundingBox: options.boundingBox\n });\n const sourceColumnNames = sourceTable.schema.fields.map(field => field.name);\n const plan = planTableQuery(sourceColumnNames, options);\n const scanStep = plan.find(step => step.kind === 'scan');\n const projectStep = plan.find(step => step.kind === 'project');\n if (!scanStep || scanStep.kind !== 'scan' || !projectStep || projectStep.kind !== 'project') {\n throw new Error('FlatGeobuf query planner produced an invalid plan.');\n }\n const predicateStep = plan.find(step => step.kind === 'filter');\n const limitStep = plan.find(step => step.kind === 'limit');\n return queryArrowTable(\n sourceTable,\n {\n predicate: predicateStep?.kind === 'filter' ? predicateStep.predicate : undefined,\n columns: projectStep.columns,\n limit: limitStep?.kind === 'limit' ? limitStep.limit : undefined\n },\n (predicate, columns, rowCount) => filterColumnarRowIndices(predicate, columns, rowCount)\n );\n}\n\n/** Loads FlatGeobuf as native Arrow record batches. */\nexport async function* parseFlatGeobufInBatches(\n stream: ReadableStream,\n options: ParseFlatGeobufOptions\n): AsyncGenerator<arrow.RecordBatch> {\n const arrayBuffer = await new Response(stream).arrayBuffer();\n const table = parseFlatGeobufToArrowTable(arrayBuffer, options);\n yield* table.batches;\n}\n\n/** Creates the public Arrow schema from FlatGeobuf header metadata. */\nexport function makeArrowSchema(\n header: FlatGeobufHeader | any,\n options?: {targetCrs?: ReadonlyCRSDefinition}\n): Schema {\n const fields: Field[] = header.columns.map(column => ({\n name: column.name,\n type: getArrowType(column.type),\n nullable: column.nullable,\n metadata: {\n title: column.title || '',\n description: column.description || '',\n width: String(column.width),\n precision: String(column.precision),\n scale: String(column.scale),\n unique: String(column.unique),\n primary_key: String(column.primaryKey)\n }\n }));\n fields.push(makeWKBGeometryField(GEOMETRY_COLUMN_NAME));\n const schemaMetadata: Record<string, string> = {\n title: header.title || '',\n description: header.description || '',\n crs: serializeCRSMetadata(header.crs || {}),\n metadata: header.metadata || '',\n geometryType: String(header.geometryType),\n indexNodeSize: String(header.indexNodeSize),\n featureCount: String(header.featuresCount),\n bounds: header.envelope?.join(',') || ''\n };\n if (options?.targetCrs !== undefined) {\n schemaMetadata.sourceCrs = serializeCRSMetadata(header.crs || {});\n schemaMetadata.crs = serializeCRSMetadata(options.targetCrs);\n }\n const schema: Schema = {\n fields,\n metadata: schemaMetadata\n };\n setWKBGeometryColumnMetadata(schema.metadata!, {\n geometryColumnName: GEOMETRY_COLUMN_NAME,\n geometryTypes: [getGeometryType(header.geometryType, header.hasZ)]\n });\n return schema;\n}\n\n/** Serializes a CRS metadata value without adding quotes around identifier strings. */\nfunction serializeCRSMetadata(crs: ReadonlyCRSDefinition | Record<string, unknown>): string {\n return typeof crs === 'string' ? crs : JSON.stringify(crs);\n}\n\n/** Encodes one legacy source-loader feature as a WKB Arrow object row. */\nexport function makeArrowRow(feature: Feature, _header?: unknown): Record<string, unknown> {\n return {\n ...(feature.properties || {}),\n [GEOMETRY_COLUMN_NAME]: encodeWKBGeometryValue(feature.geometry)\n };\n}\n\nfunction makeGeoJsonTable(arrayBuffer: ArrayBuffer, options: ParseFlatGeobufOptions) {\n const header = readFlatGeobufHeader(arrayBuffer);\n let features: Feature[] = [];\n for (const feature of readFlatGeobufFeatures(arrayBuffer, header)) {\n if (!matchesBoundingBox(arrayBuffer, feature.geometryOffset, header, options.boundingBox))\n continue;\n features.push({\n type: 'Feature',\n properties: feature.properties,\n geometry: decodeFlatGeobufGeometry(arrayBuffer, feature.geometryOffset, header)\n });\n }\n const projection = getProjection(header, options.reproject, options.targetCrs || 'WGS84');\n if (projection)\n features = transformGeoJsonCoords(features, coordinates => projection.projectSync(coordinates));\n return {\n shape: 'geojson-table' as const,\n schema: makePropertySchema(header),\n type: 'FeatureCollection' as const,\n features\n };\n}\n\nfunction throwIfAborted(signal?: AbortSignal): void {\n if (signal?.aborted) {\n const error = new Error('Aborted');\n error.name = 'AbortError';\n throw error;\n }\n}\n\nfunction getGeometryType(type: FlatGeobufGeometryType, hasZ: boolean): GeoParquetGeometryType {\n const names: Record<FlatGeobufGeometryType, string> = {\n 0: 'Geometry',\n 1: 'Point',\n 2: 'LineString',\n 3: 'Polygon',\n 4: 'MultiPoint',\n 5: 'MultiLineString',\n 6: 'MultiPolygon',\n 7: 'GeometryCollection'\n };\n return `${names[type]}${hasZ ? ' Z' : ''}` as GeoParquetGeometryType;\n}\nfunction getArrowType(type: FlatGeobufColumnType): Field['type'] {\n switch (type) {\n case FlatGeobufColumnType.Byte:\n return 'int8';\n case FlatGeobufColumnType.UByte:\n return 'uint8';\n case FlatGeobufColumnType.Bool:\n return 'bool';\n case FlatGeobufColumnType.Short:\n return 'int16';\n case FlatGeobufColumnType.UShort:\n return 'uint16';\n case FlatGeobufColumnType.Int:\n return 'int32';\n case FlatGeobufColumnType.UInt:\n return 'uint32';\n case FlatGeobufColumnType.Long:\n return 'int64';\n case FlatGeobufColumnType.ULong:\n return 'uint64';\n case FlatGeobufColumnType.Float:\n return 'float32';\n case FlatGeobufColumnType.Double:\n return 'float64';\n case FlatGeobufColumnType.String:\n case FlatGeobufColumnType.Json:\n return 'utf8';\n case FlatGeobufColumnType.DateTime:\n return 'date-millisecond';\n case FlatGeobufColumnType.Binary:\n return 'binary';\n default:\n return 'null';\n }\n}\nexport function getProjection(\n header: FlatGeobufHeader | any,\n reproject = false,\n targetCrs: ReadonlyCRSDefinition = 'WGS84'\n): Projection | undefined {\n if (!reproject) return undefined;\n const sourceCrs = header.crs?.wkt || getFlatGeobufCRSIdentifier(header.crs);\n if (!sourceCrs) {\n throw new CRSReprojectionError(\n 'missing-source-crs',\n 'FlatGeobuf reprojection requires a source CRS in the file header',\n {targetCrs}\n );\n }\n try {\n return projectionEngine.createProjection({\n from: sourceCrs,\n to: targetCrs as ReadonlyCRSDefinition\n });\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n throw new CRSReprojectionError(\n 'transformation-failed',\n `FlatGeobuf reprojection failed: ${message}`,\n {sourceCrs, targetCrs, cause: error}\n );\n }\n}\nfunction matchesBoundingBox(\n arrayBuffer: ArrayBuffer,\n geometryOffset: number | undefined,\n header: FlatGeobufHeader,\n boundingBox?: [[number, number], [number, number]]\n): boolean {\n if (!boundingBox) return true;\n const bounds = getFlatGeobufGeometryBounds(arrayBuffer, geometryOffset, header);\n return Boolean(\n bounds &&\n bounds[2] >= boundingBox[0][0] &&\n bounds[0] <= boundingBox[1][0] &&\n bounds[3] >= boundingBox[0][1] &&\n bounds[1] <= boundingBox[1][1]\n );\n}\nfunction makePropertySchema(header: FlatGeobufHeader): Schema {\n const schema = makeArrowSchema(header);\n return {...schema, fields: schema.fields.slice(0, -1)};\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["import_legacy_binary"]
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as arrow from 'apache-arrow';
|
|
2
2
|
import type { Projection } from '@math.gl/geospatial/projection';
|
|
3
3
|
import type { ReadonlyCRSDefinition } from '@math.gl/geospatial/crs';
|
|
4
|
-
import type {
|
|
4
|
+
import type { Feature, Schema, Table } from '@loaders.gl/core/schema';
|
|
5
5
|
import { type CRSReprojectionOptions, type ColumnarPredicate, type TableQueryOptions } from '@loaders.gl/core/loader-utils';
|
|
6
6
|
import { type FlatGeobufHeader } from "./flatgeobuf-reader.js";
|
|
7
7
|
export type ParseFlatGeobufOptions = CRSReprojectionOptions & {
|
|
@@ -22,11 +22,11 @@ export type FlatGeobufQueryOptions<PredicateT extends ColumnarPredicate = Column
|
|
|
22
22
|
/** Parses a FlatGeobuf buffer through the Arrow-native decode pipeline. */
|
|
23
23
|
export declare function parseFlatGeobuf(arrayBuffer: ArrayBuffer, options: ParseFlatGeobufOptions): Table | any;
|
|
24
24
|
/** Parses FlatGeobuf into compact GeoArrow WKB and Apache Arrow buffers. */
|
|
25
|
-
export declare function parseFlatGeobufToArrowTable(arrayBuffer: ArrayBuffer, options?: ParseFlatGeobufOptions):
|
|
25
|
+
export declare function parseFlatGeobufToArrowTable(arrayBuffer: ArrayBuffer, options?: ParseFlatGeobufOptions): arrow.Table;
|
|
26
26
|
/** Executes a portable projection, residual predicate, and limit over FlatGeobuf features. */
|
|
27
27
|
export declare function queryFlatGeobufArrowTable(arrayBuffer: ArrayBuffer, options?: FlatGeobufQueryOptions): arrow.Table;
|
|
28
|
-
/** Loads FlatGeobuf as
|
|
29
|
-
export declare function parseFlatGeobufInBatches(stream: ReadableStream, options: ParseFlatGeobufOptions): AsyncGenerator<
|
|
28
|
+
/** Loads FlatGeobuf as native Arrow record batches. */
|
|
29
|
+
export declare function parseFlatGeobufInBatches(stream: ReadableStream, options: ParseFlatGeobufOptions): AsyncGenerator<arrow.RecordBatch>;
|
|
30
30
|
/** Creates the public Arrow schema from FlatGeobuf header metadata. */
|
|
31
31
|
export declare function makeArrowSchema(header: FlatGeobufHeader | any, options?: {
|
|
32
32
|
targetCrs?: ReadonlyCRSDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-flatgeobuf.d.ts","sourceRoot":"","sources":["../../../src/flatgeobuf/lib/parse-flatgeobuf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"parse-flatgeobuf.d.ts","sourceRoot":"","sources":["../../../src/flatgeobuf/lib/parse-flatgeobuf.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAC,OAAO,EAAS,MAAM,EAAE,KAAK,EAAC,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAIL,KAAK,sBAAsB,EAC3B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,+BAA+B,CAAC;AAiBvC,OAAO,EASL,KAAK,gBAAgB,EACtB,+BAA4B;AAI7B,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,KAAK,CAAC,EAAE,eAAe,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,OAAO,CAAC;IACzE,WAAW,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,oDAAoD;IACpD,QAAQ,CAAC,EAAE;QAAC,kBAAkB,CAAC,EAAE,OAAO,yBAAyB,EAAE,0BAA0B,CAAA;KAAC,CAAC;CAChG,CAAC;AAEF,2EAA2E;AAC3E,MAAM,MAAM,sBAAsB,CAAC,UAAU,SAAS,iBAAiB,GAAG,iBAAiB,IACzF,iBAAiB,CAAC,UAAU,CAAC,GAC3B,QAAQ,CAAC;IACP,oEAAoE;IACpE,WAAW,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,gEAAgE;IAChE,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC,CAAC;AAEP,2EAA2E;AAC3E,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,sBAAsB,GAC9B,KAAK,GAAG,GAAG,CAgBb;AAED,4EAA4E;AAC5E,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE,sBAA2B,GACnC,KAAK,CAAC,KAAK,CAiDb;AAED,8FAA8F;AAC9F,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,WAAW,EACxB,OAAO,GAAE,sBAA2B,GACnC,KAAK,CAAC,KAAK,CAuBb;AAED,uDAAuD;AACvD,wBAAuB,wBAAwB,CAC7C,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,sBAAsB,GAC9B,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAInC;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAC7B,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAC9B,OAAO,CAAC,EAAE;IAAC,SAAS,CAAC,EAAE,qBAAqB,CAAA;CAAC,GAC5C,MAAM,CAuCR;AAOD,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKzF;AAiFD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAC9B,SAAS,UAAQ,EACjB,SAAS,GAAE,qBAA+B,GACzC,UAAU,GAAG,SAAS,CAuBxB"}
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import * as arrow from 'apache-arrow';
|
|
5
5
|
import { projectionEngine } from '@math.gl/geospatial/projection';
|
|
6
|
-
import { filterColumnarRowIndices,
|
|
6
|
+
import { filterColumnarRowIndices, planTableQuery, CRSReprojectionError } from '@loaders.gl/core/loader-utils';
|
|
7
7
|
import { convertGeojsonToBinaryFeatureCollection } from '@loaders.gl/core/arrow-geometry/legacy-binary';
|
|
8
8
|
import { transformGeoJsonCoords } from '@loaders.gl/core/arrow-geometry/legacy-binary';
|
|
9
9
|
import { encodeWKBGeometryValue, makeWKBGeometryField, setWKBGeometryColumnMetadata } from '@loaders.gl/core/arrow-geometry/geometry-field';
|
|
10
10
|
import { makeWKBGeometryDataFromArray } from '@loaders.gl/core/arrow-geometry/wkb-arrow-utils';
|
|
11
11
|
import { convertFeaturesToGeoArrowTable } from '@loaders.gl/core/arrow-geometry/feature-table';
|
|
12
12
|
import { WKBBuilder } from '@loaders.gl/core/arrow-geometry';
|
|
13
|
-
import { convertSchemaToArrow, queryArrowTable } from '@loaders.gl/core/schema-utils';
|
|
13
|
+
import { convertArrowToTable, convertSchemaToArrow, queryArrowTable } from '@loaders.gl/core/schema-utils';
|
|
14
14
|
import { decodeFlatGeobufGeometry, FlatGeobufColumnType, getFlatGeobufGeometryBounds, getFlatGeobufCRSIdentifier, readFlatGeobufFeatures, readFlatGeobufHeader, writeFlatGeobufGeometryToWKB } from "./flatgeobuf-reader.js";
|
|
15
15
|
const GEOMETRY_COLUMN_NAME = 'geometry';
|
|
16
16
|
/** Parses a FlatGeobuf buffer through the Arrow-native decode pipeline. */
|
|
@@ -18,20 +18,13 @@ export function parseFlatGeobuf(arrayBuffer, options) {
|
|
|
18
18
|
const arrowTable = parseFlatGeobufToArrowTable(arrayBuffer, options);
|
|
19
19
|
switch (options.shape) {
|
|
20
20
|
case 'arrow':
|
|
21
|
-
return arrowTable
|
|
21
|
+
return arrowTable;
|
|
22
22
|
case 'geojson-table':
|
|
23
23
|
return makeGeoJsonTable(arrayBuffer, options);
|
|
24
24
|
case 'binary-geometry':
|
|
25
25
|
return convertGeojsonToBinaryFeatureCollection(makeGeoJsonTable(arrayBuffer, options).features);
|
|
26
26
|
case 'columnar-table':
|
|
27
|
-
return
|
|
28
|
-
shape: 'columnar-table',
|
|
29
|
-
schema: arrowTable.schema,
|
|
30
|
-
data: Object.fromEntries((arrowTable.schema?.fields || []).map(field => [
|
|
31
|
-
field.name,
|
|
32
|
-
arrowTable.data.getChild(field.name)?.toArray()
|
|
33
|
-
]))
|
|
34
|
-
};
|
|
27
|
+
return convertArrowToTable(arrowTable, 'columnar-table');
|
|
35
28
|
default:
|
|
36
29
|
throw new Error(`Unsupported FlatGeobuf output shape ${options.shape}`);
|
|
37
30
|
}
|
|
@@ -70,11 +63,7 @@ export function parseFlatGeobufToArrowTable(arrayBuffer, options = {}) {
|
|
|
70
63
|
});
|
|
71
64
|
const geometryData = makeWKBGeometryDataFromArray(geometryArray);
|
|
72
65
|
const structData = new arrow.Data(new arrow.Struct(arrowSchema.fields), 0, features.length, 0, undefined, [...propertyData, geometryData]);
|
|
73
|
-
return
|
|
74
|
-
shape: 'arrow-table',
|
|
75
|
-
schema,
|
|
76
|
-
data: new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)])
|
|
77
|
-
};
|
|
66
|
+
return new arrow.Table(arrowSchema, [new arrow.RecordBatch(arrowSchema, structData)]);
|
|
78
67
|
}
|
|
79
68
|
/** Executes a portable projection, residual predicate, and limit over FlatGeobuf features. */
|
|
80
69
|
export function queryFlatGeobufArrowTable(arrayBuffer, options = {}) {
|
|
@@ -82,28 +71,26 @@ export function queryFlatGeobufArrowTable(arrayBuffer, options = {}) {
|
|
|
82
71
|
const sourceTable = parseFlatGeobufToArrowTable(arrayBuffer, {
|
|
83
72
|
boundingBox: options.boundingBox
|
|
84
73
|
});
|
|
85
|
-
const sourceColumnNames = sourceTable.
|
|
74
|
+
const sourceColumnNames = sourceTable.schema.fields.map(field => field.name);
|
|
86
75
|
const plan = planTableQuery(sourceColumnNames, options);
|
|
87
76
|
const scanStep = plan.find(step => step.kind === 'scan');
|
|
88
77
|
const projectStep = plan.find(step => step.kind === 'project');
|
|
89
78
|
if (!scanStep || scanStep.kind !== 'scan' || !projectStep || projectStep.kind !== 'project') {
|
|
90
79
|
throw new Error('FlatGeobuf query planner produced an invalid plan.');
|
|
91
80
|
}
|
|
92
|
-
if (!sourceTable.schema)
|
|
93
|
-
throw new Error('FlatGeobuf query source is missing a schema.');
|
|
94
81
|
const predicateStep = plan.find(step => step.kind === 'filter');
|
|
95
82
|
const limitStep = plan.find(step => step.kind === 'limit');
|
|
96
|
-
return queryArrowTable(sourceTable
|
|
83
|
+
return queryArrowTable(sourceTable, {
|
|
97
84
|
predicate: predicateStep?.kind === 'filter' ? predicateStep.predicate : undefined,
|
|
98
85
|
columns: projectStep.columns,
|
|
99
86
|
limit: limitStep?.kind === 'limit' ? limitStep.limit : undefined
|
|
100
87
|
}, (predicate, columns, rowCount) => filterColumnarRowIndices(predicate, columns, rowCount));
|
|
101
88
|
}
|
|
102
|
-
/** Loads FlatGeobuf as
|
|
89
|
+
/** Loads FlatGeobuf as native Arrow record batches. */
|
|
103
90
|
export async function* parseFlatGeobufInBatches(stream, options) {
|
|
104
91
|
const arrayBuffer = await new Response(stream).arrayBuffer();
|
|
105
92
|
const table = parseFlatGeobufToArrowTable(arrayBuffer, options);
|
|
106
|
-
yield
|
|
93
|
+
yield* table.batches;
|
|
107
94
|
}
|
|
108
95
|
/** Creates the public Arrow schema from FlatGeobuf header metadata. */
|
|
109
96
|
export function makeArrowSchema(header, options) {
|