@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
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/shapefile/shp-loader.ts"],
|
|
4
|
-
"sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {Table, RecordBatch} from 'apache-arrow';\nimport
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"sourcesContent": ["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {Table, RecordBatch} from 'apache-arrow';\nimport type {Loader, LoaderWithParser, StrictLoaderOptions} from '@loaders.gl/core/loader-utils';\nimport {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';\nimport type {SHPResult} from './lib/parsers/parse-shp';\nimport {parseSHPToArrow, parseSHPToArrowInBatches} from './lib/parsers/parse-shp-to-arrow';\nimport type {SHPHeader} from './lib/parsers/parse-shp-header';\nimport type {SHPGeoArrowEncoding} from './lib/parsers/types';\nimport {SHPLoader as SHPWorkerLoaderMetadata} from './shp-loader-types';\nimport {SHPLoader as SHPLoaderMetadata} from './shp-loader-types';\nimport {\n deserializeShapefileWorkerBatch,\n deserializeShapefileWorkerResult,\n serializeShapefileWorkerBatch,\n serializeShapefileWorkerResult\n} from './lib/shapefile-worker-transport';\n\nconst {preload: _SHPWorkerLoaderPreload, ...SHPWorkerLoaderMetadataWithoutPreload} =\n SHPWorkerLoaderMetadata;\nconst {preload: _SHPLoaderPreload, ...SHPLoaderMetadataWithoutPreload} = SHPLoaderMetadata;\n\nexport const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];\n\n/** SHPLoaderWithParser */\nexport type SHPLoaderOptions = StrictLoaderOptions & {\n shp?: {\n _maxDimensions?: number;\n shape?: 'arrow' | 'wkb';\n geoarrowEncoding?: SHPGeoArrowEncoding;\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 * SHP file loader\n */\nexport const SHPWorkerLoaderWithParser = {\n ...SHPWorkerLoaderMetadataWithoutPreload\n} as const satisfies Loader<any, any, SHPLoaderOptions>;\n\n/** SHP file loader */\nexport const SHPLoaderWithParser: LoaderWithParser<\n SHPResult | Table,\n SHPHeader | (Uint8Array | null)[] | RecordBatch,\n SHPLoaderOptions\n> = {\n ...SHPLoaderMetadataWithoutPreload,\n dataType: null as unknown as SHPResult | Table,\n batchType: null as unknown as SHPHeader | (Uint8Array | null)[] | RecordBatch,\n parse: async (arrayBuffer, options?) =>\n getSHPShape(options) === 'arrow'\n ? parseSHPToArrow(arrayBuffer, options)\n : parseSHP(arrayBuffer, options),\n parseSync: (arrayBuffer, options?) =>\n getSHPShape(options) === 'arrow'\n ? parseSHPToArrow(arrayBuffer, options)\n : parseSHP(arrayBuffer, options),\n parseInBatches: (\n arrayBufferIterator:\n | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n | Iterable<ArrayBufferLike | ArrayBufferView>,\n options\n ): AsyncIterable<SHPHeader | (Uint8Array | null)[] | RecordBatch> => {\n const batchOptions =\n typeof options?.core?.batchSize === 'number'\n ? {...options, shp: {...options.shp, batchSize: options.core.batchSize}}\n : options;\n return (\n getSHPShape(batchOptions) === 'arrow'\n ? parseSHPToArrowInBatches(arrayBufferIterator, batchOptions)\n : parseSHPInBatches(arrayBufferIterator, batchOptions)\n ) as AsyncIterable<SHPHeader | (Uint8Array | null)[] | RecordBatch>;\n },\n serializeWorkerResult: serializeShapefileWorkerResult,\n deserializeWorkerResult: deserializeShapefileWorkerResult,\n serializeWorkerBatch: serializeShapefileWorkerBatch,\n deserializeWorkerBatch: deserializeShapefileWorkerBatch\n};\n\nfunction getSHPShape(options?: SHPLoaderOptions): NonNullable<SHPLoaderOptions['shp']>['shape'] {\n return options?.shp?.shape || 'arrow';\n}\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,uBAA0C;AAE1C,gCAAwD;AAGxD,8BAAmD;AACnD,IAAAA,2BAA6C;AAC7C,wCAKO;AAEP,IAAM,EAAC,SAAS,yBAAyB,GAAG,sCAAqC,IAC/E,wBAAAC;AACF,IAAM,EAAC,SAAS,mBAAmB,GAAG,gCAA+B,IAAI,yBAAAC;AAElE,IAAM,mBAAmB,CAAC,GAAM,GAAM,IAAM,EAAI;AAiBhD,IAAM,4BAA4B;AAAA,EACvC,GAAG;AACL;AAGO,IAAM,sBAIT;AAAA,EACF,GAAG;AAAA,EACH,UAAU;AAAA,EACV,WAAW;AAAA,EACX,OAAO,OAAO,aAAa,YACzB,YAAY,OAAO,MAAM,cACrB,2CAAgB,aAAa,OAAO,QACpC,2BAAS,aAAa,OAAO;AAAA,EACnC,WAAW,CAAC,aAAa,YACvB,YAAY,OAAO,MAAM,cACrB,2CAAgB,aAAa,OAAO,QACpC,2BAAS,aAAa,OAAO;AAAA,EACnC,gBAAgB,CACd,qBAGA,YACmE;AACnE,UAAM,eACJ,OAAO,SAAS,MAAM,cAAc,WAChC,EAAC,GAAG,SAAS,KAAK,EAAC,GAAG,QAAQ,KAAK,WAAW,QAAQ,KAAK,UAAS,EAAC,IACrE;AACN,WACE,YAAY,YAAY,MAAM,cAC1B,oDAAyB,qBAAqB,YAAY,QAC1D,oCAAkB,qBAAqB,YAAY;AAAA,EAE3D;AAAA,EACA,uBAAuB;AAAA,EACvB,yBAAyB;AAAA,EACzB,sBAAsB;AAAA,EACtB,wBAAwB;AAC1B;AAEA,SAAS,YAAY,SAA2E;AAC9F,SAAO,SAAS,KAAK,SAAS;AAChC;",
|
|
6
6
|
"names": ["import_shp_loader_types", "SHPWorkerLoaderMetadata", "SHPLoaderMetadata"]
|
|
7
7
|
}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import type { Table, RecordBatch } from 'apache-arrow';
|
|
2
2
|
import type { Loader, LoaderWithParser, StrictLoaderOptions } from '@loaders.gl/core/loader-utils';
|
|
3
|
-
import type { ArrowTable, ArrowTableBatch } from '@loaders.gl/core/schema';
|
|
4
3
|
import type { SHPResult } from "./lib/parsers/parse-shp.js";
|
|
5
4
|
import type { SHPHeader } from "./lib/parsers/parse-shp-header.js";
|
|
6
5
|
import type { SHPGeoArrowEncoding } from "./lib/parsers/types.js";
|
|
7
|
-
import { serializeShapefileWorkerResult } from "./lib/shapefile-worker-transport.js";
|
|
8
6
|
export declare const SHP_MAGIC_NUMBER: number[];
|
|
9
7
|
/** SHPLoaderWithParser */
|
|
10
8
|
export type SHPLoaderOptions = StrictLoaderOptions & {
|
|
@@ -127,117 +125,5 @@ export declare const SHPWorkerLoaderWithParser: {
|
|
|
127
125
|
readonly testText?: (string: string) => boolean;
|
|
128
126
|
};
|
|
129
127
|
/** SHP file loader */
|
|
130
|
-
export declare const
|
|
131
|
-
/** Exposes native Arrow output after parsing or worker hydration. */
|
|
132
|
-
export declare const SHPLoaderWithParser: {
|
|
133
|
-
readonly serializeWorkerResult: typeof serializeShapefileWorkerResult;
|
|
134
|
-
readonly serializeWorkerBatch: typeof serializeShapefileWorkerResult;
|
|
135
|
-
readonly dataType: SHPResult | Table;
|
|
136
|
-
readonly batchType: SHPHeader | (Uint8Array | null)[] | RecordBatch;
|
|
137
|
-
readonly parse: (input: ArrayBuffer, options: SHPLoaderOptions | undefined, context: import("@loaders.gl/core/loader-utils").LoaderContext | undefined) => Promise<Table<any> | SHPResult>;
|
|
138
|
-
readonly parseSync: (input: ArrayBuffer, options: SHPLoaderOptions | undefined, context: import("@loaders.gl/core/loader-utils").LoaderContext | undefined) => Table<any> | SHPResult;
|
|
139
|
-
readonly parseInBatches: (input: AsyncIterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>> | Iterable<ArrayBufferLike | ArrayBufferView<ArrayBufferLike>>, options: SHPLoaderOptions | undefined, context: import("@loaders.gl/core/loader-utils").LoaderContext | undefined) => AsyncGenerator<RecordBatch<any> | SHPHeader | (Uint8Array<ArrayBufferLike> | null)[], void, unknown>;
|
|
140
|
-
readonly deserializeWorkerResult: (result: unknown) => Table<any>;
|
|
141
|
-
readonly deserializeWorkerBatch: (result: unknown) => RecordBatch<any> | SHPHeader | (Uint8Array<ArrayBufferLike> | null)[];
|
|
142
|
-
readonly name: string;
|
|
143
|
-
readonly id: string;
|
|
144
|
-
readonly module: string;
|
|
145
|
-
readonly category?: string;
|
|
146
|
-
readonly encoding?: import("@loaders.gl/core/loader-utils").FormatEncoding;
|
|
147
|
-
readonly format?: string;
|
|
148
|
-
readonly extensions: string[];
|
|
149
|
-
readonly mimeTypes: string[];
|
|
150
|
-
readonly queryPushdownCapabilityHints?: import("@loaders.gl/core/loader-utils").QueryPushdownCapabilityHints;
|
|
151
|
-
readonly binary?: boolean;
|
|
152
|
-
readonly text?: boolean;
|
|
153
|
-
readonly tests?: ((string | ArrayBuffer | ((ArrayBuffer: ArrayBuffer) => boolean))[] & (string | ArrayBuffer | ((ArrayBuffer: ArrayBuffer) => boolean))[]) | undefined;
|
|
154
|
-
readonly type?: string;
|
|
155
|
-
readonly fromUrl?: boolean;
|
|
156
|
-
readonly fromBlob?: boolean;
|
|
157
|
-
readonly testURL?: (url: string) => boolean;
|
|
158
|
-
readonly testData?: (data: Blob) => boolean;
|
|
159
|
-
readonly createDataSourceSync?: ((data: any, options: Pick<import("@loaders.gl/core/worker-utils").WorkerOptions, "onProgress" | "signal"> & {
|
|
160
|
-
[loaderId: string]: Record<string, unknown> | AbortSignal | ((progress: import("@loaders.gl/core/worker-utils").WorkerProgress) => void) | undefined;
|
|
161
|
-
_scan?: import("@loaders.gl/core/loader-utils").QueryOptions;
|
|
162
|
-
searchParams?: import("@loaders.gl/core/loader-utils").SearchParams;
|
|
163
|
-
core?: {
|
|
164
|
-
baseUrl?: string;
|
|
165
|
-
fetch?: typeof fetch | import("@loaders.gl/core/loader-utils").FetchLike | RequestInit | null;
|
|
166
|
-
credentials?: readonly import("@loaders.gl/core/loader-utils").Credential[];
|
|
167
|
-
authentications?: readonly import("@loaders.gl/core/loader-utils").AuthenticationConstructor[];
|
|
168
|
-
nothrow?: boolean;
|
|
169
|
-
shape?: string;
|
|
170
|
-
mimeType?: string;
|
|
171
|
-
fallbackMimeType?: string;
|
|
172
|
-
ignoreRegisteredLoaders?: boolean;
|
|
173
|
-
log?: import("probe.gl/log").Logger | null;
|
|
174
|
-
batchSize?: number | "auto";
|
|
175
|
-
batchMaxRowsPerSecond?: number;
|
|
176
|
-
metadata?: boolean;
|
|
177
|
-
transforms?: import("@loaders.gl/core/loader-utils").TransformBatches[];
|
|
178
|
-
subloaders?: Readonly<Record<string, Loader>>;
|
|
179
|
-
useLocalLibraries?: boolean;
|
|
180
|
-
CDN?: string | null;
|
|
181
|
-
worker?: boolean | "auto";
|
|
182
|
-
workerInBatches?: boolean;
|
|
183
|
-
workerThreshold?: number;
|
|
184
|
-
maxConcurrency?: number;
|
|
185
|
-
maxMobileConcurrency?: number;
|
|
186
|
-
reuseWorkers?: boolean;
|
|
187
|
-
workerTransferBufferCopy?: "none" | "sliced" | "all";
|
|
188
|
-
_nodeWorkers?: boolean;
|
|
189
|
-
_workerType?: string;
|
|
190
|
-
};
|
|
191
|
-
modules?: Record<string, unknown>;
|
|
192
|
-
} & {
|
|
193
|
-
geoarrow?: {
|
|
194
|
-
encodingPreference?: import("@loaders.gl/core/schema").GeoArrowEncodingPreference;
|
|
195
|
-
};
|
|
196
|
-
shp?: {
|
|
197
|
-
_maxDimensions?: number;
|
|
198
|
-
shape?: "arrow" | "wkb";
|
|
199
|
-
geoarrowEncoding?: SHPGeoArrowEncoding;
|
|
200
|
-
geoarrow?: {
|
|
201
|
-
encodingPreference?: import("@loaders.gl/core/schema").GeoArrowEncodingPreference;
|
|
202
|
-
};
|
|
203
|
-
batchSize?: number;
|
|
204
|
-
workerUrl?: string;
|
|
205
|
-
};
|
|
206
|
-
} & {
|
|
207
|
-
loadOptions?: never;
|
|
208
|
-
core?: StrictLoaderOptions["core"] & {
|
|
209
|
-
type?: string;
|
|
210
|
-
name?: string;
|
|
211
|
-
attributions?: string[];
|
|
212
|
-
loadOptions?: never;
|
|
213
|
-
loaders?: Loader[];
|
|
214
|
-
onError?: (error: Error, source: import("@loaders.gl/core/loader-utils").DataSource<any, any>) => void;
|
|
215
|
-
};
|
|
216
|
-
}, coreApi?: Readonly<{
|
|
217
|
-
fetchFile: (urlOrData: string | Blob, fetchOptions?: RequestInit) => Promise<Response>;
|
|
218
|
-
parse: (data: import("@loaders.gl/core/loader-utils").DataType | Promise<import("@loaders.gl/core/loader-utils").DataType>, loaders?: Loader | Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions, options?: import("@loaders.gl/core/loader-utils").LoaderOptions, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => Promise<unknown>;
|
|
219
|
-
parseFile: (file: import("@loaders.gl/core/loader-utils").ReadableFile, loaders?: Loader | Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions, options?: import("@loaders.gl/core/loader-utils").LoaderOptions, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => Promise<unknown>;
|
|
220
|
-
parseSync: (data: import("@loaders.gl/core/loader-utils").SyncDataType, loaders?: Loader | Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions, options?: import("@loaders.gl/core/loader-utils").LoaderOptions, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => unknown;
|
|
221
|
-
parseInBatches: (data: import("@loaders.gl/core/loader-utils").BatchableDataType, loaders?: Loader | Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions, options?: import("@loaders.gl/core/loader-utils").LoaderOptions, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => Promise<AsyncIterable<unknown> | Iterable<unknown>>;
|
|
222
|
-
load: (url: string | import("@loaders.gl/core/loader-utils").DataType, loaders?: Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions | Loader, options?: import("@loaders.gl/core/loader-utils").LoaderOptions | import("@loaders.gl/core/loader-utils").LoaderContext, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => Promise<unknown>;
|
|
223
|
-
loadInBatches: (files: string | File | Blob | Response | (string | File | Blob | Response)[] | FileList, loaders?: Loader[] | import("@loaders.gl/core/loader-utils").LoaderOptions | Loader, options?: import("@loaders.gl/core/loader-utils").LoaderOptions, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => Promise<AsyncIterable<unknown>> | Promise<AsyncIterable<unknown>>[];
|
|
224
|
-
}> | undefined) => unknown) | undefined;
|
|
225
|
-
readonly subloaders?: Readonly<Record<string, Loader>>;
|
|
226
|
-
readonly defaultShape?: string;
|
|
227
|
-
readonly supportsNativeArrow?: boolean;
|
|
228
|
-
readonly options: import("./shp-loader-types").SHPLoaderOptions;
|
|
229
|
-
readonly deprecatedOptions?: Record<string, string | Record<string, string>>;
|
|
230
|
-
readonly version: string;
|
|
231
|
-
readonly worker?: string | boolean;
|
|
232
|
-
readonly workerInBatches?: boolean;
|
|
233
|
-
readonly workerFile?: string;
|
|
234
|
-
readonly workerNode?: string;
|
|
235
|
-
readonly workerSourceNode?: string;
|
|
236
|
-
readonly loadWorker?: import("@loaders.gl/core/worker-utils").LoadWorker;
|
|
237
|
-
readonly getAuthentications?: (url: string, options: import("@loaders.gl/core/loader-utils").LoaderOptions) => readonly import("@loaders.gl/core/loader-utils").AuthenticationConstructor[] | Promise<readonly import("@loaders.gl/core/loader-utils").AuthenticationConstructor[]>;
|
|
238
|
-
readonly serializeWorkerOptions?: ((options: import("./shp-loader-types").SHPLoaderOptions) => import("@loaders.gl/core/loader-utils").LoaderOptions) | undefined;
|
|
239
|
-
readonly getWorkerEstimate?: ((data: import("@loaders.gl/core/loader-utils").DataType, options?: import("./shp-loader-types").SHPLoaderOptions | undefined, context?: import("@loaders.gl/core/loader-utils").LoaderContext) => number | undefined) | undefined;
|
|
240
|
-
readonly supported?: boolean;
|
|
241
|
-
readonly testText?: (string: string) => boolean;
|
|
242
|
-
};
|
|
128
|
+
export declare const SHPLoaderWithParser: LoaderWithParser<SHPResult | Table, SHPHeader | (Uint8Array | null)[] | RecordBatch, SHPLoaderOptions>;
|
|
243
129
|
//# sourceMappingURL=shp-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shp-loader.d.ts","sourceRoot":"","sources":["../../src/shapefile/shp-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,KAAK,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"shp-loader.d.ts","sourceRoot":"","sources":["../../src/shapefile/shp-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,KAAK,EAAE,WAAW,EAAC,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;AAEjG,OAAO,KAAK,EAAC,SAAS,EAAC,mCAAgC;AAEvD,OAAO,KAAK,EAAC,SAAS,EAAC,0CAAuC;AAC9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,+BAA4B;AAc7D,eAAO,MAAM,gBAAgB,UAA2B,CAAC;AAEzD,0BAA0B;AAC1B,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,GAAG,CAAC,EAAE;QACJ,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,OAAO,GAAG,KAAK,CAAC;QACxB,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;QACvC,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;mBAjBX,CAAC;iBAGP,CAAC;uBAKjB,CAAC;2BAOL,CAAA;mBAG2B,CAAC;iBAKrB,CAAC;oBAIH,CAAC;4BAEgC,CAAC;mCAEd,CAAC;eAEF,CAAC;qBAGE,CAAC;iCAIK,CAAC;oBACU,CAAC;sBAEiB,CAAC;sBAGG,CAAC;6BAKjD,CAAC;eACJ,CAAC;kBAGZ,CAAC;2BAKM,CAAC;2BACF,CAAC;0BAEiE,CAAC;gCAAkH,CAAC;wBAA8G,CAAC;oCAAoI,CAAC;wBAAoH,CAAC;uBAA+E,CAAC;;;;;8BAvEtnB,CAAC;;;0BAC0B,CAAC;iBACd,CAAC;4BAEL,CAAC;oBACO,CAAC;kCACN,CAAC;;qBAA4C,CAAC;qBAI9C,CAAC;;;;;gBAf4B,CAAC;gBAGlC,CAAC;wBAIP,CAAC;uBAGN,CAAA;mBACiE,CAAC;mBAI3C,CAAC;;;0DAOmD,CAAC;2IAQnD,CAAC,oFACC,CAAC,gEACnB,CAAC;uFAGC,CAAA,oFACR,CAAC,gEACG,CAAC;uFAGK,CAAC,oFACM,CAAC,gEAAwB,CAAC;iGAE9C,CAAF,oFACI,CAAD,gEAAwB,CAAC;sFAGR,CAAC,oFACI,CAAC,wHACG,CAAC;wHAIuB,CAAC,oFACb,CAAC,gEAExC,CAAA;;;;;;;;;;;;;;;;;;;;;;;CAxBqD,CAAC;AAExD,sBAAsB;AACtB,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAChD,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,GAAG,WAAW,EAC/C,gBAAgB,CAiCjB,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { makeArrowMetadataBatch } from '@loaders.gl/core/schema-utils';
|
|
5
4
|
import { parseSHP, parseSHPInBatches } from "./lib/parsers/parse-shp.js";
|
|
6
5
|
import { parseSHPToArrow, parseSHPToArrowInBatches } from "./lib/parsers/parse-shp-to-arrow.js";
|
|
7
6
|
import { SHPLoader as SHPWorkerLoaderMetadata } from "./shp-loader-types.js";
|
|
@@ -17,7 +16,7 @@ export const SHPWorkerLoaderWithParser = {
|
|
|
17
16
|
...SHPWorkerLoaderMetadataWithoutPreload
|
|
18
17
|
};
|
|
19
18
|
/** SHP file loader */
|
|
20
|
-
export const
|
|
19
|
+
export const SHPLoaderWithParser = {
|
|
21
20
|
...SHPLoaderMetadataWithoutPreload,
|
|
22
21
|
dataType: null,
|
|
23
22
|
batchType: null,
|
|
@@ -43,50 +42,4 @@ export const SHPColumnLoader = {
|
|
|
43
42
|
function getSHPShape(options) {
|
|
44
43
|
return options?.shp?.shape || 'arrow';
|
|
45
44
|
}
|
|
46
|
-
/** Exposes native Arrow output after parsing or worker hydration. */
|
|
47
|
-
export const SHPLoaderWithParser = {
|
|
48
|
-
...SHPLoaderMetadataWithoutPreload,
|
|
49
|
-
serializeWorkerResult: serializeShapefileWorkerResult,
|
|
50
|
-
serializeWorkerBatch: serializeShapefileWorkerBatch,
|
|
51
|
-
dataType: null,
|
|
52
|
-
batchType: null,
|
|
53
|
-
async parse(input, options, context) {
|
|
54
|
-
return unwrapSHPTable(await SHPColumnLoader.parse(input, options, context));
|
|
55
|
-
},
|
|
56
|
-
parseSync(input, options, context) {
|
|
57
|
-
return unwrapSHPTable(SHPColumnLoader.parseSync(input, options, context));
|
|
58
|
-
},
|
|
59
|
-
async *parseInBatches(input, options, context) {
|
|
60
|
-
for await (const batch of SHPColumnLoader.parseInBatches(input, options, context)) {
|
|
61
|
-
if (isSHPArrowTable(batch)) {
|
|
62
|
-
const table = unwrapSHPTable(batch);
|
|
63
|
-
if (table.batches.length)
|
|
64
|
-
yield* table.batches;
|
|
65
|
-
else
|
|
66
|
-
yield makeArrowMetadataBatch(table.schema);
|
|
67
|
-
}
|
|
68
|
-
else
|
|
69
|
-
yield batch;
|
|
70
|
-
}
|
|
71
|
-
},
|
|
72
|
-
deserializeWorkerResult(result) {
|
|
73
|
-
return unwrapSHPTable(deserializeShapefileWorkerResult(result));
|
|
74
|
-
},
|
|
75
|
-
deserializeWorkerBatch(result) {
|
|
76
|
-
const batch = deserializeShapefileWorkerBatch(result);
|
|
77
|
-
if (!isSHPArrowTable(batch))
|
|
78
|
-
return batch;
|
|
79
|
-
const table = unwrapSHPTable(batch);
|
|
80
|
-
return table.batches[0] ?? makeArrowMetadataBatch(table.schema);
|
|
81
|
-
}
|
|
82
|
-
};
|
|
83
|
-
/** Identifies Arrow output from the private column parser. */
|
|
84
|
-
function isSHPArrowTable(result) {
|
|
85
|
-
return result?.shape === 'arrow-table';
|
|
86
|
-
}
|
|
87
|
-
function unwrapSHPTable(result) {
|
|
88
|
-
if (!isSHPArrowTable(result))
|
|
89
|
-
return result;
|
|
90
|
-
return result.data;
|
|
91
|
-
}
|
|
92
45
|
//# sourceMappingURL=shp-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shp-loader.js","sourceRoot":"","sources":["../../src/shapefile/shp-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;
|
|
1
|
+
{"version":3,"file":"shp-loader.js","sourceRoot":"","sources":["../../src/shapefile/shp-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,QAAQ,EAAE,iBAAiB,EAAC,mCAAgC;AAEpE,OAAO,EAAC,eAAe,EAAE,wBAAwB,EAAC,4CAAyC;AAG3F,OAAO,EAAC,SAAS,IAAI,uBAAuB,EAAC,8BAA2B;AACxE,OAAO,EAAC,SAAS,IAAI,iBAAiB,EAAC,8BAA2B;AAClE,OAAO,EACL,+BAA+B,EAC/B,gCAAgC,EAChC,6BAA6B,EAC7B,8BAA8B,EAC/B,4CAAyC;AAE1C,MAAM,EAAC,OAAO,EAAE,uBAAuB,EAAE,GAAG,qCAAqC,EAAC,GAChF,uBAAuB,CAAC;AAC1B,MAAM,EAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,+BAA+B,EAAC,GAAG,iBAAiB,CAAC;AAE3F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAczD;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,GAAG,qCAAqC;CACa,CAAC;AAExD,sBAAsB;AACtB,MAAM,CAAC,MAAM,mBAAmB,GAI5B;IACF,GAAG,+BAA+B;IAClC,QAAQ,EAAE,IAAoC;IAC9C,SAAS,EAAE,IAAkE;IAC7E,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAQ,EAAE,EAAE,CACrC,WAAW,CAAC,OAAO,CAAC,KAAK,OAAO;QAC9B,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC;QACvC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IACpC,SAAS,EAAE,CAAC,WAAW,EAAE,OAAQ,EAAE,EAAE,CACnC,WAAW,CAAC,OAAO,CAAC,KAAK,OAAO;QAC9B,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC;QACvC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IACpC,cAAc,EAAE,CACd,mBAE+C,EAC/C,OAAO,EACyD,EAAE;QAClE,MAAM,YAAY,GAChB,OAAO,OAAO,EAAE,IAAI,EAAE,SAAS,KAAK,QAAQ;YAC1C,CAAC,CAAC,EAAC,GAAG,OAAO,EAAE,GAAG,EAAE,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAC,EAAC;YACxE,CAAC,CAAC,OAAO,CAAC;QACd,OAAO,CACL,WAAW,CAAC,YAAY,CAAC,KAAK,OAAO;YACnC,CAAC,CAAC,wBAAwB,CAAC,mBAAmB,EAAE,YAAY,CAAC;YAC7D,CAAC,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,YAAY,CAAC,CACS,CAAC;IACtE,CAAC;IACD,qBAAqB,EAAE,8BAA8B;IACrD,uBAAuB,EAAE,gCAAgC;IACzD,oBAAoB,EAAE,6BAA6B;IACnD,sBAAsB,EAAE,+BAA+B;CACxD,CAAC;AAEF,SAAS,WAAW,CAAC,OAA0B;IAC7C,OAAO,OAAO,EAAE,GAAG,EAAE,KAAK,IAAI,OAAO,CAAC;AACxC,CAAC"}
|
|
@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
30
30
|
// src/shapefile-arrow-loader.ts
|
|
31
31
|
var shapefile_arrow_loader_exports = {};
|
|
32
32
|
__export(shapefile_arrow_loader_exports, {
|
|
33
|
+
SHAPEFILE_HEADER_KEY: () => SHAPEFILE_HEADER_KEY,
|
|
33
34
|
parseShapefileToArrow: () => parseShapefileToArrow,
|
|
34
35
|
parseShapefileToArrowInBatches: () => parseShapefileToArrowInBatches
|
|
35
36
|
});
|
|
@@ -79,7 +80,7 @@ async function parseShapefileToArrow(arrayBuffer, options, context) {
|
|
|
79
80
|
transform
|
|
80
81
|
);
|
|
81
82
|
if (options?.geoarrow?.encodingPreference === "geoarrow.geometry" || options?.shapefile?.geoarrow?.encodingPreference === "geoarrow.geometry") {
|
|
82
|
-
const geometryColumn = geometryTable.
|
|
83
|
+
const geometryColumn = geometryTable.getChild(GEOMETRY_COLUMN_NAME);
|
|
83
84
|
const geometries = geometryColumn?.toArray() || [];
|
|
84
85
|
geometryTable = (0, import_feature_table.convertFeaturesToGeoArrowTable)(
|
|
85
86
|
geometries.map((geometry) => ({
|
|
@@ -109,11 +110,18 @@ async function parseShapefileToArrow(arrayBuffer, options, context) {
|
|
|
109
110
|
context
|
|
110
111
|
);
|
|
111
112
|
propertySchema = (0, import_schema_utils.convertArrowToSchema)(propertyData.schema);
|
|
112
|
-
propertyTable =
|
|
113
|
+
propertyTable = propertyData;
|
|
113
114
|
}
|
|
114
|
-
const schema = buildOutputSchema(
|
|
115
|
+
const schema = buildOutputSchema(
|
|
116
|
+
propertySchema,
|
|
117
|
+
header,
|
|
118
|
+
(0, import_schema_utils.convertArrowToSchema)(geometryTable.schema)
|
|
119
|
+
);
|
|
115
120
|
const table = propertyTable ? appendGeometryColumnToArrowTable(propertyTable, geometryTable, schema) : geometryTable;
|
|
116
|
-
|
|
121
|
+
const encoded = encodeShapefileHeader({ header, encoding: cpg, prj, shx });
|
|
122
|
+
table.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);
|
|
123
|
+
for (const batch of table.batches) batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);
|
|
124
|
+
return table;
|
|
117
125
|
}
|
|
118
126
|
async function* parseShapefileToArrowInBatches(asyncIterator, options, context) {
|
|
119
127
|
if (getTypedGeoArrowEncoding(options)) {
|
|
@@ -141,6 +149,7 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
141
149
|
const shapeIterator = getAsyncIterator(shapeIterable);
|
|
142
150
|
const shapeHeader = await getNextNonMetadataValue(shapeIterator);
|
|
143
151
|
const header = shapeHeader;
|
|
152
|
+
const encodedHeader = encodeShapefileHeader({ header, encoding: cpg, prj, shx });
|
|
144
153
|
let propertyIterator = null;
|
|
145
154
|
let propertySchema = null;
|
|
146
155
|
const dbfResponse = context?.url ? await context.fetch((0, import_parse_shapefile.replaceExtension)(context.url, "dbf")).catch(() => null) : null;
|
|
@@ -162,13 +171,13 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
162
171
|
);
|
|
163
172
|
propertyIterator = getAsyncIterator(propertyIterable);
|
|
164
173
|
const firstPropertyBatch = await getNextArrowBatch(propertyIterator);
|
|
165
|
-
propertySchema = firstPropertyBatch
|
|
174
|
+
propertySchema = firstPropertyBatch ? (0, import_schema_utils.convertArrowToSchema)(firstPropertyBatch.schema) : null;
|
|
166
175
|
const outputSchema2 = buildOutputSchema(propertySchema, header);
|
|
167
176
|
const propertyQueue = [];
|
|
168
177
|
const geometryQueue = [];
|
|
169
178
|
let yieldedDataBatch2 = false;
|
|
170
|
-
if (firstPropertyBatch && firstPropertyBatch.
|
|
171
|
-
propertyQueue.push(firstPropertyBatch.
|
|
179
|
+
if (firstPropertyBatch && firstPropertyBatch.numRows > 0) {
|
|
180
|
+
propertyQueue.push(new arrow.Table(firstPropertyBatch.schema, [firstPropertyBatch]));
|
|
172
181
|
}
|
|
173
182
|
let shapeDone = false;
|
|
174
183
|
let propertyDone = false;
|
|
@@ -180,7 +189,7 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
180
189
|
} else if (shapeBatch.value?.batchType !== "metadata") {
|
|
181
190
|
const transform = getReprojectionTransform(prj, options);
|
|
182
191
|
geometryQueue.push(
|
|
183
|
-
makeGeometryArrowTable(shapeBatch.value, header, transform)
|
|
192
|
+
makeGeometryArrowTable(shapeBatch.value, header, transform)
|
|
184
193
|
);
|
|
185
194
|
}
|
|
186
195
|
}
|
|
@@ -188,8 +197,8 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
188
197
|
const propertyBatch = await getNextArrowBatch(propertyIterator);
|
|
189
198
|
if (!propertyBatch) {
|
|
190
199
|
propertyDone = true;
|
|
191
|
-
} else if (propertyBatch.
|
|
192
|
-
propertyQueue.push(propertyBatch.
|
|
200
|
+
} else if (propertyBatch.numRows > 0) {
|
|
201
|
+
propertyQueue.push(new arrow.Table(propertyBatch.schema, [propertyBatch]));
|
|
193
202
|
}
|
|
194
203
|
}
|
|
195
204
|
const rowCount = Math.min(getQueuedRowCount(geometryQueue), getQueuedRowCount(propertyQueue));
|
|
@@ -201,16 +210,14 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
201
210
|
}
|
|
202
211
|
const propertyTable = takeRowsFromQueue(propertyQueue, rowCount);
|
|
203
212
|
const geometryTable = takeRowsFromQueue(geometryQueue, rowCount);
|
|
204
|
-
const batch = appendGeometryColumnToArrowTable(
|
|
205
|
-
{ shape: "arrow-table", schema: propertySchema || void 0, data: propertyTable },
|
|
206
|
-
{ shape: "arrow-table", data: geometryTable },
|
|
207
|
-
outputSchema2
|
|
208
|
-
);
|
|
213
|
+
const batch = appendGeometryColumnToArrowTable(propertyTable, geometryTable, outputSchema2);
|
|
209
214
|
yieldedDataBatch2 = true;
|
|
210
|
-
|
|
215
|
+
const recordBatch = batch.batches[0];
|
|
216
|
+
recordBatch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);
|
|
217
|
+
yield recordBatch;
|
|
211
218
|
}
|
|
212
219
|
if (!yieldedDataBatch2) {
|
|
213
|
-
yield
|
|
220
|
+
yield makeEmptyArrowBatch(outputSchema2, encodedHeader);
|
|
214
221
|
}
|
|
215
222
|
return;
|
|
216
223
|
}
|
|
@@ -231,13 +238,13 @@ async function* parseShapefileToArrowInBatches(asyncIterator, options, context)
|
|
|
231
238
|
transform
|
|
232
239
|
);
|
|
233
240
|
yieldedDataBatch = true;
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
}
|
|
241
|
+
for (const batch of arrowTable.batches) {
|
|
242
|
+
batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);
|
|
243
|
+
yield batch;
|
|
244
|
+
}
|
|
238
245
|
}
|
|
239
246
|
if (!yieldedDataBatch) {
|
|
240
|
-
yield
|
|
247
|
+
yield makeEmptyArrowBatch(outputSchema, encodedHeader);
|
|
241
248
|
}
|
|
242
249
|
}
|
|
243
250
|
function buildOutputSchema(propertySchema, header, geometrySchema) {
|
|
@@ -262,19 +269,15 @@ function makeGeometryArrowTable(geometries, header, transform) {
|
|
|
262
269
|
return (0, import_build_wkb_geometry_arrow.makeWKBGeometryArrowTable)(geometries, geometrySchema, transform);
|
|
263
270
|
}
|
|
264
271
|
function appendGeometryColumnToArrowTable(propertyTable, geometryTable, schema) {
|
|
265
|
-
const propertyBatch = propertyTable.
|
|
266
|
-
const geometryBatch = geometryTable.
|
|
272
|
+
const propertyBatch = propertyTable.batches[0];
|
|
273
|
+
const geometryBatch = geometryTable.batches[0];
|
|
267
274
|
const arrowSchema = (0, import_schema_utils2.convertSchemaToArrow)(schema);
|
|
268
275
|
const structField = new arrow.Struct(arrowSchema.fields);
|
|
269
276
|
const children = [...propertyBatch.data.children, geometryBatch.data.children[0]];
|
|
270
|
-
const rowCount = Math.max(propertyTable.
|
|
277
|
+
const rowCount = Math.max(propertyTable.numRows, geometryTable.numRows);
|
|
271
278
|
const structData = new arrow.Data(structField, 0, rowCount, 0, void 0, children);
|
|
272
279
|
const recordBatch = new arrow.RecordBatch(arrowSchema, structData);
|
|
273
|
-
return
|
|
274
|
-
shape: "arrow-table",
|
|
275
|
-
schema,
|
|
276
|
-
data: new arrow.Table(arrowSchema, [recordBatch])
|
|
277
|
-
};
|
|
280
|
+
return new arrow.Table(arrowSchema, [recordBatch]);
|
|
278
281
|
}
|
|
279
282
|
function getReprojectionTransform(sourceCrs, options) {
|
|
280
283
|
const { reproject = false, targetCrs = "WGS84" } = options?.gis || {};
|
|
@@ -352,21 +355,11 @@ async function getNextNonMetadataValue(iterator) {
|
|
|
352
355
|
async function getNextArrowBatch(iterator) {
|
|
353
356
|
while (true) {
|
|
354
357
|
const result = await iterator.next();
|
|
355
|
-
if (result.done)
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
const recordBatch = result.value;
|
|
360
|
-
const schema = (0, import_schema_utils.convertArrowToSchema)(recordBatch.schema);
|
|
361
|
-
const batch = Object.getPrototypeOf(recordBatch) === arrow.RecordBatch.prototype ? recordBatch : importDBFRecordBatch(recordBatch, schema);
|
|
362
|
-
const data = new arrow.Table(batch.schema, [batch]);
|
|
363
|
-
return (0, import_loader_utils2.makeTableScanBatch)({
|
|
364
|
-
shape: "arrow-table",
|
|
365
|
-
schema,
|
|
366
|
-
data
|
|
367
|
-
});
|
|
358
|
+
if (result.done) return null;
|
|
359
|
+
if ((0, import_schema_utils.isArrowRecordBatch)(result.value)) {
|
|
360
|
+
const batch = result.value;
|
|
361
|
+
return Object.getPrototypeOf(batch) === arrow.RecordBatch.prototype ? batch : importDBFRecordBatch(batch, (0, import_schema_utils.convertArrowToSchema)(batch.schema));
|
|
368
362
|
}
|
|
369
|
-
if (result.value?.shape === "arrow-table") return result.value;
|
|
370
363
|
}
|
|
371
364
|
}
|
|
372
365
|
function importDBFRecordBatch(batch, tableSchema) {
|
|
@@ -400,15 +393,27 @@ function takeRowsFromQueue(queue, rowCount) {
|
|
|
400
393
|
return table;
|
|
401
394
|
}
|
|
402
395
|
const result = table.slice(0, rowCount);
|
|
403
|
-
queue[0] = table.slice(rowCount
|
|
396
|
+
queue[0] = table.slice(rowCount);
|
|
404
397
|
return result;
|
|
405
398
|
}
|
|
406
|
-
function makeEmptyArrowBatch(schema) {
|
|
407
|
-
const
|
|
408
|
-
|
|
399
|
+
function makeEmptyArrowBatch(schema, header) {
|
|
400
|
+
const nativeSchema = (0, import_schema_utils2.convertSchemaToArrow)(schema);
|
|
401
|
+
nativeSchema.metadata.set(SHAPEFILE_HEADER_KEY, header);
|
|
402
|
+
return (0, import_schema_utils2.makeArrowMetadataBatch)(nativeSchema);
|
|
403
|
+
}
|
|
404
|
+
var SHAPEFILE_HEADER_KEY = "loaders.gl.shapefile.header";
|
|
405
|
+
function encodeShapefileHeader({
|
|
406
|
+
shx,
|
|
407
|
+
...header
|
|
408
|
+
}) {
|
|
409
|
+
return JSON.stringify({
|
|
410
|
+
...header,
|
|
411
|
+
...shx ? { shx: { offsets: Array.from(shx.offsets), lengths: Array.from(shx.lengths) } } : {}
|
|
412
|
+
});
|
|
409
413
|
}
|
|
410
414
|
// Annotate the CommonJS export names for ESM import in node:
|
|
411
415
|
0 && (module.exports = {
|
|
416
|
+
SHAPEFILE_HEADER_KEY,
|
|
412
417
|
parseShapefileToArrow,
|
|
413
418
|
parseShapefileToArrowInBatches
|
|
414
419
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/shapefile-arrow-loader.ts", "../src/shapefile/shapefile-arrow-loader.ts"],
|
|
4
|
-
"sourcesContent": ["export * from './shapefile/shapefile-arrow-loader.js';\n", "// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {CRSReprojectionError, type LoaderContext} from '@loaders.gl/core/loader-utils';\nimport {\n makeTableScanBatch,\n parseFromContext,\n parseInBatchesFromContext,\n toArrayBufferIterator\n} from '@loaders.gl/core/loader-utils';\nimport * as arrow from 'apache-arrow';\nimport {convertArrowToSchema, isNativeArrowRecordBatch} from '@loaders.gl/core/schema-utils';\nimport type {\n ArrowTable,\n ArrowTableBatch,\n Field,\n Schema as TableSchema\n} from '@loaders.gl/core/schema';\nimport {ArrowTableBuilder, convertSchemaToArrow} from '@loaders.gl/core/schema-utils';\nimport {convertFeaturesToGeoArrowTable} from '@loaders.gl/core/arrow-geometry/feature-table';\nimport {convertWKBToGeometry} from '@loaders.gl/core/arrow-geometry/geometry-codecs';\nimport {type GeoParquetGeometryType} from '@loaders.gl/core/schema';\nimport {\n makeWKBGeometryField,\n setWKBGeometryColumnMetadata\n} from '@loaders.gl/core/arrow-geometry/geometry-field';\nimport {projectionEngine} from '@math.gl/geospatial/projection';\nimport type {ReadonlyCRSDefinition, WKTCRSDefinition} from '@math.gl/geospatial/crs';\nimport {SHPLoaderWithParser} from './shp-loader';\nimport {DBFLoaderWithParser} from './dbf-loader';\nimport type {ShapefileLoaderOptions} from './shapefile-loader-types';\nimport type {SHPResult} from './lib/parsers/parse-shp';\nimport type {SHPHeader} from './lib/parsers/parse-shp-header';\nimport {loadShapefileSidecarFiles, replaceExtension} from './lib/parsers/parse-shapefile';\nimport {\n type SHPWKBGeometry,\n makeWKBGeometryArrowTable\n} from './lib/parsers/build-wkb-geometry-arrow';\nimport {makeSHPGeoArrowGeometryTable} from './lib/parsers/build-geoarrow-geometry-arrow';\nconst GEOMETRY_COLUMN_NAME = 'geometry';\n\n/** Parses a shapefile and returns an Arrow table with a WKB geometry column. */\nexport async function parseShapefileToArrow(\n arrayBuffer: ArrayBuffer,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<ArrowTable> {\n const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);\n const transform = getReprojectionTransform(prj, options);\n const geoArrowEncoding = getTypedGeoArrowEncoding(options);\n let header: SHPHeader | undefined;\n let geometryTable: ArrowTable;\n\n if (geoArrowEncoding) {\n geometryTable = makeSHPGeoArrowGeometryTable(arrayBuffer, options, {transform});\n } else {\n const shpResult = (await parseFromContext(\n arrayBuffer,\n SHPLoaderWithParser,\n {\n ...options,\n shp: {\n ...options?.shp,\n shape: 'wkb'\n }\n },\n context!\n )) as SHPResult;\n header = shpResult.header;\n geometryTable = makeGeometryArrowTable(\n shpResult.geometries as (SHPWKBGeometry | null)[],\n header,\n transform\n );\n if (\n options?.geoarrow?.encodingPreference === 'geoarrow.geometry' ||\n options?.shapefile?.geoarrow?.encodingPreference === 'geoarrow.geometry'\n ) {\n const geometryColumn = geometryTable.data.getChild(GEOMETRY_COLUMN_NAME);\n const geometries = geometryColumn?.toArray() || [];\n geometryTable = convertFeaturesToGeoArrowTable(\n geometries.map(geometry => ({\n type: 'Feature' as const,\n geometry: geometry ? convertWKBToGeometry(geometry.slice().buffer) : null,\n properties: {}\n })),\n {encodingPreference: 'geoarrow.geometry'}\n );\n }\n }\n\n let propertySchema: TableSchema | null = null;\n let propertyTable: ArrowTable | null = null;\n\n const dbfResponse = context?.url\n ? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)\n : null;\n if (dbfResponse?.ok) {\n const propertyData = (await parseFromContext(\n dbfResponse as any,\n DBFLoaderWithParser,\n {\n ...options,\n dbf: {\n ...options?.dbf,\n shape: 'arrow' as const,\n encoding: cpg || 'latin1'\n }\n },\n context!\n )) as arrow.Table;\n propertySchema = convertArrowToSchema(propertyData.schema);\n propertyTable = {shape: 'arrow-table', data: propertyData, schema: propertySchema};\n }\n\n const schema = buildOutputSchema(propertySchema, header, geometryTable.schema);\n const table = propertyTable\n ? appendGeometryColumnToArrowTable(propertyTable, geometryTable, schema)\n : geometryTable;\n return Object.assign(table, {loaderData: {header, encoding: cpg, prj, shx}});\n}\n\n/** Parses a shapefile into Arrow batches while keeping DBF-derived schema stable. */\nexport async function* parseShapefileToArrowInBatches(\n asyncIterator:\n | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n | Iterable<ArrayBufferLike | ArrayBufferView>,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): AsyncIterable<ArrowTableBatch> {\n if (getTypedGeoArrowEncoding(options)) {\n throw new Error('Typed GeoArrow shapefile output is only supported for non-streaming parse.');\n }\n\n const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);\n const batchSize =\n typeof options?.core?.batchSize === 'number'\n ? options.core.batchSize\n : (options?.shapefile?.batchSize ??\n options?.shp?.batchSize ??\n options?.dbf?.batchSize ??\n 10000);\n const childOptions = {\n ...options,\n core: {...options?.core, batchMaxRowsPerSecond: 0}\n };\n\n const shapeIterable = await parseInBatchesFromContext(\n toArrayBufferIterator(asyncIterator),\n SHPLoaderWithParser,\n {\n ...childOptions,\n shp: {\n ...options?.shp,\n shape: 'wkb',\n batchSize\n }\n },\n context!\n );\n const shapeIterator = getAsyncIterator(shapeIterable);\n\n const shapeHeader = await getNextNonMetadataValue(shapeIterator);\n const header = shapeHeader as SHPHeader;\n\n let propertyIterator: AsyncIterator<any> | null = null;\n let propertySchema: TableSchema | null = null;\n\n const dbfResponse = context?.url\n ? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)\n : null;\n if (dbfResponse?.ok) {\n const dbfOptions = {\n ...childOptions,\n dbf: {\n ...options?.dbf,\n shape: 'arrow' as const,\n batchSize,\n encoding: cpg || 'latin1'\n }\n };\n const propertyIterable = await parseInBatchesFromContext(\n dbfResponse,\n DBFLoaderWithParser,\n dbfOptions,\n context!\n );\n propertyIterator = getAsyncIterator(propertyIterable);\n\n const firstPropertyBatch = await getNextArrowBatch(propertyIterator);\n propertySchema = firstPropertyBatch?.schema || null;\n const outputSchema = buildOutputSchema(propertySchema, header);\n const propertyQueue: arrow.Table[] = [];\n const geometryQueue: arrow.Table[] = [];\n let yieldedDataBatch = false;\n\n if (firstPropertyBatch && firstPropertyBatch.length > 0) {\n propertyQueue.push(firstPropertyBatch.data);\n }\n\n let shapeDone = false;\n let propertyDone = false;\n while (\n !shapeDone ||\n !propertyDone ||\n getQueuedRowCount(geometryQueue) > 0 ||\n getQueuedRowCount(propertyQueue) > 0\n ) {\n if (!shapeDone && getQueuedRowCount(geometryQueue) === 0) {\n const shapeBatch = await shapeIterator.next();\n if (shapeBatch.done) {\n shapeDone = true;\n } else if (shapeBatch.value?.batchType !== 'metadata') {\n const transform = getReprojectionTransform(prj, options);\n geometryQueue.push(\n makeGeometryArrowTable(shapeBatch.value as (SHPWKBGeometry | null)[], header, transform)\n .data\n );\n }\n }\n\n if (!propertyDone && getQueuedRowCount(propertyQueue) < getQueuedRowCount(geometryQueue)) {\n const propertyBatch = await getNextArrowBatch(propertyIterator);\n if (!propertyBatch) {\n propertyDone = true;\n } else if (propertyBatch.length > 0) {\n propertyQueue.push(propertyBatch.data);\n }\n }\n\n const rowCount = Math.min(getQueuedRowCount(geometryQueue), getQueuedRowCount(propertyQueue));\n if (rowCount === 0) {\n if (\n (shapeDone && getQueuedRowCount(geometryQueue) === 0) ||\n (propertyDone && getQueuedRowCount(propertyQueue) === 0)\n ) {\n break;\n }\n continue;\n }\n\n const propertyTable = takeRowsFromQueue(propertyQueue, rowCount);\n const geometryTable = takeRowsFromQueue(geometryQueue, rowCount);\n const batch = appendGeometryColumnToArrowTable(\n {shape: 'arrow-table', schema: propertySchema || undefined, data: propertyTable},\n {shape: 'arrow-table', data: geometryTable},\n outputSchema\n );\n yieldedDataBatch = true;\n yield {...makeTableScanBatch(batch), loaderData: {header, encoding: cpg, prj, shx}};\n }\n if (!yieldedDataBatch) {\n yield {...makeEmptyArrowBatch(outputSchema), loaderData: {header, encoding: cpg, prj, shx}};\n }\n return;\n }\n\n const outputSchema = buildOutputSchema(null, header);\n let yieldedDataBatch = false;\n\n while (true) {\n const shapeBatch = await shapeIterator.next();\n if (shapeBatch.done) {\n break;\n }\n if (shapeBatch.value?.batchType === 'metadata') {\n continue;\n }\n const transform = getReprojectionTransform(prj, options);\n const arrowTable = makeGeometryArrowTable(\n shapeBatch.value as (SHPWKBGeometry | null)[],\n header,\n transform\n );\n yieldedDataBatch = true;\n yield {\n ...makeTableScanBatch({...arrowTable, schema: outputSchema}),\n loaderData: {header, encoding: cpg, prj, shx}\n };\n }\n if (!yieldedDataBatch) {\n yield {...makeEmptyArrowBatch(outputSchema), loaderData: {header, encoding: cpg, prj, shx}};\n }\n}\n\n/** Creates the output Arrow schema by appending the WKB geometry column to DBF fields. */\nfunction buildOutputSchema(\n propertySchema: TableSchema | null,\n header?: SHPHeader,\n geometrySchema?: TableSchema\n): TableSchema {\n const geometryField: Field =\n geometrySchema?.fields[0] || makeWKBGeometryField(GEOMETRY_COLUMN_NAME);\n const schema: TableSchema = {\n fields: [...(propertySchema?.fields || []), geometryField],\n metadata: {\n ...(propertySchema?.metadata || {}),\n ...(geometrySchema?.metadata || {})\n }\n };\n\n if (!geometrySchema) {\n setWKBGeometryColumnMetadata(schema.metadata!, {\n geometryColumnName: GEOMETRY_COLUMN_NAME,\n geometryTypes: inferGeometryTypes(header)\n });\n }\n\n return schema;\n}\n\nfunction makeGeometryArrowTable(\n geometries: (SHPWKBGeometry | null | undefined)[],\n header?: SHPHeader,\n transform?: (coordinate: number[]) => number[]\n) {\n const geometrySchema = buildOutputSchema(null, header);\n return makeWKBGeometryArrowTable(geometries, geometrySchema, transform);\n}\n\nfunction appendGeometryColumnToArrowTable(\n propertyTable: ArrowTable,\n geometryTable: ArrowTable,\n schema: TableSchema\n): ArrowTable {\n const propertyBatch = propertyTable.data.batches[0];\n const geometryBatch = geometryTable.data.batches[0];\n const arrowSchema = convertSchemaToArrow(schema);\n const structField = new arrow.Struct(arrowSchema.fields);\n const children = [...propertyBatch.data.children, geometryBatch.data.children[0]];\n const rowCount = Math.max(propertyTable.data.numRows, geometryTable.data.numRows);\n const structData = new arrow.Data(structField, 0, rowCount, 0, undefined, children);\n const recordBatch = new arrow.RecordBatch(arrowSchema, structData);\n\n return {\n shape: 'arrow-table',\n schema,\n data: new arrow.Table(arrowSchema, [recordBatch])\n };\n}\n\nfunction getReprojectionTransform(\n sourceCrs: WKTCRSDefinition | undefined,\n options?: ShapefileLoaderOptions\n): ((coordinate: number[]) => number[]) | undefined {\n const {reproject = false, targetCrs = 'WGS84'} = options?.gis || {};\n if (!reproject) {\n return undefined;\n }\n if (!sourceCrs) {\n throw new CRSReprojectionError(\n 'missing-source-crs',\n 'Shapefile reprojection requires a source CRS from the .prj sidecar file',\n {targetCrs}\n );\n }\n try {\n const projection = projectionEngine.createProjection({\n from: sourceCrs,\n to: (targetCrs || 'WGS84') as ReadonlyCRSDefinition\n });\n return coordinate => projection.projectSync(coordinate);\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n throw new CRSReprojectionError(\n 'transformation-failed',\n `Shapefile reprojection failed: ${message}`,\n {sourceCrs, targetCrs: targetCrs || 'WGS84', cause: error}\n );\n }\n}\n\nfunction getTypedGeoArrowEncoding(options?: ShapefileLoaderOptions): boolean {\n const encoding = options?.shapefile?.geoarrowEncoding || options?.shp?.geoarrowEncoding;\n const preference =\n options?.geoarrow?.encodingPreference ||\n options?.shapefile?.geoarrow?.encodingPreference ||\n options?.shp?.geoarrow?.encodingPreference;\n return encoding === 'geoarrow' || preference === 'optimized';\n}\n\n/** Infers GeoParquet geometry type metadata from parsed geometries or the SHP header. */\nfunction inferGeometryTypes(header?: SHPHeader): GeoParquetGeometryType[] {\n const fallbackType = getGeometryTypeFromHeader(header?.type);\n return fallbackType ? [fallbackType] : [];\n}\n\n/** Maps SHP header geometry type codes to GeoParquet geometry type strings. */\nfunction getGeometryTypeFromHeader(type?: number): GeoParquetGeometryType | null {\n switch (type) {\n case 1:\n case 11:\n case 21:\n return type === 11 ? 'Point Z' : 'Point';\n case 3:\n case 13:\n case 23:\n return type === 13 ? 'LineString Z' : 'LineString';\n case 5:\n case 15:\n case 25:\n return type === 15 ? 'Polygon Z' : 'Polygon';\n case 8:\n case 18:\n case 28:\n return type === 18 ? 'MultiPoint Z' : 'MultiPoint';\n default:\n return null;\n }\n}\n\n/** Normalizes sync or async iterables to a single async iterator interface. */\nfunction getAsyncIterator(iterable: AsyncIterable<any> | Iterable<any>): AsyncIterator<any> {\n const iterator = iterable[Symbol.asyncIterator]?.() || iterable[Symbol.iterator]?.();\n return iterator as AsyncIterator<any>;\n}\n\n/** Reads the next non-metadata value from a parser iterator. */\nasync function getNextNonMetadataValue(iterator: AsyncIterator<any>): Promise<any> {\n while (true) {\n const result = await iterator.next();\n if (result.done) {\n return null;\n }\n if (result.value?.batchType !== 'metadata') {\n return result.value;\n }\n }\n}\n\n/** Reads both native and legacy DBF column batches. */\nasync function getNextArrowBatch(iterator: AsyncIterator<any>): Promise<ArrowTableBatch | null> {\n while (true) {\n const result = await iterator.next();\n if (result.done) {\n return null;\n }\n if (isNativeArrowRecordBatch(result.value)) {\n const recordBatch = result.value;\n const schema = convertArrowToSchema(recordBatch.schema);\n const batch =\n Object.getPrototypeOf(recordBatch) === arrow.RecordBatch.prototype\n ? recordBatch\n : importDBFRecordBatch(recordBatch, schema);\n const data = new arrow.Table(batch.schema, [batch]);\n return makeTableScanBatch({\n shape: 'arrow-table',\n schema,\n data\n });\n }\n if (result.value?.shape === 'arrow-table') return result.value;\n }\n}\n\n/** Rebuilds primitive DBF columns with local Arrow classes while reusing their buffers. */\nfunction importDBFRecordBatch(\n batch: arrow.RecordBatch,\n tableSchema: TableSchema\n): arrow.RecordBatch {\n const schema = convertSchemaToArrow(tableSchema);\n const children = batch.data.children.map(\n (column, index) =>\n new arrow.Data(\n schema.fields[index].type,\n column.offset,\n column.length,\n column.nullCount,\n column.buffers,\n undefined,\n undefined,\n column.variadicBuffers\n )\n );\n const data = arrow.makeData({\n type: new arrow.Struct(schema.fields),\n length: batch.numRows,\n children\n });\n return new arrow.RecordBatch(schema, data, new Map(batch.metadata));\n}\n\nfunction getQueuedRowCount(queue: arrow.Table[]): number {\n return queue.reduce((rowCount, table) => rowCount + table.numRows, 0);\n}\n\nfunction takeRowsFromQueue(queue: arrow.Table[], rowCount: number): arrow.Table {\n const table = queue[0];\n if (rowCount === table.numRows) {\n queue.shift();\n return table;\n }\n const result = table.slice(0, rowCount);\n queue[0] = table.slice(rowCount, table.numRows - rowCount);\n return result;\n}\n\n/** Creates an explicit empty Arrow batch so zero-row shapefiles still expose schema in batch mode. */\nfunction makeEmptyArrowBatch(schema: TableSchema): ArrowTableBatch {\n const table = new ArrowTableBuilder(schema).finishTable();\n return makeTableScanBatch({shape: 'arrow-table', data: table, schema});\n}\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACIA,0BAAuD;AACvD,IAAAA,
|
|
4
|
+
"sourcesContent": ["export * from './shapefile/shapefile-arrow-loader.js';\n", "// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {CRSReprojectionError, type LoaderContext} from '@loaders.gl/core/loader-utils';\nimport {\n parseFromContext,\n parseInBatchesFromContext,\n toArrayBufferIterator\n} from '@loaders.gl/core/loader-utils';\nimport * as arrow from 'apache-arrow';\nimport {convertArrowToSchema, isArrowRecordBatch} from '@loaders.gl/core/schema-utils';\nimport type {Field, Schema as TableSchema} from '@loaders.gl/core/schema';\nimport {makeArrowMetadataBatch, convertSchemaToArrow} from '@loaders.gl/core/schema-utils';\nimport {convertFeaturesToGeoArrowTable} from '@loaders.gl/core/arrow-geometry/feature-table';\nimport {convertWKBToGeometry} from '@loaders.gl/core/arrow-geometry/geometry-codecs';\nimport {type GeoParquetGeometryType} from '@loaders.gl/core/schema';\nimport {\n makeWKBGeometryField,\n setWKBGeometryColumnMetadata\n} from '@loaders.gl/core/arrow-geometry/geometry-field';\nimport {projectionEngine} from '@math.gl/geospatial/projection';\nimport type {ReadonlyCRSDefinition, WKTCRSDefinition} from '@math.gl/geospatial/crs';\nimport {SHPLoaderWithParser} from './shp-loader';\nimport {DBFLoaderWithParser} from './dbf-loader';\nimport type {ShapefileLoaderOptions} from './shapefile-loader-types';\nimport type {SHPResult} from './lib/parsers/parse-shp';\nimport type {SHPHeader} from './lib/parsers/parse-shp-header';\nimport {loadShapefileSidecarFiles, replaceExtension} from './lib/parsers/parse-shapefile';\nimport {\n type SHPWKBGeometry,\n makeWKBGeometryArrowTable\n} from './lib/parsers/build-wkb-geometry-arrow';\nimport {makeSHPGeoArrowGeometryTable} from './lib/parsers/build-geoarrow-geometry-arrow';\nconst GEOMETRY_COLUMN_NAME = 'geometry';\n\n/** Parses a shapefile and returns an Arrow table with a WKB geometry column. */\nexport async function parseShapefileToArrow(\n arrayBuffer: ArrayBuffer,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): Promise<arrow.Table> {\n const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);\n const transform = getReprojectionTransform(prj, options);\n const geoArrowEncoding = getTypedGeoArrowEncoding(options);\n let header: SHPHeader | undefined;\n let geometryTable: arrow.Table;\n\n if (geoArrowEncoding) {\n geometryTable = makeSHPGeoArrowGeometryTable(arrayBuffer, options, {transform});\n } else {\n const shpResult = (await parseFromContext(\n arrayBuffer,\n SHPLoaderWithParser,\n {\n ...options,\n shp: {\n ...options?.shp,\n shape: 'wkb'\n }\n },\n context!\n )) as SHPResult;\n header = shpResult.header;\n geometryTable = makeGeometryArrowTable(\n shpResult.geometries as (SHPWKBGeometry | null)[],\n header,\n transform\n );\n if (\n options?.geoarrow?.encodingPreference === 'geoarrow.geometry' ||\n options?.shapefile?.geoarrow?.encodingPreference === 'geoarrow.geometry'\n ) {\n const geometryColumn = geometryTable.getChild(GEOMETRY_COLUMN_NAME);\n const geometries = geometryColumn?.toArray() || [];\n geometryTable = convertFeaturesToGeoArrowTable(\n geometries.map(geometry => ({\n type: 'Feature' as const,\n geometry: geometry ? convertWKBToGeometry(geometry.slice().buffer) : null,\n properties: {}\n })),\n {encodingPreference: 'geoarrow.geometry'}\n );\n }\n }\n\n let propertySchema: TableSchema | null = null;\n let propertyTable: arrow.Table | null = null;\n\n const dbfResponse = context?.url\n ? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)\n : null;\n if (dbfResponse?.ok) {\n const propertyData = (await parseFromContext(\n dbfResponse as any,\n DBFLoaderWithParser,\n {\n ...options,\n dbf: {\n ...options?.dbf,\n shape: 'arrow' as const,\n encoding: cpg || 'latin1'\n }\n },\n context!\n )) as arrow.Table;\n propertySchema = convertArrowToSchema(propertyData.schema);\n propertyTable = propertyData;\n }\n\n const schema = buildOutputSchema(\n propertySchema,\n header,\n convertArrowToSchema(geometryTable.schema)\n );\n const table = propertyTable\n ? appendGeometryColumnToArrowTable(propertyTable, geometryTable, schema)\n : geometryTable;\n const encoded = encodeShapefileHeader({header, encoding: cpg, prj, shx});\n table.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);\n for (const batch of table.batches) batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encoded);\n return table;\n}\n\n/** Parses a shapefile into Arrow batches while keeping DBF-derived schema stable. */\nexport async function* parseShapefileToArrowInBatches(\n asyncIterator:\n | AsyncIterable<ArrayBufferLike | ArrayBufferView>\n | Iterable<ArrayBufferLike | ArrayBufferView>,\n options?: ShapefileLoaderOptions,\n context?: LoaderContext\n): AsyncIterable<arrow.RecordBatch> {\n if (getTypedGeoArrowEncoding(options)) {\n throw new Error('Typed GeoArrow shapefile output is only supported for non-streaming parse.');\n }\n\n const {cpg, prj, shx} = await loadShapefileSidecarFiles(options, context);\n const batchSize =\n typeof options?.core?.batchSize === 'number'\n ? options.core.batchSize\n : (options?.shapefile?.batchSize ??\n options?.shp?.batchSize ??\n options?.dbf?.batchSize ??\n 10000);\n const childOptions = {\n ...options,\n core: {...options?.core, batchMaxRowsPerSecond: 0}\n };\n\n const shapeIterable = await parseInBatchesFromContext(\n toArrayBufferIterator(asyncIterator),\n SHPLoaderWithParser,\n {\n ...childOptions,\n shp: {\n ...options?.shp,\n shape: 'wkb',\n batchSize\n }\n },\n context!\n );\n const shapeIterator = getAsyncIterator(shapeIterable);\n\n const shapeHeader = await getNextNonMetadataValue(shapeIterator);\n const header = shapeHeader as SHPHeader;\n const encodedHeader = encodeShapefileHeader({header, encoding: cpg, prj, shx});\n\n let propertyIterator: AsyncIterator<any> | null = null;\n let propertySchema: TableSchema | null = null;\n\n const dbfResponse = context?.url\n ? await context.fetch(replaceExtension(context.url, 'dbf')).catch(() => null)\n : null;\n if (dbfResponse?.ok) {\n const dbfOptions = {\n ...childOptions,\n dbf: {\n ...options?.dbf,\n shape: 'arrow' as const,\n batchSize,\n encoding: cpg || 'latin1'\n }\n };\n const propertyIterable = await parseInBatchesFromContext(\n dbfResponse,\n DBFLoaderWithParser,\n dbfOptions,\n context!\n );\n propertyIterator = getAsyncIterator(propertyIterable);\n\n const firstPropertyBatch = await getNextArrowBatch(propertyIterator);\n propertySchema = firstPropertyBatch ? convertArrowToSchema(firstPropertyBatch.schema) : null;\n const outputSchema = buildOutputSchema(propertySchema, header);\n const propertyQueue: arrow.Table[] = [];\n const geometryQueue: arrow.Table[] = [];\n let yieldedDataBatch = false;\n\n if (firstPropertyBatch && firstPropertyBatch.numRows > 0) {\n propertyQueue.push(new arrow.Table(firstPropertyBatch.schema, [firstPropertyBatch]));\n }\n\n let shapeDone = false;\n let propertyDone = false;\n while (\n !shapeDone ||\n !propertyDone ||\n getQueuedRowCount(geometryQueue) > 0 ||\n getQueuedRowCount(propertyQueue) > 0\n ) {\n if (!shapeDone && getQueuedRowCount(geometryQueue) === 0) {\n const shapeBatch = await shapeIterator.next();\n if (shapeBatch.done) {\n shapeDone = true;\n } else if (shapeBatch.value?.batchType !== 'metadata') {\n const transform = getReprojectionTransform(prj, options);\n geometryQueue.push(\n makeGeometryArrowTable(shapeBatch.value as (SHPWKBGeometry | null)[], header, transform)\n );\n }\n }\n\n if (!propertyDone && getQueuedRowCount(propertyQueue) < getQueuedRowCount(geometryQueue)) {\n const propertyBatch = await getNextArrowBatch(propertyIterator);\n if (!propertyBatch) {\n propertyDone = true;\n } else if (propertyBatch.numRows > 0) {\n propertyQueue.push(new arrow.Table(propertyBatch.schema, [propertyBatch]));\n }\n }\n\n const rowCount = Math.min(getQueuedRowCount(geometryQueue), getQueuedRowCount(propertyQueue));\n if (rowCount === 0) {\n if (\n (shapeDone && getQueuedRowCount(geometryQueue) === 0) ||\n (propertyDone && getQueuedRowCount(propertyQueue) === 0)\n ) {\n break;\n }\n continue;\n }\n\n const propertyTable = takeRowsFromQueue(propertyQueue, rowCount);\n const geometryTable = takeRowsFromQueue(geometryQueue, rowCount);\n const batch = appendGeometryColumnToArrowTable(propertyTable, geometryTable, outputSchema);\n yieldedDataBatch = true;\n const recordBatch = batch.batches[0];\n recordBatch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);\n yield recordBatch;\n }\n if (!yieldedDataBatch) {\n yield makeEmptyArrowBatch(outputSchema, encodedHeader);\n }\n return;\n }\n\n const outputSchema = buildOutputSchema(null, header);\n let yieldedDataBatch = false;\n\n while (true) {\n const shapeBatch = await shapeIterator.next();\n if (shapeBatch.done) {\n break;\n }\n if (shapeBatch.value?.batchType === 'metadata') {\n continue;\n }\n const transform = getReprojectionTransform(prj, options);\n const arrowTable = makeGeometryArrowTable(\n shapeBatch.value as (SHPWKBGeometry | null)[],\n header,\n transform\n );\n yieldedDataBatch = true;\n for (const batch of arrowTable.batches) {\n batch.schema.metadata.set(SHAPEFILE_HEADER_KEY, encodedHeader);\n yield batch;\n }\n }\n if (!yieldedDataBatch) {\n yield makeEmptyArrowBatch(outputSchema, encodedHeader);\n }\n}\n\n/** Creates the output Arrow schema by appending the WKB geometry column to DBF fields. */\nfunction buildOutputSchema(\n propertySchema: TableSchema | null,\n header?: SHPHeader,\n geometrySchema?: TableSchema\n): TableSchema {\n const geometryField: Field =\n geometrySchema?.fields[0] || makeWKBGeometryField(GEOMETRY_COLUMN_NAME);\n const schema: TableSchema = {\n fields: [...(propertySchema?.fields || []), geometryField],\n metadata: {\n ...(propertySchema?.metadata || {}),\n ...(geometrySchema?.metadata || {})\n }\n };\n\n if (!geometrySchema) {\n setWKBGeometryColumnMetadata(schema.metadata!, {\n geometryColumnName: GEOMETRY_COLUMN_NAME,\n geometryTypes: inferGeometryTypes(header)\n });\n }\n\n return schema;\n}\n\nfunction makeGeometryArrowTable(\n geometries: (SHPWKBGeometry | null | undefined)[],\n header?: SHPHeader,\n transform?: (coordinate: number[]) => number[]\n) {\n const geometrySchema = buildOutputSchema(null, header);\n return makeWKBGeometryArrowTable(geometries, geometrySchema, transform);\n}\n\nfunction appendGeometryColumnToArrowTable(\n propertyTable: arrow.Table,\n geometryTable: arrow.Table,\n schema: TableSchema\n): arrow.Table {\n const propertyBatch = propertyTable.batches[0];\n const geometryBatch = geometryTable.batches[0];\n const arrowSchema = convertSchemaToArrow(schema);\n const structField = new arrow.Struct(arrowSchema.fields);\n const children = [...propertyBatch.data.children, geometryBatch.data.children[0]];\n const rowCount = Math.max(propertyTable.numRows, geometryTable.numRows);\n const structData = new arrow.Data(structField, 0, rowCount, 0, undefined, children);\n const recordBatch = new arrow.RecordBatch(arrowSchema, structData);\n\n return new arrow.Table(arrowSchema, [recordBatch]);\n}\n\nfunction getReprojectionTransform(\n sourceCrs: WKTCRSDefinition | undefined,\n options?: ShapefileLoaderOptions\n): ((coordinate: number[]) => number[]) | undefined {\n const {reproject = false, targetCrs = 'WGS84'} = options?.gis || {};\n if (!reproject) {\n return undefined;\n }\n if (!sourceCrs) {\n throw new CRSReprojectionError(\n 'missing-source-crs',\n 'Shapefile reprojection requires a source CRS from the .prj sidecar file',\n {targetCrs}\n );\n }\n try {\n const projection = projectionEngine.createProjection({\n from: sourceCrs,\n to: (targetCrs || 'WGS84') as ReadonlyCRSDefinition\n });\n return coordinate => projection.projectSync(coordinate);\n } catch (error) {\n const message = error instanceof Error ? error.message : String(error);\n throw new CRSReprojectionError(\n 'transformation-failed',\n `Shapefile reprojection failed: ${message}`,\n {sourceCrs, targetCrs: targetCrs || 'WGS84', cause: error}\n );\n }\n}\n\nfunction getTypedGeoArrowEncoding(options?: ShapefileLoaderOptions): boolean {\n const encoding = options?.shapefile?.geoarrowEncoding || options?.shp?.geoarrowEncoding;\n const preference =\n options?.geoarrow?.encodingPreference ||\n options?.shapefile?.geoarrow?.encodingPreference ||\n options?.shp?.geoarrow?.encodingPreference;\n return encoding === 'geoarrow' || preference === 'optimized';\n}\n\n/** Infers GeoParquet geometry type metadata from parsed geometries or the SHP header. */\nfunction inferGeometryTypes(header?: SHPHeader): GeoParquetGeometryType[] {\n const fallbackType = getGeometryTypeFromHeader(header?.type);\n return fallbackType ? [fallbackType] : [];\n}\n\n/** Maps SHP header geometry type codes to GeoParquet geometry type strings. */\nfunction getGeometryTypeFromHeader(type?: number): GeoParquetGeometryType | null {\n switch (type) {\n case 1:\n case 11:\n case 21:\n return type === 11 ? 'Point Z' : 'Point';\n case 3:\n case 13:\n case 23:\n return type === 13 ? 'LineString Z' : 'LineString';\n case 5:\n case 15:\n case 25:\n return type === 15 ? 'Polygon Z' : 'Polygon';\n case 8:\n case 18:\n case 28:\n return type === 18 ? 'MultiPoint Z' : 'MultiPoint';\n default:\n return null;\n }\n}\n\n/** Normalizes sync or async iterables to a single async iterator interface. */\nfunction getAsyncIterator(iterable: AsyncIterable<any> | Iterable<any>): AsyncIterator<any> {\n const iterator = iterable[Symbol.asyncIterator]?.() || iterable[Symbol.iterator]?.();\n return iterator as AsyncIterator<any>;\n}\n\n/** Reads the next non-metadata value from a parser iterator. */\nasync function getNextNonMetadataValue(iterator: AsyncIterator<any>): Promise<any> {\n while (true) {\n const result = await iterator.next();\n if (result.done) {\n return null;\n }\n if (result.value?.batchType !== 'metadata') {\n return result.value;\n }\n }\n}\n\n/** Reads native DBF batches and imports columns originating from another Arrow build. */\nasync function getNextArrowBatch(\n iterator: AsyncIterator<unknown>\n): Promise<arrow.RecordBatch | null> {\n while (true) {\n const result = await iterator.next();\n if (result.done) return null;\n if (isArrowRecordBatch(result.value)) {\n const batch = result.value;\n return Object.getPrototypeOf(batch) === arrow.RecordBatch.prototype\n ? batch\n : importDBFRecordBatch(batch, convertArrowToSchema(batch.schema));\n }\n }\n}\n\n/** Rebuilds primitive DBF columns with local Arrow classes while reusing their buffers. */\nfunction importDBFRecordBatch(\n batch: arrow.RecordBatch,\n tableSchema: TableSchema\n): arrow.RecordBatch {\n const schema = convertSchemaToArrow(tableSchema);\n const children = batch.data.children.map(\n (column, index) =>\n new arrow.Data(\n schema.fields[index].type,\n column.offset,\n column.length,\n column.nullCount,\n column.buffers,\n undefined,\n undefined,\n column.variadicBuffers\n )\n );\n const data = arrow.makeData({\n type: new arrow.Struct(schema.fields),\n length: batch.numRows,\n children\n });\n return new arrow.RecordBatch(schema, data, new Map(batch.metadata));\n}\n\nfunction getQueuedRowCount(queue: arrow.Table[]): number {\n return queue.reduce((rowCount, table) => rowCount + table.numRows, 0);\n}\n\nfunction takeRowsFromQueue(queue: arrow.Table[], rowCount: number): arrow.Table {\n const table = queue[0];\n if (rowCount === table.numRows) {\n queue.shift();\n return table;\n }\n const result = table.slice(0, rowCount);\n queue[0] = table.slice(rowCount);\n return result;\n}\n\n/** Creates an explicit empty Arrow batch so zero-row shapefiles still expose their schema. */\nfunction makeEmptyArrowBatch(schema: TableSchema, header: string): arrow.RecordBatch {\n const nativeSchema = convertSchemaToArrow(schema);\n nativeSchema.metadata.set(SHAPEFILE_HEADER_KEY, header);\n return makeArrowMetadataBatch(nativeSchema);\n}\n\n/** Schema metadata key for the Shapefile header and sidecar data. */\nexport const SHAPEFILE_HEADER_KEY = 'loaders.gl.shapefile.header';\n\n/** Encodes Shapefile sidecars for schema and worker transport. */\nfunction encodeShapefileHeader({\n shx,\n ...header\n}: {\n header?: SHPHeader;\n encoding?: string;\n prj?: WKTCRSDefinition;\n shx?: {offsets: Int32Array; lengths: Int32Array};\n}): string {\n return JSON.stringify({\n ...header,\n ...(shx ? {shx: {offsets: Array.from(shx.offsets), lengths: Array.from(shx.lengths)}} : {})\n });\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["import_loader_utils", "import_schema_utils", "outputSchema", "yieldedDataBatch"]
|
|
7
7
|
}
|
|
@@ -36,7 +36,7 @@ module.exports = __toCommonJS(shapefile_loader_types_exports);
|
|
|
36
36
|
|
|
37
37
|
// src/shapefile/shapefile-loader-types.ts
|
|
38
38
|
var import_shp_format = require("./shp-format.cjs");
|
|
39
|
-
var VERSION = true ? "5.0.0-beta.
|
|
39
|
+
var VERSION = true ? "5.0.0-beta.11" : "latest";
|
|
40
40
|
async function preloadShapefileLoader() {
|
|
41
41
|
const { ShapefileLoaderWithParser } = await import("@loaders.gl/geospatial/shapefile-loader");
|
|
42
42
|
return ShapefileLoaderWithParser;
|