@loaders.gl/shapefile 4.3.4 → 4.4.0-alpha.10

package/src/lib/parsers/types.ts

@@ -2,26 +2,31 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Schema, ObjectRowTable} from '@loaders.gl/schema';
-import type {LoaderOptions} from '@loaders.gl/loader-utils';
+import type {Schema, ObjectRowTable} from '@loaders.gl/schema';
+import type {StrictLoaderOptions} from '@loaders.gl/loader-utils';
 
-export type SHPLoaderOptions = LoaderOptions & {
+export type SHPLoaderOptions = StrictLoaderOptions & {
   shp?: {
     _maxDimensions?: number;
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
   };
 };
 
-export type DBFLoaderOptions = LoaderOptions & {
+export type DBFLoaderOptions = StrictLoaderOptions & {
   dbf?: {
     encoding?: string;
     shape?: 'rows' | 'table' | 'object-row-table';
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
   };
 };
 
-export type ShapefileLoaderOptions = LoaderOptions &
-  SHPLoaderOptions & {
+export type ShapefileLoaderOptions = StrictLoaderOptions &
+  SHPLoaderOptions &
+  DBFLoaderOptions & {
     shapefile?: {
-      shape?: 'geojson-table';
+      shape?: 'geojson-table' | 'v3';
     };
     gis?: {
       reproject?: boolean;

package/src/shapefile-loader.ts

@@ -2,22 +2,29 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
-import {SHP_MAGIC_NUMBER} from './shp-loader';
+import type {StrictLoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {Batch, GeoJSONTable} from '@loaders.gl/schema';
+import {SHP_MAGIC_NUMBER, SHPLoaderOptions} from './shp-loader';
 import {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';
-import {Batch, GeoJSONTable} from '@loaders.gl/schema';
+import {DBFLoaderOptions} from './dbf-loader';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
-export type ShapefileLoaderOptions = LoaderOptions & {
-  shapefile?: {
-    shape?: 'geojson-table' | 'v3';
-    /** @deprecated Worker URLs must be specified with .dbf.workerUrl * .shp.workerUrl */
-    workerUrl?: never;
+export type ShapefileLoaderOptions = StrictLoaderOptions &
+  SHPLoaderOptions &
+  DBFLoaderOptions & {
+    shapefile?: {
+      shape?: 'geojson-table' | 'v3';
+      /** @deprecated Worker URLs must be specified with .dbf.workerUrl * .shp.workerUrl */
+      workerUrl?: never;
+    };
+    gis?: {
+      reproject?: boolean;
+      _targetCrs?: string;
+    };
   };
-};
 
 /**
  * Shapefile loader

package/src/shp-loader.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderWithParser, StrictLoaderOptions} from '@loaders.gl/loader-utils';
 import {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';
 
 // __VERSION__ is injected by babel-plugin-version-inline
@@ -12,8 +12,8 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
 
 /** SHPLoader */
-export type SHPLoaderOptions = LoaderOptions & {
-  dbf?: {
+export type SHPLoaderOptions = StrictLoaderOptions & {
+  shp?: {
     _maxDimensions?: number;
     /** Override the URL to the worker bundle (by default loads from unpkg.com) */
     workerUrl?: string;
@@ -50,7 +50,9 @@ export const SHPLoader: LoaderWithParser = {
   parse: async (arrayBuffer, options?) => parseSHP(arrayBuffer, options),
   parseSync: parseSHP,
   parseInBatches: (
-    arrayBufferIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
+    arrayBufferIterator:
+      | AsyncIterable<ArrayBufferLike | ArrayBufferView>
+      | Iterable<ArrayBufferLike | ArrayBufferView>,
     options
   ) => parseSHPInBatches(arrayBufferIterator, options)
 };