@loaders.gl/shapefile 4.4.0-alpha.2 → 4.4.0-alpha.9

package/dist/index.cjs

@@ -33,6 +33,9 @@ __export(dist_exports, {
 });
 module.exports = __toCommonJS(dist_exports);
 
+// dist/lib/parsers/parse-shp.js
+var import_loader_utils = require("@loaders.gl/loader-utils");
+
 // dist/lib/streaming/binary-chunk-reader.js
 var BinaryChunkReader = class {
   offset;
@@ -435,7 +438,7 @@ function parseSHP(arrayBuffer, options) {
 async function* parseSHPInBatches(asyncIterator, options) {
   const parser = new SHPParser(options);
   let headerReturned = false;
-  for await (const arrayBuffer of asyncIterator) {
+  for await (const arrayBuffer of (0, import_loader_utils.toArrayBufferIterator)(asyncIterator)) {
     parser.write(arrayBuffer);
     if (!headerReturned && parser.result.header) {
       headerReturned = true;
@@ -518,7 +521,7 @@ function parseState(state, result, binaryReader, options) {
 }
 
 // dist/shp-loader.js
-var VERSION = true ? "4.4.0-alpha.1" : "latest";
+var VERSION = true ? "4.4.0-alpha.9" : "latest";
 var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
 var SHPWorkerLoader = {
   dataType: null,
@@ -547,7 +550,7 @@ var SHPLoader = {
 };
 
 // dist/lib/parsers/parse-shapefile.js
-var import_loader_utils = require("@loaders.gl/loader-utils");
+var import_loader_utils3 = require("@loaders.gl/loader-utils");
 var import_gis = require("@loaders.gl/gis");
 var import_proj4 = require("@math.gl/proj4");
 
@@ -617,6 +620,7 @@ function extractBatchData(batch1, batch2) {
 }
 
 // dist/lib/parsers/parse-dbf.js
+var import_loader_utils2 = require("@loaders.gl/loader-utils");
 var LITTLE_ENDIAN4 = true;
 var DBF_HEADER_SIZE = 32;
 var STATE2;
@@ -681,7 +685,7 @@ async function* parseDBFInBatches(asyncIterator, options = {}) {
   const { encoding = "latin1" } = options.dbf || {};
   const parser = new DBFParser({ encoding });
   let headerReturned = false;
-  for await (const arrayBuffer of asyncIterator) {
+  for await (const arrayBuffer of (0, import_loader_utils2.toArrayBufferIterator)(asyncIterator)) {
     parser.write(arrayBuffer);
     if (!headerReturned && parser.result.dbfHeader) {
       headerReturned = true;
@@ -856,7 +860,7 @@ function makeField({ name, dataType, fieldLength, decimal }) {
 }
 
 // dist/dbf-loader.js
-var VERSION2 = true ? "4.4.0-alpha.1" : "latest";
+var VERSION2 = true ? "4.4.0-alpha.9" : "latest";
 var DBFWorkerLoader = {
   name: "DBF",
   dataType: null,
@@ -888,14 +892,17 @@ async function* parseShapefileInBatches(asyncIterator, options, context) {
   var _a, _b, _c;
   const { reproject = false, _targetCrs = "WGS84" } = (options == null ? void 0 : options.gis) || {};
   const { shx, cpg, prj } = await loadShapefileSidecarFiles(options, context);
-  const shapeIterable = await (0, import_loader_utils.parseInBatchesFromContext)(asyncIterator, SHPLoader, options, context);
+  const shapeIterable = await (0, import_loader_utils3.parseInBatchesFromContext)((0, import_loader_utils3.toArrayBufferIterator)(asyncIterator), SHPLoader, options, context);
   const shapeIterator = ((_a = shapeIterable[Symbol.asyncIterator]) == null ? void 0 : _a.call(shapeIterable)) || ((_b = shapeIterable[Symbol.iterator]) == null ? void 0 : _b.call(shapeIterable));
   let propertyIterator = null;
   const dbfResponse = await (context == null ? void 0 : context.fetch(replaceExtension((context == null ? void 0 : context.url) || "", "dbf")));
   if (dbfResponse == null ? void 0 : dbfResponse.ok) {
-    const propertyIterable = await (0, import_loader_utils.parseInBatchesFromContext)(dbfResponse, DBFLoader, {
+    const propertyIterable = await (0, import_loader_utils3.parseInBatchesFromContext)(dbfResponse, DBFLoader, {
       ...options,
-      dbf: { encoding: cpg || "latin1" }
+      dbf: {
+        ...options == null ? void 0 : options.dbf,
+        encoding: cpg || "latin1"
+      }
     }, context);
     propertyIterator = ((_c = propertyIterable[Symbol.asyncIterator]) == null ? void 0 : _c.call(propertyIterable)) || propertyIterable[Symbol.iterator]();
   }
@@ -942,12 +949,20 @@ 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 { header, geometries } = await (0, import_loader_utils3.parseFromContext)(arrayBuffer, SHPLoader, options, context);
   const geojsonGeometries = parseGeometries(geometries);
   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) {
-    propertyTable = await (0, import_loader_utils.parseFromContext)(dbfResponse, DBFLoader, { dbf: { shape: "object-row-table", encoding: cpg || "latin1" } }, context);
+    const dbfOptions = {
+      ...options,
+      dbf: {
+        ...options == null ? void 0 : options.dbf,
+        shape: "object-row-table",
+        encoding: cpg || "latin1"
+      }
+    };
+    propertyTable = await (0, import_loader_utils3.parseFromContext)(dbfResponse, DBFLoader, dbfOptions, context);
   }
   let features = joinProperties(geojsonGeometries, (propertyTable == null ? void 0 : propertyTable.data) || []);
   if (reproject) {
@@ -1057,7 +1072,7 @@ function extname(url) {
 }
 
 // dist/shapefile-loader.js
-var VERSION3 = true ? "4.4.0-alpha.1" : "latest";
+var VERSION3 = true ? "4.4.0-alpha.9" : "latest";
 var ShapefileLoader = {
   name: "Shapefile",
   id: "shapefile",
@@ -1082,6 +1097,7 @@ var ShapefileLoader = {
 };
 
 // dist/lib/parsers/parse-dbf-to-arrow.js
+var import_loader_utils4 = require("@loaders.gl/loader-utils");
 var import_schema_utils = require("@loaders.gl/schema-utils");
 var LITTLE_ENDIAN5 = true;
 var DBF_HEADER_SIZE2 = 32;
@@ -1130,7 +1146,7 @@ async function* parseDBFInBatches2(asyncIterator, options = {}) {
   const { encoding = "latin1" } = options.dbf || {};
   const parser = new DBFParser2({ encoding });
   let headerReturned = false;
-  for await (const arrayBuffer of asyncIterator) {
+  for await (const arrayBuffer of (0, import_loader_utils4.toArrayBufferIterator)(asyncIterator)) {
     parser.write(arrayBuffer);
     if (!headerReturned && parser.result.dbfHeader) {
       headerReturned = true;
@@ -1324,7 +1340,7 @@ var DBFFormat = {
 };
 
 // dist/dbf-arrow-loader.js
-var VERSION4 = true ? "4.4.0-alpha.1" : "latest";
+var VERSION4 = true ? "4.4.0-alpha.9" : "latest";
 var DBFArrowWorkerLoader = {
   ...DBFFormat,
   dataType: null,