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

package/dist/dbf-worker.js

@@ -372,7 +372,7 @@
   }
 
   // src/dbf-loader.ts
-  var VERSION = true ? "4.0.3" : "latest";
+  var VERSION = true ? "4.1.0-alpha.1" : "latest";
   var DBFWorkerLoader = {
     name: "DBF",
     id: "dbf",
@@ -397,6 +397,9 @@
     }
   };
 
+  // ../worker-utils/src/lib/node/worker_threads-browser.ts
+  var parentPort = null;
+
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || /* @__PURE__ */ new Set();
@@ -434,19 +437,6 @@
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
   async function getParentPort() {
-    let parentPort;
-    try {
-      eval("globalThis.parentPort = require('worker_threads').parentPort");
-      parentPort = globalThis.parentPort;
-    } catch {
-      try {
-        eval("globalThis.workerThreadsPromise = import('worker_threads')");
-        const workerThreads = await globalThis.workerThreadsPromise;
-        parentPort = workerThreads.parentPort;
-      } catch (error) {
-        console.error(error.message);
-      }
-    }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();

package/dist/dist.dev.js

@@ -6502,26 +6502,44 @@ var __exports__ = (() => {
       geometries
     } = await parseFromContext(arrayBuffer, SHPLoader, options, context);
     const geojsonGeometries = parseGeometries(geometries);
-    let properties = [];
+    let propertyTable;
     const dbfResponse = await context?.fetch(replaceExtension(context?.url, "dbf"));
     if (dbfResponse?.ok) {
-      properties = await parseFromContext(dbfResponse, DBFLoader, {
+      propertyTable = await parseFromContext(dbfResponse, DBFLoader, {
         dbf: {
+          shape: "object-row-table",
           encoding: cpg || "latin1"
         }
       }, context);
     }
-    let features = joinProperties(geojsonGeometries, properties);
+    let features = joinProperties(geojsonGeometries, propertyTable?.data || []);
     if (reproject) {
       features = reprojectFeatures(features, prj, _targetCrs);
     }
-    return {
-      encoding: cpg,
-      prj,
-      shx,
-      header,
-      data: features
-    };
+    switch (options?.shapefile?.shape) {
+      case "geojson-table":
+        return {
+          shape: "geojson-table",
+          type: "FeatureCollection",
+          encoding: cpg,
+          schema: propertyTable?.schema || {
+            metadata: {},
+            fields: []
+          },
+          prj,
+          shx,
+          header,
+          features
+        };
+      default:
+        return {
+          encoding: cpg,
+          prj,
+          shx,
+          header,
+          data: features
+        };
+    }
   }
   function parseGeometries(geometries) {
     const geojsonGeometries = [];
@@ -6620,7 +6638,9 @@ var __exports__ = (() => {
     mimeTypes: ["application/octet-stream"],
     tests: [new Uint8Array(SHP_MAGIC_NUMBER2).buffer],
     options: {
-      shapefile: {},
+      shapefile: {
+        shape: "v3"
+      },
       shp: {
         _maxDimensions: 4
       }

package/dist/index.cjs

@@ -932,31 +932,47 @@ async function* parseShapefileInBatches(asyncIterator, options, context) {
   }
 }
 async function parseShapefile(arrayBuffer, options, context) {
+  var _a;
   const { reproject = false, _targetCrs = "WGS84" } = (options == null ? void 0 : options.gis) || {};
   const { shx, cpg, prj } = await loadShapefileSidecarFiles(options, context);
   const { header, geometries } = await (0, import_loader_utils.parseFromContext)(arrayBuffer, SHPLoader, options, context);
   const geojsonGeometries = parseGeometries(geometries);
-  let properties = [];
+  let propertyTable;
   const dbfResponse = await (context == null ? void 0 : context.fetch(replaceExtension(context == null ? void 0 : context.url, "dbf")));
   if (dbfResponse == null ? void 0 : dbfResponse.ok) {
-    properties = await (0, import_loader_utils.parseFromContext)(
+    propertyTable = await (0, import_loader_utils.parseFromContext)(
       dbfResponse,
       DBFLoader,
-      { dbf: { encoding: cpg || "latin1" } },
+      { dbf: { shape: "object-row-table", encoding: cpg || "latin1" } },
       context
     );
   }
-  let features = joinProperties(geojsonGeometries, properties);
+  let features = joinProperties(geojsonGeometries, (propertyTable == null ? void 0 : propertyTable.data) || []);
   if (reproject) {
     features = reprojectFeatures(features, prj, _targetCrs);
   }
-  return {
-    encoding: cpg,
-    prj,
-    shx,
-    header,
-    data: features
-  };
+  switch ((_a = options == null ? void 0 : options.shapefile) == null ? void 0 : _a.shape) {
+    case "geojson-table":
+      return {
+        // @ts-expect-error
+        shape: "geojson-table",
+        type: "FeatureCollection",
+        encoding: cpg,
+        schema: (propertyTable == null ? void 0 : propertyTable.schema) || { metadata: {}, fields: [] },
+        prj,
+        shx,
+        header,
+        features
+      };
+    default:
+      return {
+        encoding: cpg,
+        prj,
+        shx,
+        header,
+        data: features
+      };
+  }
 }
 function parseGeometries(geometries) {
   const geojsonGeometries = [];
@@ -1050,12 +1066,16 @@ var ShapefileLoader = {
   mimeTypes: ["application/octet-stream"],
   tests: [new Uint8Array(SHP_MAGIC_NUMBER2).buffer],
   options: {
-    shapefile: {},
+    shapefile: {
+      shape: "v3"
+    },
     shp: {
       _maxDimensions: 4
     }
   },
+  // @ts-expect-error
   parse: parseShapefile,
+  // @ts-expect-error
   parseInBatches: parseShapefileInBatches
 };
 

package/dist/lib/parsers/parse-shapefile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAA8C,MAAM,0BAA0B,CAAC;AAKpG,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAOpD,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;GAEG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAkFhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAkC1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}
+{"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAA8C,MAAM,0BAA0B,CAAC;AAUpG,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAOpD,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;GAEG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAkFhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAiD1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}

package/dist/lib/parsers/parse-shapefile.js

@@ -70,6 +70,7 @@ export async function* parseShapefileInBatches(asyncIterator, options, context)
   }
 }
 export async function parseShapefile(arrayBuffer, options, context) {
+  var _propertyTable, _options$shapefile, _propertyTable2;
   const {
     reproject = false,
     _targetCrs = 'WGS84'
@@ -84,26 +85,44 @@ export async function parseShapefile(arrayBuffer, options, context) {
     geometries
   } = await parseFromContext(arrayBuffer, SHPLoader, options, context);
   const geojsonGeometries = parseGeometries(geometries);
-  let properties = [];
+  let propertyTable;
   const dbfResponse = await (context === null || context === void 0 ? void 0 : context.fetch(replaceExtension(context === null || context === void 0 ? void 0 : context.url, 'dbf')));
   if (dbfResponse !== null && dbfResponse !== void 0 && dbfResponse.ok) {
-    properties = await parseFromContext(dbfResponse, DBFLoader, {
+    propertyTable = await parseFromContext(dbfResponse, DBFLoader, {
       dbf: {
+        shape: 'object-row-table',
         encoding: cpg || 'latin1'
       }
     }, context);
   }
-  let features = joinProperties(geojsonGeometries, properties);
+  let features = joinProperties(geojsonGeometries, ((_propertyTable = propertyTable) === null || _propertyTable === void 0 ? void 0 : _propertyTable.data) || []);
   if (reproject) {
     features = reprojectFeatures(features, prj, _targetCrs);
   }
-  return {
-    encoding: cpg,
-    prj,
-    shx,
-    header,
-    data: features
-  };
+  switch (options === null || options === void 0 ? void 0 : (_options$shapefile = options.shapefile) === null || _options$shapefile === void 0 ? void 0 : _options$shapefile.shape) {
+    case 'geojson-table':
+      return {
+        shape: 'geojson-table',
+        type: 'FeatureCollection',
+        encoding: cpg,
+        schema: ((_propertyTable2 = propertyTable) === null || _propertyTable2 === void 0 ? void 0 : _propertyTable2.schema) || {
+          metadata: {},
+          fields: []
+        },
+        prj,
+        shx,
+        header,
+        features
+      };
+    default:
+      return {
+        encoding: cpg,
+        prj,
+        shx,
+        header,
+        data: features
+      };
+  }
 }
 function parseGeometries(geometries) {
   const geojsonGeometries = [];

package/dist/lib/parsers/parse-shapefile.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shapefile.js","names":["parseInBatchesFromContext","parseFromContext","binaryToGeometry","transformGeoJsonCoords","Proj4Projection","parseShx","zipBatchIterators","SHPLoader","DBFLoader","parseShapefileInBatches","asyncIterator","options","context","_shapeIterable$Symbol","_shapeIterable$Symbol2","reproject","_targetCrs","gis","shx","cpg","prj","loadShapefileSidecarFiles","shapeIterable","shapeIterator","Symbol","call","iterator","propertyIterator","dbfResponse","fetch","replaceExtension","url","ok","_propertyIterable$Sym","propertyIterable","dbf","encoding","shapeHeader","next","value","batchType","dbfHeader","zippedIterator","zippedBatchIterable","batch","geometries","properties","data","geojsonGeometries","parseGeometries","features","joinProperties","reprojectFeatures","header","parseShapefile","arrayBuffer","geom","push","i","length","geometry","feature","type","sourceCrs","targetCrs","projection","from","to","coord","project","shxPromise","cpgPromise","prjPromise","Promise","all","shxResponse","cpgResponse","text","prjResponse","newExtension","baseName","basename","extension","extname","isUpperCase","toUpperCase","extIndex","lastIndexOf","substr"],"sources":["../../../src/lib/parsers/parse-shapefile.ts"],"sourcesContent":["// import type {Feature} from '@loaders.gl/gis';\nimport {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';\nimport {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';\nimport type {BinaryGeometry, Geometry, ObjectRowTableBatch} from '@loaders.gl/schema';\nimport {Proj4Projection} from '@math.gl/proj4';\n\nimport type {SHXOutput} from './parse-shx';\nimport type {SHPHeader} from './parse-shp-header';\nimport type {ShapefileLoaderOptions} from './types';\nimport {parseShx} from './parse-shx';\nimport {zipBatchIterators} from '../streaming/zip-batch-iterators';\nimport {SHPLoader} from '../../shp-loader';\nimport {DBFLoader} from '../../dbf-loader';\n\ntype Feature = any;\ninterface ShapefileOutput {\n  encoding?: string;\n  prj?: string;\n  shx?: SHXOutput;\n  header: SHPHeader;\n  data: object[];\n}\n/**\n * Parsing of file in batches\n */\n// eslint-disable-next-line max-statements, complexity\nexport async function* parseShapefileInBatches(\n  asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): AsyncIterable<ShapefileOutput> {\n  const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n  const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n  // parse geometries\n  const shapeIterable = await parseInBatchesFromContext(\n    asyncIterator,\n    SHPLoader,\n    options,\n    context!\n  );\n\n  const shapeIterator: AsyncIterator<any> =\n    shapeIterable[Symbol.asyncIterator]?.() || shapeIterable[Symbol.iterator]?.();\n\n  // parse properties\n  let propertyIterator: AsyncIterator<any> | null = null;\n  const dbfResponse = await context?.fetch(replaceExtension(context?.url || '', 'dbf'));\n  if (dbfResponse?.ok) {\n    const propertyIterable = await parseInBatchesFromContext(\n      dbfResponse,\n      DBFLoader,\n      {\n        ...options,\n        dbf: {encoding: cpg || 'latin1'}\n      },\n      context!\n    );\n    propertyIterator =\n      propertyIterable[Symbol.asyncIterator]?.() || propertyIterable[Symbol.iterator]();\n  }\n\n  // When `options.metadata` is `true`, there's an extra initial `metadata`\n  // object before the iterator starts. zipBatchIterators expects to receive\n  // batches of Array objects, and will fail with non-iterable batches, so it's\n  // important to skip over the first batch.\n  let shapeHeader = (await shapeIterator.next()).value;\n  if (shapeHeader && shapeHeader.batchType === 'metadata') {\n    shapeHeader = (await shapeIterator.next()).value;\n  }\n\n  let dbfHeader: {batchType?: string} = {};\n  if (propertyIterator) {\n    dbfHeader = (await propertyIterator.next()).value;\n    if (dbfHeader && dbfHeader.batchType === 'metadata') {\n      dbfHeader = (await propertyIterator.next()).value;\n    }\n  }\n\n  const zippedIterator: AsyncIterator<ObjectRowTableBatch> = propertyIterator\n    ? zipBatchIterators(shapeIterator, propertyIterator, 'object-row-table')\n    : shapeIterator;\n\n  const zippedBatchIterable: AsyncIterable<ObjectRowTableBatch> = {\n    [Symbol.asyncIterator]() {\n      return zippedIterator;\n    }\n  };\n\n  for await (const batch of zippedBatchIterable) {\n    let geometries: any;\n    let properties: any;\n    if (!propertyIterator) {\n      geometries = batch;\n    } else {\n      [geometries, properties] = batch.data;\n    }\n\n    const geojsonGeometries = parseGeometries(geometries);\n    let features = joinProperties(geojsonGeometries, properties);\n    if (reproject) {\n      // @ts-ignore\n      features = reprojectFeatures(features, prj, _targetCrs);\n    }\n    yield {\n      encoding: cpg,\n      prj,\n      shx,\n      header: shapeHeader,\n      data: features\n    };\n  }\n}\n\n/**\n * Parse shapefile\n *\n * @param arrayBuffer\n * @param options\n * @param context\n * @returns output of shapefile\n */\nexport async function parseShapefile(\n  arrayBuffer: ArrayBuffer,\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): Promise<ShapefileOutput> {\n  const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n  const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n  // parse geometries\n  const {header, geometries} = await parseFromContext(arrayBuffer, SHPLoader, options, context!); // {shp: shx}\n\n  const geojsonGeometries = parseGeometries(geometries);\n\n  // parse properties\n  let properties = [];\n\n  const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));\n  if (dbfResponse?.ok) {\n    properties = await parseFromContext(\n      dbfResponse as any,\n      DBFLoader,\n      {dbf: {encoding: cpg || 'latin1'}},\n      context!\n    );\n  }\n\n  let features = joinProperties(geojsonGeometries, properties);\n  if (reproject) {\n    features = reprojectFeatures(features, prj, _targetCrs);\n  }\n\n  return {\n    encoding: cpg,\n    prj,\n    shx,\n    header,\n    data: features\n  };\n}\n\n/**\n * Parse geometries\n *\n * @param geometries\n * @returns geometries as an array\n */\nfunction parseGeometries(geometries: BinaryGeometry[]): Geometry[] {\n  const geojsonGeometries: any[] = [];\n  for (const geom of geometries) {\n    geojsonGeometries.push(binaryToGeometry(geom));\n  }\n  return geojsonGeometries;\n}\n\n/**\n * Join properties and geometries into features\n *\n * @param geometries [description]\n * @param  properties [description]\n * @return [description]\n */\nfunction joinProperties(geometries: Geometry[], properties: object[]): Feature[] {\n  const features: Feature[] = [];\n  for (let i = 0; i < geometries.length; i++) {\n    const geometry = geometries[i];\n    const feature: Feature = {\n      type: 'Feature',\n      geometry,\n      // properties can be undefined if dbfResponse above was empty\n      properties: (properties && properties[i]) || {}\n    };\n    features.push(feature);\n  }\n\n  return features;\n}\n\n/**\n * Reproject GeoJSON features to output CRS\n *\n * @param features parsed GeoJSON features\n * @param sourceCrs source coordinate reference system\n * @param targetCrs †arget coordinate reference system\n * @return Reprojected Features\n */\nfunction reprojectFeatures(features: Feature[], sourceCrs?: string, targetCrs?: string): Feature[] {\n  if (!sourceCrs && !targetCrs) {\n    return features;\n  }\n\n  const projection = new Proj4Projection({from: sourceCrs || 'WGS84', to: targetCrs || 'WGS84'});\n  return transformGeoJsonCoords(features, (coord) => projection.project(coord));\n}\n\n/**\n *\n * @param options\n * @param context\n * @returns Promise\n */\n// eslint-disable-next-line max-statements\nexport async function loadShapefileSidecarFiles(\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): Promise<{\n  shx?: SHXOutput;\n  cpg?: string;\n  prj?: string;\n}> {\n  // Attempt a parallel load of the small sidecar files\n  // @ts-ignore context must be defined\n  const {url, fetch} = context;\n  const shxPromise = fetch(replaceExtension(url, 'shx'));\n  const cpgPromise = fetch(replaceExtension(url, 'cpg'));\n  const prjPromise = fetch(replaceExtension(url, 'prj'));\n  await Promise.all([shxPromise, cpgPromise, prjPromise]);\n\n  let shx: SHXOutput | undefined;\n  let cpg: string | undefined;\n  let prj: string | undefined;\n\n  const shxResponse = await shxPromise;\n  if (shxResponse.ok) {\n    const arrayBuffer = await shxResponse.arrayBuffer();\n    shx = parseShx(arrayBuffer);\n  }\n\n  const cpgResponse = await cpgPromise;\n  if (cpgResponse.ok) {\n    cpg = await cpgResponse.text();\n  }\n\n  const prjResponse = await prjPromise;\n  if (prjResponse.ok) {\n    prj = await prjResponse.text();\n  }\n\n  return {\n    shx,\n    cpg,\n    prj\n  };\n}\n\n/**\n * Replace the extension at the end of a path.\n *\n * Matches the case of new extension with the case of the original file extension,\n * to increase the chance of finding files without firing off a request storm looking for various case combinations\n *\n * NOTE: Extensions can be both lower and uppercase\n * per spec, extensions should be lower case, but that doesn't mean they always are. See:\n * calvinmetcalf/shapefile-js#64, mapserver/mapserver#4712\n * https://trac.osgeo.org/mapserver/ticket/166\n */\nexport function replaceExtension(url: string, newExtension: string): string {\n  const baseName = basename(url);\n  const extension = extname(url);\n  const isUpperCase = extension === extension.toUpperCase();\n  if (isUpperCase) {\n    newExtension = newExtension.toUpperCase();\n  }\n  return `${baseName}.${newExtension}`;\n}\n\n// NOTE - this gives the entire path minus extension (i.e. NOT same as path.basename)\n/**\n * @param url\n * @returns string\n */\nfunction basename(url: string): string {\n  const extIndex = url && url.lastIndexOf('.');\n  if (typeof extIndex === 'number') {\n    return extIndex >= 0 ? url.substr(0, extIndex) : '';\n  }\n  return extIndex;\n}\n/**\n * @param url\n * @returns string\n */\nfunction extname(url: string): string {\n  const extIndex = url && url.lastIndexOf('.');\n  if (typeof extIndex === 'number') {\n    return extIndex >= 0 ? url.substr(extIndex + 1) : '';\n  }\n  return extIndex;\n}\n"],"mappings":"AACA,SAAuBA,yBAAyB,EAAEC,gBAAgB,QAAO,0BAA0B;AACnG,SAAQC,gBAAgB,EAAEC,sBAAsB,QAAO,iBAAiB;AAExE,SAAQC,eAAe,QAAO,gBAAgB;AAAC,SAKvCC,QAAQ;AAAA,SACRC,iBAAiB;AAAA,SACjBC,SAAS;AAAA,SACTC,SAAS;AAcjB,OAAO,gBAAgBC,uBAAuBA,CAC5CC,aAAiE,EACjEC,OAAgC,EAChCC,OAAuB,EACS;EAAA,IAAAC,qBAAA,EAAAC,sBAAA;EAChC,MAAM;IAACC,SAAS,GAAG,KAAK;IAAEC,UAAU,GAAG;EAAO,CAAC,GAAG,CAAAL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,GAAG,KAAI,CAAC,CAAC;EACpE,MAAM;IAACC,GAAG;IAAEC,GAAG;IAAEC;EAAG,CAAC,GAAG,MAAMC,yBAAyB,CAACV,OAAO,EAAEC,OAAO,CAAC;EAGzE,MAAMU,aAAa,GAAG,MAAMtB,yBAAyB,CACnDU,aAAa,EACbH,SAAS,EACTI,OAAO,EACPC,OACF,CAAC;EAED,MAAMW,aAAiC,GACrC,EAAAV,qBAAA,GAAAS,aAAa,CAACE,MAAM,CAACd,aAAa,CAAC,cAAAG,qBAAA,uBAAnCA,qBAAA,CAAAY,IAAA,CAAAH,aAAsC,CAAC,OAAAR,sBAAA,GAAIQ,aAAa,CAACE,MAAM,CAACE,QAAQ,CAAC,cAAAZ,sBAAA,uBAA9BA,sBAAA,CAAAW,IAAA,CAAAH,aAAiC,CAAC;EAG/E,IAAIK,gBAA2C,GAAG,IAAI;EACtD,MAAMC,WAAW,GAAG,OAAMhB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiB,KAAK,CAACC,gBAAgB,CAAC,CAAAlB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEmB,GAAG,KAAI,EAAE,EAAE,KAAK,CAAC,CAAC;EACrF,IAAIH,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAEI,EAAE,EAAE;IAAA,IAAAC,qBAAA;IACnB,MAAMC,gBAAgB,GAAG,MAAMlC,yBAAyB,CACtD4B,WAAW,EACXpB,SAAS,EACT;MACE,GAAGG,OAAO;MACVwB,GAAG,EAAE;QAACC,QAAQ,EAAEjB,GAAG,IAAI;MAAQ;IACjC,CAAC,EACDP,OACF,CAAC;IACDe,gBAAgB,GACd,EAAAM,qBAAA,GAAAC,gBAAgB,CAACV,MAAM,CAACd,aAAa,CAAC,cAAAuB,qBAAA,uBAAtCA,qBAAA,CAAAR,IAAA,CAAAS,gBAAyC,CAAC,KAAIA,gBAAgB,CAACV,MAAM,CAACE,QAAQ,CAAC,CAAC,CAAC;EACrF;EAMA,IAAIW,WAAW,GAAG,CAAC,MAAMd,aAAa,CAACe,IAAI,CAAC,CAAC,EAAEC,KAAK;EACpD,IAAIF,WAAW,IAAIA,WAAW,CAACG,SAAS,KAAK,UAAU,EAAE;IACvDH,WAAW,GAAG,CAAC,MAAMd,aAAa,CAACe,IAAI,CAAC,CAAC,EAAEC,KAAK;EAClD;EAEA,IAAIE,SAA+B,GAAG,CAAC,CAAC;EACxC,IAAId,gBAAgB,EAAE;IACpBc,SAAS,GAAG,CAAC,MAAMd,gBAAgB,CAACW,IAAI,CAAC,CAAC,EAAEC,KAAK;IACjD,IAAIE,SAAS,IAAIA,SAAS,CAACD,SAAS,KAAK,UAAU,EAAE;MACnDC,SAAS,GAAG,CAAC,MAAMd,gBAAgB,CAACW,IAAI,CAAC,CAAC,EAAEC,KAAK;IACnD;EACF;EAEA,MAAMG,cAAkD,GAAGf,gBAAgB,GACvErB,iBAAiB,CAACiB,aAAa,EAAEI,gBAAgB,EAAE,kBAAkB,CAAC,GACtEJ,aAAa;EAEjB,MAAMoB,mBAAuD,GAAG;IAC9D,CAACnB,MAAM,CAACd,aAAa,IAAI;MACvB,OAAOgC,cAAc;IACvB;EACF,CAAC;EAED,WAAW,MAAME,KAAK,IAAID,mBAAmB,EAAE;IAC7C,IAAIE,UAAe;IACnB,IAAIC,UAAe;IACnB,IAAI,CAACnB,gBAAgB,EAAE;MACrBkB,UAAU,GAAGD,KAAK;IACpB,CAAC,MAAM;MACL,CAACC,UAAU,EAAEC,UAAU,CAAC,GAAGF,KAAK,CAACG,IAAI;IACvC;IAEA,MAAMC,iBAAiB,GAAGC,eAAe,CAACJ,UAAU,CAAC;IACrD,IAAIK,QAAQ,GAAGC,cAAc,CAACH,iBAAiB,EAAEF,UAAU,CAAC;IAC5D,IAAI/B,SAAS,EAAE;MAEbmC,QAAQ,GAAGE,iBAAiB,CAACF,QAAQ,EAAE9B,GAAG,EAAEJ,UAAU,CAAC;IACzD;IACA,MAAM;MACJoB,QAAQ,EAAEjB,GAAG;MACbC,GAAG;MACHF,GAAG;MACHmC,MAAM,EAAEhB,WAAW;MACnBU,IAAI,EAAEG;IACR,CAAC;EACH;AACF;AAUA,OAAO,eAAeI,cAAcA,CAClCC,WAAwB,EACxB5C,OAAgC,EAChCC,OAAuB,EACG;EAC1B,MAAM;IAACG,SAAS,GAAG,KAAK;IAAEC,UAAU,GAAG;EAAO,CAAC,GAAG,CAAAL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEM,GAAG,KAAI,CAAC,CAAC;EACpE,MAAM;IAACC,GAAG;IAAEC,GAAG;IAAEC;EAAG,CAAC,GAAG,MAAMC,yBAAyB,CAACV,OAAO,EAAEC,OAAO,CAAC;EAGzE,MAAM;IAACyC,MAAM;IAAER;EAAU,CAAC,GAAG,MAAM5C,gBAAgB,CAACsD,WAAW,EAAEhD,SAAS,EAAEI,OAAO,EAAEC,OAAQ,CAAC;EAE9F,MAAMoC,iBAAiB,GAAGC,eAAe,CAACJ,UAAU,CAAC;EAGrD,IAAIC,UAAU,GAAG,EAAE;EAEnB,MAAMlB,WAAW,GAAG,OAAMhB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEiB,KAAK,CAACC,gBAAgB,CAAClB,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEmB,GAAG,EAAG,KAAK,CAAC,CAAC;EAChF,IAAIH,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAEI,EAAE,EAAE;IACnBc,UAAU,GAAG,MAAM7C,gBAAgB,CACjC2B,WAAW,EACXpB,SAAS,EACT;MAAC2B,GAAG,EAAE;QAACC,QAAQ,EAAEjB,GAAG,IAAI;MAAQ;IAAC,CAAC,EAClCP,OACF,CAAC;EACH;EAEA,IAAIsC,QAAQ,GAAGC,cAAc,CAACH,iBAAiB,EAAEF,UAAU,CAAC;EAC5D,IAAI/B,SAAS,EAAE;IACbmC,QAAQ,GAAGE,iBAAiB,CAACF,QAAQ,EAAE9B,GAAG,EAAEJ,UAAU,CAAC;EACzD;EAEA,OAAO;IACLoB,QAAQ,EAAEjB,GAAG;IACbC,GAAG;IACHF,GAAG;IACHmC,MAAM;IACNN,IAAI,EAAEG;EACR,CAAC;AACH;AAQA,SAASD,eAAeA,CAACJ,UAA4B,EAAc;EACjE,MAAMG,iBAAwB,GAAG,EAAE;EACnC,KAAK,MAAMQ,IAAI,IAAIX,UAAU,EAAE;IAC7BG,iBAAiB,CAACS,IAAI,CAACvD,gBAAgB,CAACsD,IAAI,CAAC,CAAC;EAChD;EACA,OAAOR,iBAAiB;AAC1B;AASA,SAASG,cAAcA,CAACN,UAAsB,EAAEC,UAAoB,EAAa;EAC/E,MAAMI,QAAmB,GAAG,EAAE;EAC9B,KAAK,IAAIQ,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGb,UAAU,CAACc,MAAM,EAAED,CAAC,EAAE,EAAE;IAC1C,MAAME,QAAQ,GAAGf,UAAU,CAACa,CAAC,CAAC;IAC9B,MAAMG,OAAgB,GAAG;MACvBC,IAAI,EAAE,SAAS;MACfF,QAAQ;MAERd,UAAU,EAAGA,UAAU,IAAIA,UAAU,CAACY,CAAC,CAAC,IAAK,CAAC;IAChD,CAAC;IACDR,QAAQ,CAACO,IAAI,CAACI,OAAO,CAAC;EACxB;EAEA,OAAOX,QAAQ;AACjB;AAUA,SAASE,iBAAiBA,CAACF,QAAmB,EAAEa,SAAkB,EAAEC,SAAkB,EAAa;EACjG,IAAI,CAACD,SAAS,IAAI,CAACC,SAAS,EAAE;IAC5B,OAAOd,QAAQ;EACjB;EAEA,MAAMe,UAAU,GAAG,IAAI7D,eAAe,CAAC;IAAC8D,IAAI,EAAEH,SAAS,IAAI,OAAO;IAAEI,EAAE,EAAEH,SAAS,IAAI;EAAO,CAAC,CAAC;EAC9F,OAAO7D,sBAAsB,CAAC+C,QAAQ,EAAGkB,KAAK,IAAKH,UAAU,CAACI,OAAO,CAACD,KAAK,CAAC,CAAC;AAC/E;AASA,OAAO,eAAe/C,yBAAyBA,CAC7CV,OAAgC,EAChCC,OAAuB,EAKtB;EAGD,MAAM;IAACmB,GAAG;IAAEF;EAAK,CAAC,GAAGjB,OAAO;EAC5B,MAAM0D,UAAU,GAAGzC,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAMwC,UAAU,GAAG1C,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAMyC,UAAU,GAAG3C,KAAK,CAACC,gBAAgB,CAACC,GAAG,EAAE,KAAK,CAAC,CAAC;EACtD,MAAM0C,OAAO,CAACC,GAAG,CAAC,CAACJ,UAAU,EAAEC,UAAU,EAAEC,UAAU,CAAC,CAAC;EAEvD,IAAItD,GAA0B;EAC9B,IAAIC,GAAuB;EAC3B,IAAIC,GAAuB;EAE3B,MAAMuD,WAAW,GAAG,MAAML,UAAU;EACpC,IAAIK,WAAW,CAAC3C,EAAE,EAAE;IAClB,MAAMuB,WAAW,GAAG,MAAMoB,WAAW,CAACpB,WAAW,CAAC,CAAC;IACnDrC,GAAG,GAAGb,QAAQ,CAACkD,WAAW,CAAC;EAC7B;EAEA,MAAMqB,WAAW,GAAG,MAAML,UAAU;EACpC,IAAIK,WAAW,CAAC5C,EAAE,EAAE;IAClBb,GAAG,GAAG,MAAMyD,WAAW,CAACC,IAAI,CAAC,CAAC;EAChC;EAEA,MAAMC,WAAW,GAAG,MAAMN,UAAU;EACpC,IAAIM,WAAW,CAAC9C,EAAE,EAAE;IAClBZ,GAAG,GAAG,MAAM0D,WAAW,CAACD,IAAI,CAAC,CAAC;EAChC;EAEA,OAAO;IACL3D,GAAG;IACHC,GAAG;IACHC;EACF,CAAC;AACH;AAaA,OAAO,SAASU,gBAAgBA,CAACC,GAAW,EAAEgD,YAAoB,EAAU;EAC1E,MAAMC,QAAQ,GAAGC,QAAQ,CAAClD,GAAG,CAAC;EAC9B,MAAMmD,SAAS,GAAGC,OAAO,CAACpD,GAAG,CAAC;EAC9B,MAAMqD,WAAW,GAAGF,SAAS,KAAKA,SAAS,CAACG,WAAW,CAAC,CAAC;EACzD,IAAID,WAAW,EAAE;IACfL,YAAY,GAAGA,YAAY,CAACM,WAAW,CAAC,CAAC;EAC3C;EACA,OAAQ,GAAEL,QAAS,IAAGD,YAAa,EAAC;AACtC;AAOA,SAASE,QAAQA,CAAClD,GAAW,EAAU;EACrC,MAAMuD,QAAQ,GAAGvD,GAAG,IAAIA,GAAG,CAACwD,WAAW,CAAC,GAAG,CAAC;EAC5C,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ,IAAI,CAAC,GAAGvD,GAAG,CAACyD,MAAM,CAAC,CAAC,EAAEF,QAAQ,CAAC,GAAG,EAAE;EACrD;EACA,OAAOA,QAAQ;AACjB;AAKA,SAASH,OAAOA,CAACpD,GAAW,EAAU;EACpC,MAAMuD,QAAQ,GAAGvD,GAAG,IAAIA,GAAG,CAACwD,WAAW,CAAC,GAAG,CAAC;EAC5C,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAOA,QAAQ,IAAI,CAAC,GAAGvD,GAAG,CAACyD,MAAM,CAACF,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE;EACtD;EACA,OAAOA,QAAQ;AACjB"}
+{"version":3,"file":"parse-shapefile.js","names":["parseInBatchesFromContext","parseFromContext","binaryToGeometry","transformGeoJsonCoords","Proj4Projection","parseShx","zipBatchIterators","SHPLoader","DBFLoader","parseShapefileInBatches","asyncIterator","options","context","_shapeIterable$Symbol","_shapeIterable$Symbol2","reproject","_targetCrs","gis","shx","cpg","prj","loadShapefileSidecarFiles","shapeIterable","shapeIterator","Symbol","call","iterator","propertyIterator","dbfResponse","fetch","replaceExtension","url","ok","_propertyIterable$Sym","propertyIterable","dbf","encoding","shapeHeader","next","value","batchType","dbfHeader","zippedIterator","zippedBatchIterable","batch","geometries","properties","data","geojsonGeometries","parseGeometries","features","joinProperties","reprojectFeatures","header","parseShapefile","arrayBuffer","_propertyTable","_options$shapefile","_propertyTable2","propertyTable","shape","shapefile","type","schema","metadata","fields","geom","push","i","length","geometry","feature","sourceCrs","targetCrs","projection","from","to","coord","project","shxPromise","cpgPromise","prjPromise","Promise","all","shxResponse","cpgResponse","text","prjResponse","newExtension","baseName","basename","extension","extname","isUpperCase","toUpperCase","extIndex","lastIndexOf","substr"],"sources":["../../../src/lib/parsers/parse-shapefile.ts"],"sourcesContent":["// import type {Feature} from '@loaders.gl/gis';\nimport {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';\nimport {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';\nimport type {\n  BinaryGeometry,\n  Geometry,\n  ObjectRowTable,\n  ObjectRowTableBatch\n} from '@loaders.gl/schema';\nimport {Proj4Projection} from '@math.gl/proj4';\n\nimport type {SHXOutput} from './parse-shx';\nimport type {SHPHeader} from './parse-shp-header';\nimport type {ShapefileLoaderOptions} from './types';\nimport {parseShx} from './parse-shx';\nimport {zipBatchIterators} from '../streaming/zip-batch-iterators';\nimport {SHPLoader} from '../../shp-loader';\nimport {DBFLoader} from '../../dbf-loader';\n\ntype Feature = any;\ninterface ShapefileOutput {\n  encoding?: string;\n  prj?: string;\n  shx?: SHXOutput;\n  header: SHPHeader;\n  data: object[];\n}\n/**\n * Parsing of file in batches\n */\n// eslint-disable-next-line max-statements, complexity\nexport async function* parseShapefileInBatches(\n  asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): AsyncIterable<ShapefileOutput> {\n  const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n  const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n  // parse geometries\n  const shapeIterable = await parseInBatchesFromContext(\n    asyncIterator,\n    SHPLoader,\n    options,\n    context!\n  );\n\n  const shapeIterator: AsyncIterator<any> =\n    shapeIterable[Symbol.asyncIterator]?.() || shapeIterable[Symbol.iterator]?.();\n\n  // parse properties\n  let propertyIterator: AsyncIterator<any> | null = null;\n  const dbfResponse = await context?.fetch(replaceExtension(context?.url || '', 'dbf'));\n  if (dbfResponse?.ok) {\n    const propertyIterable = await parseInBatchesFromContext(\n      dbfResponse,\n      DBFLoader,\n      {\n        ...options,\n        dbf: {encoding: cpg || 'latin1'}\n      },\n      context!\n    );\n    propertyIterator =\n      propertyIterable[Symbol.asyncIterator]?.() || propertyIterable[Symbol.iterator]();\n  }\n\n  // When `options.metadata` is `true`, there's an extra initial `metadata`\n  // object before the iterator starts. zipBatchIterators expects to receive\n  // batches of Array objects, and will fail with non-iterable batches, so it's\n  // important to skip over the first batch.\n  let shapeHeader = (await shapeIterator.next()).value;\n  if (shapeHeader && shapeHeader.batchType === 'metadata') {\n    shapeHeader = (await shapeIterator.next()).value;\n  }\n\n  let dbfHeader: {batchType?: string} = {};\n  if (propertyIterator) {\n    dbfHeader = (await propertyIterator.next()).value;\n    if (dbfHeader && dbfHeader.batchType === 'metadata') {\n      dbfHeader = (await propertyIterator.next()).value;\n    }\n  }\n\n  const zippedIterator: AsyncIterator<ObjectRowTableBatch> = propertyIterator\n    ? zipBatchIterators(shapeIterator, propertyIterator, 'object-row-table')\n    : shapeIterator;\n\n  const zippedBatchIterable: AsyncIterable<ObjectRowTableBatch> = {\n    [Symbol.asyncIterator]() {\n      return zippedIterator;\n    }\n  };\n\n  for await (const batch of zippedBatchIterable) {\n    let geometries: any;\n    let properties: any;\n    if (!propertyIterator) {\n      geometries = batch;\n    } else {\n      [geometries, properties] = batch.data;\n    }\n\n    const geojsonGeometries = parseGeometries(geometries);\n    let features = joinProperties(geojsonGeometries, properties);\n    if (reproject) {\n      // @ts-ignore\n      features = reprojectFeatures(features, prj, _targetCrs);\n    }\n    yield {\n      encoding: cpg,\n      prj,\n      shx,\n      header: shapeHeader,\n      data: features\n    };\n  }\n}\n\n/**\n * Parse shapefile\n *\n * @param arrayBuffer\n * @param options\n * @param context\n * @returns output of shapefile\n */\nexport async function parseShapefile(\n  arrayBuffer: ArrayBuffer,\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): Promise<ShapefileOutput> {\n  const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};\n  const {shx, cpg, prj} = await loadShapefileSidecarFiles(options, context);\n\n  // parse geometries\n  const {header, geometries} = await parseFromContext(arrayBuffer, SHPLoader, options, context!); // {shp: shx}\n\n  const geojsonGeometries = parseGeometries(geometries);\n\n  // parse properties\n  let propertyTable: ObjectRowTable | undefined;\n\n  const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));\n  if (dbfResponse?.ok) {\n    propertyTable = await parseFromContext(\n      dbfResponse as any,\n      DBFLoader,\n      {dbf: {shape: 'object-row-table', encoding: cpg || 'latin1'}},\n      context!\n    );\n  }\n\n  let features = joinProperties(geojsonGeometries, propertyTable?.data || []);\n  if (reproject) {\n    features = reprojectFeatures(features, prj, _targetCrs);\n  }\n\n  switch (options?.shapefile?.shape) {\n    case 'geojson-table':\n      return {\n        // @ts-expect-error\n        shape: 'geojson-table',\n        type: 'FeatureCollection',\n        encoding: cpg,\n        schema: propertyTable?.schema || {metadata: {}, fields: []},\n        prj,\n        shx,\n        header,\n        features\n      };\n    default:\n      return {\n        encoding: cpg,\n        prj,\n        shx,\n        header,\n        data: features\n      };\n  }\n}\n\n/**\n * Parse geometries\n *\n * @param geometries\n * @returns geometries as an array\n */\nfunction parseGeometries(geometries: BinaryGeometry[]): Geometry[] {\n  const geojsonGeometries: any[] = [];\n  for (const geom of geometries) {\n    geojsonGeometries.push(binaryToGeometry(geom));\n  }\n  return geojsonGeometries;\n}\n\n/**\n * Join properties and geometries into features\n *\n * @param geometries [description]\n * @param  properties [description]\n * @return [description]\n */\nfunction joinProperties(geometries: Geometry[], properties: object[]): Feature[] {\n  const features: Feature[] = [];\n  for (let i = 0; i < geometries.length; i++) {\n    const geometry = geometries[i];\n    const feature: Feature = {\n      type: 'Feature',\n      geometry,\n      // properties can be undefined if dbfResponse above was empty\n      properties: (properties && properties[i]) || {}\n    };\n    features.push(feature);\n  }\n\n  return features;\n}\n\n/**\n * Reproject GeoJSON features to output CRS\n *\n * @param features parsed GeoJSON features\n * @param sourceCrs source coordinate reference system\n * @param targetCrs †arget coordinate reference system\n * @return Reprojected Features\n */\nfunction reprojectFeatures(features: Feature[], sourceCrs?: string, targetCrs?: string): Feature[] {\n  if (!sourceCrs && !targetCrs) {\n    return features;\n  }\n\n  const projection = new Proj4Projection({from: sourceCrs || 'WGS84', to: targetCrs || 'WGS84'});\n  return transformGeoJsonCoords(features, (coord) => projection.project(coord));\n}\n\n/**\n *\n * @param options\n * @param context\n * @returns Promise\n */\n// eslint-disable-next-line max-statements\nexport async function loadShapefileSidecarFiles(\n  options?: ShapefileLoaderOptions,\n  context?: LoaderContext\n): Promise<{\n  shx?: SHXOutput;\n  cpg?: string;\n  prj?: string;\n}> {\n  // Attempt a parallel load of the small sidecar files\n  // @ts-ignore context must be defined\n  const {url, fetch} = context;\n  const shxPromise = fetch(replaceExtension(url, 'shx'));\n  const cpgPromise = fetch(replaceExtension(url, 'cpg'));\n  const prjPromise = fetch(replaceExtension(url, 'prj'));\n  await Promise.all([shxPromise, cpgPromise, prjPromise]);\n\n  let shx: SHXOutput | undefined;\n  let cpg: string | undefined;\n  let prj: string | undefined;\n\n  const shxResponse = await shxPromise;\n  if (shxResponse.ok) {\n    const arrayBuffer = await shxResponse.arrayBuffer();\n    shx = parseShx(arrayBuffer);\n  }\n\n  const cpgResponse = await cpgPromise;\n  if (cpgResponse.ok) {\n    cpg = await cpgResponse.text();\n  }\n\n  const prjResponse = await prjPromise;\n  if (prjResponse.ok) {\n    prj = await prjResponse.text();\n  }\n\n  return {\n    shx,\n    cpg,\n    prj\n  };\n}\n\n/**\n * Replace the extension at the end of a path.\n *\n * Matches the case of new extension with the case of the original file extension,\n * to increase the chance of finding files without firing off a request storm looking for various case combinations\n *\n * NOTE: Extensions can be both lower and uppercase\n * per spec, extensions should be lower case, but that doesn't mean they always are. See:\n * calvinmetcalf/shapefile-js#64, mapserver/mapserver#4712\n * https://trac.osgeo.org/mapserver/ticket/166\n */\nexport function replaceExtension(url: string, newExtension: string): string {\n  const baseName = basename(url);\n  const extension = extname(url);\n  const isUpperCase = extension === extension.toUpperCase();\n  if (isUpperCase) {\n    newExtension = newExtension.toUpperCase();\n  }\n  return `${baseName}.${newExtension}`;\n}\n\n// NOTE - this gives the entire path minus extension (i.e. NOT same as path.basename)\n/**\n * @param url\n * @returns string\n */\nfunction basename(url: string): string {\n  const extIndex = url && url.lastIndexOf('.');\n  if (typeof extIndex === 'number') {\n    return extIndex >= 0 ? url.substr(0, extIndex) : '';\n  }\n  return extIndex;\n}\n/**\n * @param url\n * @returns string\n */\nfunction extname(url: string): string {\n  const extIndex = url && url.lastIndexOf('.');\n  if (typeof extIndex === 'number') {\n    return extIndex >= 0 ? url.substr(extIndex + 1) : '';\n  }\n  return extIndex;\n}\n"],"mappings":"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"}

package/dist/shapefile-loader.d.ts

@@ -1,7 +1,13 @@
 import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import { Batch, GeoJSONTable } from '@loaders.gl/schema';
+export type ShapefileLoaderOptions = LoaderOptions & {
+    shapefile?: {
+        shape?: 'geojson-table' | 'v3';
+    };
+};
 /**
  * Shapefile loader
  * @note Shapefile is multifile format and requires providing additional files
  */
-export declare const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions>;
+export declare const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions>;
 //# sourceMappingURL=shapefile-loader.d.ts.map

package/dist/shapefile-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shapefile-loader.d.ts","sourceRoot":"","sources":["../src/shapefile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ9E;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAiBrE,CAAC"}
+{"version":3,"file":"shapefile-loader.d.ts","sourceRoot":"","sources":["../src/shapefile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAC,KAAK,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAMvD,MAAM,MAAM,sBAAsB,GAAG,aAAa,GAAG;IACnD,SAAS,CAAC,EAAE;QACV,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;KAChC,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,YAAY,EAAE,KAAK,EAAE,sBAAsB,CAqBzF,CAAC"}

package/dist/shapefile-loader.js

@@ -11,7 +11,9 @@ export const ShapefileLoader = {
   mimeTypes: ['application/octet-stream'],
   tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],
   options: {
-    shapefile: {},
+    shapefile: {
+      shape: 'v3'
+    },
     shp: {
       _maxDimensions: 4
     }

package/dist/shapefile-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"shapefile-loader.js","names":["SHP_MAGIC_NUMBER","parseShapefile","parseShapefileInBatches","VERSION","__VERSION__","ShapefileLoader","name","id","module","version","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shapefile","shp","_maxDimensions","parse","parseInBatches"],"sources":["../src/shapefile-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {SHP_MAGIC_NUMBER} from './shp-loader';\nimport {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Shapefile loader\n * @note Shapefile is multifile format and requires providing additional files\n */\nexport const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {\n  name: 'Shapefile',\n  id: 'shapefile',\n  module: 'shapefile',\n  version: VERSION,\n  category: 'geometry',\n  extensions: ['shp'],\n  mimeTypes: ['application/octet-stream'],\n  tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n  options: {\n    shapefile: {},\n    shp: {\n      _maxDimensions: 4\n    }\n  },\n  parse: parseShapefile,\n  parseInBatches: parseShapefileInBatches\n};\n"],"mappings":"SACQA,gBAAgB;AAAA,SAChBC,cAAc,EAAEC,uBAAuB;AAI/C,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAM3E,OAAO,MAAMC,eAA0D,GAAG;EACxEC,IAAI,EAAE,WAAW;EACjBC,EAAE,EAAE,WAAW;EACfC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEN,OAAO;EAChBO,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACd,gBAAgB,CAAC,CAACe,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,SAAS,EAAE,CAAC,CAAC;IACbC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF,CAAC;EACDC,KAAK,EAAEnB,cAAc;EACrBoB,cAAc,EAAEnB;AAClB,CAAC"}
+{"version":3,"file":"shapefile-loader.js","names":["SHP_MAGIC_NUMBER","parseShapefile","parseShapefileInBatches","VERSION","__VERSION__","ShapefileLoader","name","id","module","version","category","extensions","mimeTypes","tests","Uint8Array","buffer","options","shapefile","shape","shp","_maxDimensions","parse","parseInBatches"],"sources":["../src/shapefile-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {SHP_MAGIC_NUMBER} from './shp-loader';\nimport {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';\nimport {Batch, GeoJSONTable} from '@loaders.gl/schema';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type ShapefileLoaderOptions = LoaderOptions & {\n  shapefile?: {\n    shape?: 'geojson-table' | 'v3';\n  };\n};\n\n/**\n * Shapefile loader\n * @note Shapefile is multifile format and requires providing additional files\n */\nexport const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions> = {\n  name: 'Shapefile',\n  id: 'shapefile',\n  module: 'shapefile',\n  version: VERSION,\n  category: 'geometry',\n  extensions: ['shp'],\n  mimeTypes: ['application/octet-stream'],\n  tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],\n  options: {\n    shapefile: {\n      shape: 'v3'\n    },\n    shp: {\n      _maxDimensions: 4\n    }\n  },\n  // @ts-expect-error\n  parse: parseShapefile,\n  // @ts-expect-error\n  parseInBatches: parseShapefileInBatches\n};\n"],"mappings":"SACQA,gBAAgB;AAAA,SAChBC,cAAc,EAAEC,uBAAuB;AAK/C,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAY3E,OAAO,MAAMC,eAA8E,GAAG;EAC5FC,IAAI,EAAE,WAAW;EACjBC,EAAE,EAAE,WAAW;EACfC,MAAM,EAAE,WAAW;EACnBC,OAAO,EAAEN,OAAO;EAChBO,QAAQ,EAAE,UAAU;EACpBC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK,EAAE,CAAC,IAAIC,UAAU,CAACd,gBAAgB,CAAC,CAACe,MAAM,CAAC;EAChDC,OAAO,EAAE;IACPC,SAAS,EAAE;MACTC,KAAK,EAAE;IACT,CAAC;IACDC,GAAG,EAAE;MACHC,cAAc,EAAE;IAClB;EACF,CAAC;EAEDC,KAAK,EAAEpB,cAAc;EAErBqB,cAAc,EAAEpB;AAClB,CAAC"}

package/dist/shp-worker.js

@@ -480,7 +480,7 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "4.0.3" : "latest";
+  var VERSION = true ? "4.1.0-alpha.1" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
     name: "SHP",
@@ -506,6 +506,9 @@
     parseInBatches: (arrayBufferIterator, options) => parseSHPInBatches(arrayBufferIterator, options)
   };
 
+  // ../worker-utils/src/lib/node/worker_threads-browser.ts
+  var parentPort = null;
+
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || /* @__PURE__ */ new Set();
@@ -543,19 +546,6 @@
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
   async function getParentPort() {
-    let parentPort;
-    try {
-      eval("globalThis.parentPort = require('worker_threads').parentPort");
-      parentPort = globalThis.parentPort;
-    } catch {
-      try {
-        eval("globalThis.workerThreadsPromise = import('worker_threads')");
-        const workerThreads = await globalThis.workerThreadsPromise;
-        parentPort = workerThreads.parentPort;
-      } catch (error) {
-        console.error(error.message);
-      }
-    }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "4.0.3",
+  "version": "4.1.0-alpha.1",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -44,10 +44,10 @@
     "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.3",
-    "@loaders.gl/loader-utils": "4.0.3",
-    "@loaders.gl/schema": "4.0.3",
+    "@loaders.gl/gis": "4.1.0-alpha.1",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.1",
+    "@loaders.gl/schema": "4.1.0-alpha.1",
     "@math.gl/proj4": "^4.0.0"
   },
-  "gitHead": "03c871839b36c997249dabae1844df53a35d3760"
+  "gitHead": "6a4d3da93d45115ad99861474a43c3f4a0b280a7"
 }

package/src/lib/parsers/parse-shapefile.ts

@@ -1,7 +1,12 @@
 // import type {Feature} from '@loaders.gl/gis';
 import {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';
 import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';
-import type {BinaryGeometry, Geometry, ObjectRowTableBatch} from '@loaders.gl/schema';
+import type {
+  BinaryGeometry,
+  Geometry,
+  ObjectRowTable,
+  ObjectRowTableBatch
+} from '@loaders.gl/schema';
 import {Proj4Projection} from '@math.gl/proj4';
 
 import type {SHXOutput} from './parse-shx';
@@ -134,30 +139,45 @@ export async function parseShapefile(
   const geojsonGeometries = parseGeometries(geometries);
 
   // parse properties
-  let properties = [];
+  let propertyTable: ObjectRowTable | undefined;
 
   const dbfResponse = await context?.fetch(replaceExtension(context?.url!, 'dbf'));
   if (dbfResponse?.ok) {
-    properties = await parseFromContext(
+    propertyTable = await parseFromContext(
       dbfResponse as any,
       DBFLoader,
-      {dbf: {encoding: cpg || 'latin1'}},
+      {dbf: {shape: 'object-row-table', encoding: cpg || 'latin1'}},
       context!
     );
   }
 
-  let features = joinProperties(geojsonGeometries, properties);
+  let features = joinProperties(geojsonGeometries, propertyTable?.data || []);
   if (reproject) {
     features = reprojectFeatures(features, prj, _targetCrs);
   }
 
-  return {
-    encoding: cpg,
-    prj,
-    shx,
-    header,
-    data: features
-  };
+  switch (options?.shapefile?.shape) {
+    case 'geojson-table':
+      return {
+        // @ts-expect-error
+        shape: 'geojson-table',
+        type: 'FeatureCollection',
+        encoding: cpg,
+        schema: propertyTable?.schema || {metadata: {}, fields: []},
+        prj,
+        shx,
+        header,
+        features
+      };
+    default:
+      return {
+        encoding: cpg,
+        prj,
+        shx,
+        header,
+        data: features
+      };
+  }
 }
 
 /**

package/src/shapefile-loader.ts

@@ -1,16 +1,23 @@
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {SHP_MAGIC_NUMBER} from './shp-loader';
 import {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';
+import {Batch, GeoJSONTable} from '@loaders.gl/schema';
 
 // __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';
+  };
+};
+
 /**
  * Shapefile loader
  * @note Shapefile is multifile format and requires providing additional files
  */
-export const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {
+export const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions> = {
   name: 'Shapefile',
   id: 'shapefile',
   module: 'shapefile',
@@ -20,11 +27,15 @@ export const ShapefileLoader: LoaderWithParser<any, any, LoaderOptions> = {
   mimeTypes: ['application/octet-stream'],
   tests: [new Uint8Array(SHP_MAGIC_NUMBER).buffer],
   options: {
-    shapefile: {},
+    shapefile: {
+      shape: 'v3'
+    },
     shp: {
       _maxDimensions: 4
     }
   },
+  // @ts-expect-error
   parse: parseShapefile,
+  // @ts-expect-error
   parseInBatches: parseShapefileInBatches
 };