@loaders.gl/shapefile 4.0.0-beta.3 → 4.0.0-beta.4

package/dist/dbf-worker.js

@@ -372,7 +372,7 @@
   }
 
   // src/dbf-loader.ts
-  var VERSION = true ? "4.0.0-beta.3" : "latest";
+  var VERSION = true ? "4.0.0-beta.4" : "latest";
   var DBFWorkerLoader = {
     name: "DBF",
     id: "dbf",

package/dist/dist.dev.js

@@ -48,9 +48,6 @@ var __exports__ = (() => {
       this.ended = false;
       this.maxRewindBytes = maxRewindBytes;
     }
-    /**
-     * @param arrayBuffer
-     */
     write(arrayBuffer) {
       this.arrayBuffers.push(arrayBuffer);
     }
@@ -58,12 +55,6 @@ var __exports__ = (() => {
       this.arrayBuffers = [];
       this.ended = true;
     }
-    /**
-     * Has enough bytes available in array buffers
-     *
-     * @param bytes Number of bytes
-     * @return boolean
-     */
     hasAvailableBytes(bytes) {
       let bytesAvailable = -this.offset;
       for (const arrayBuffer of this.arrayBuffers) {
@@ -74,12 +65,6 @@ var __exports__ = (() => {
       }
       return false;
     }
-    /**
-     * Find offsets of byte ranges within this.arrayBuffers
-     *
-     * @param  bytes Byte length to read
-     * @return Arrays with byte ranges pointing to this.arrayBuffers, Output type is nested array, e.g. [ [0, [1, 2]], ...]
-     */
     findBufferOffsets(bytes) {
       let offset = -this.offset;
       const selectedBuffers = [];
@@ -103,12 +88,6 @@ var __exports__ = (() => {
       }
       return null;
     }
-    /**
-     * Get the required number of bytes from the iterator
-     *
-     * @param bytes Number of bytes
-     * @return DataView with data
-     */
     getDataView(bytes) {
       const bufferOffsets = this.findBufferOffsets(bytes);
       if (!bufferOffsets && this.ended) {
@@ -130,25 +109,12 @@ var __exports__ = (() => {
       this.disposeBuffers();
       return view;
     }
-    /**
-     * Dispose of old array buffers
-     */
     disposeBuffers() {
       while (this.arrayBuffers.length > 0 && this.offset - this.maxRewindBytes >= this.arrayBuffers[0].byteLength) {
         this.offset -= this.arrayBuffers[0].byteLength;
         this.arrayBuffers.shift();
       }
     }
-    /**
-     * Copy multiple ArrayBuffers into one contiguous ArrayBuffer
-     *
-     * In contrast to concatenateArrayBuffers, this only copies the necessary
-     * portions of the source arrays, rather than first copying the entire arrays
-     * then taking a part of them.
-     *
-     * @param bufferOffsets List of internal array offsets
-     * @return New contiguous ArrayBuffer
-     */
     _combineArrayBuffers(bufferOffsets) {
       let byteLength = 0;
       for (const bufferOffset of bufferOffsets) {
@@ -165,15 +131,9 @@ var __exports__ = (() => {
       }
       return result.buffer;
     }
-    /**
-     * @param bytes
-     */
     skip(bytes) {
       this.offset += bytes;
     }
-    /**
-     * @param bytes
-     */
     rewind(bytes) {
       this.offset -= bytes;
     }
@@ -186,7 +146,6 @@ var __exports__ = (() => {
   function parseSHPHeader(headerView) {
     const header = {
       magic: headerView.getInt32(0, BIG_ENDIAN),
-      // Length is stored as # of 2-byte words; multiply by 2 to get # of bytes
       length: headerView.getInt32(24, BIG_ENDIAN) * 2,
       version: headerView.getInt32(28, LITTLE_ENDIAN),
       type: headerView.getInt32(32, LITTLE_ENDIAN),
@@ -348,10 +307,6 @@ var __exports__ = (() => {
         value: ringIndices,
         size: 1
       },
-      // TODO: Dynamically choose Uint32Array over Uint16Array only when
-      // necessary. I believe the implementation requires nPoints to be the
-      // largest value in the array, so you should be able to use Uint32Array only
-      // when nPoints > 65535.
       polygonIndices: {
         value: new Uint32Array(polygonIndices),
         size: 1
@@ -425,8 +380,6 @@ var __exports__ = (() => {
     state = STATE.EXPECTING_HEADER;
     result = {
       geometries: [],
-      // Initialize with number values to make TS happy
-      // These are initialized for real in STATE.EXPECTING_HEADER
       progress: {
         bytesTotal: NaN,
         bytesUsed: NaN,
@@ -502,9 +455,7 @@ var __exports__ = (() => {
               const recordHeaderView = binaryReader.getDataView(SHP_RECORD_HEADER_SIZE);
               const recordHeader = {
                 recordNumber: recordHeaderView.getInt32(0, BIG_ENDIAN2),
-                // 2 byte words; includes the four words of record header
                 byteLength: recordHeaderView.getInt32(4, BIG_ENDIAN2) * 2,
-                // This is actually part of the record, not the header...
                 type: recordHeaderView.getInt32(8, LITTLE_ENDIAN3)
               };
               if (!binaryReader.hasAvailableBytes(recordHeader.byteLength - 4)) {
@@ -552,7 +503,6 @@ var __exports__ = (() => {
     category: "geometry",
     extensions: ["shp"],
     mimeTypes: ["application/octet-stream"],
-    // ISSUE: This also identifies SHX files, which are identical to SHP for the first 100 bytes...
     tests: [new Uint8Array(SHP_MAGIC_NUMBER2).buffer],
     options: {
       shp: {
@@ -6168,7 +6118,7 @@ var __exports__ = (() => {
   // src/lib/parsers/parse-dbf.ts
   var LITTLE_ENDIAN4 = true;
   var DBF_HEADER_SIZE = 32;
-  var STATE2 = /* @__PURE__ */ function(STATE3) {
+  var STATE2 = function(STATE3) {
     STATE3[STATE3["START"] = 0] = "START";
     STATE3[STATE3["FIELD_DESCRIPTORS"] = 1] = "FIELD_DESCRIPTORS";
     STATE3[STATE3["FIELD_PROPERTIES"] = 2] = "FIELD_PROPERTIES";
@@ -6185,9 +6135,6 @@ var __exports__ = (() => {
     constructor(options) {
       this.textDecoder = new TextDecoder(options.encoding);
     }
-    /**
-     * @param arrayBuffer
-     */
     write(arrayBuffer) {
       this.binaryReader.write(arrayBuffer);
       this.state = parseState2(this.state, this.result, this.binaryReader, this.textDecoder);
@@ -6279,10 +6226,7 @@ var __exports__ = (() => {
             state = STATE2.FIELD_DESCRIPTORS;
             break;
           case STATE2.FIELD_DESCRIPTORS:
-            const fieldDescriptorView = binaryReader.getDataView(
-              // @ts-ignore
-              result.dbfHeader.headerLength - DBF_HEADER_SIZE
-            );
+            const fieldDescriptorView = binaryReader.getDataView(result.dbfHeader.headerLength - DBF_HEADER_SIZE);
             if (!fieldDescriptorView) {
               return state;
             }
@@ -6325,17 +6269,12 @@ var __exports__ = (() => {
   }
   function parseDBFHeader(headerView) {
     return {
-      // Last updated date
       year: headerView.getUint8(1) + 1900,
       month: headerView.getUint8(2),
       day: headerView.getUint8(3),
-      // Number of records in data file
       nRecords: headerView.getUint32(4, LITTLE_ENDIAN4),
-      // Length of header in bytes
       headerLength: headerView.getUint16(8, LITTLE_ENDIAN4),
-      // Length of each record
       recordLength: headerView.getUint16(10, LITTLE_ENDIAN4),
-      // Not sure if this is usually set
       languageDriver: headerView.getUint8(29)
     };
   }
@@ -6598,7 +6537,6 @@ var __exports__ = (() => {
       const feature = {
         type: "Feature",
         geometry,
-        // properties can be undefined if dbfResponse above was empty
         properties: properties && properties[i] || {}
       };
       features.push(feature);
@@ -6697,21 +6635,9 @@ var __exports__ = (() => {
       this.offset = 0;
       this.arrayBuffer = arrayBuffer;
     }
-    /**
-     * Checks if there are available bytes in data
-     *
-     * @param bytes
-     * @returns boolean
-     */
     hasAvailableBytes(bytes) {
       return this.arrayBuffer.byteLength - this.offset >= bytes;
     }
-    /**
-     * Get the required number of bytes from the iterator
-     *
-     * @param bytes
-     * @returns Dataview
-     */
     getDataView(bytes) {
       if (bytes && !this.hasAvailableBytes(bytes)) {
         throw new Error("binary data exhausted");
@@ -6720,19 +6646,9 @@ var __exports__ = (() => {
       this.offset += bytes;
       return dataView;
     }
-    /**
-     * Skipping
-     *
-     * @param bytes
-     */
     skip(bytes) {
       this.offset += bytes;
     }
-    /**
-     * Rewinding
-     *
-     * @param bytes
-     */
     rewind(bytes) {
       this.offset -= bytes;
     }

package/dist/shp-worker.js

@@ -480,7 +480,7 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "4.0.0-beta.3" : "latest";
+  var VERSION = true ? "4.0.0-beta.4" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
     name: "SHP",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.4",
   "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.0-beta.3",
-    "@loaders.gl/loader-utils": "4.0.0-beta.3",
-    "@loaders.gl/schema": "4.0.0-beta.3",
+    "@loaders.gl/gis": "4.0.0-beta.4",
+    "@loaders.gl/loader-utils": "4.0.0-beta.4",
+    "@loaders.gl/schema": "4.0.0-beta.4",
     "@math.gl/proj4": "^4.0.0"
   },
-  "gitHead": "7ba9621cc51c7a26c407086ac86171f35b8712af"
+  "gitHead": "848c20b474532d301f2c3f8d4e1fb9bf262b86d4"
 }