@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.11

package/dist/es5/lib/utils/write-queue.js

@@ -1,44 +1,30 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _queue = require("./queue");
-
+var _process = _interopRequireDefault(require("process"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+var MEMORY_LIMIT = 4 * 1024 * 1024 * 1024;
 var WriteQueue = function (_Queue) {
   (0, _inherits2.default)(WriteQueue, _Queue);
-
   var _super = _createSuper(WriteQueue);
-
   function WriteQueue() {
     var _this;
-
     var listeningInterval = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2000;
     var writeConcurrency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 400;
     (0, _classCallCheck2.default)(this, WriteQueue);
@@ -52,8 +38,56 @@ var WriteQueue = function (_Queue) {
     _this.writeConcurrency = writeConcurrency;
     return _this;
   }
-
   (0, _createClass2.default)(WriteQueue, [{
+    key: "enqueue",
+    value: function () {
+      var _enqueue = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(val) {
+        var writeImmediately,
+          _ref,
+          archiveKey,
+          writePromise,
+          result,
+          _args = arguments;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                writeImmediately = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
+                if (!writeImmediately) {
+                  _context.next = 9;
+                  break;
+                }
+                _ref = val, archiveKey = _ref.archiveKey, writePromise = _ref.writePromise;
+                _context.next = 5;
+                return writePromise();
+              case 5:
+                result = _context.sent;
+                if (archiveKey && result) {
+                  this.fileMap[archiveKey] = result;
+                }
+                _context.next = 13;
+                break;
+              case 9:
+                (0, _get2.default)((0, _getPrototypeOf2.default)(WriteQueue.prototype), "enqueue", this).call(this, val);
+                if (!(_process.default.memoryUsage().rss > MEMORY_LIMIT)) {
+                  _context.next = 13;
+                  break;
+                }
+                _context.next = 13;
+                return this.startWrite();
+              case 13:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+      function enqueue(_x) {
+        return _enqueue.apply(this, arguments);
+      }
+      return enqueue;
+    }()
+  }, {
     key: "startListening",
     value: function startListening() {
       this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);
@@ -68,140 +102,107 @@ var WriteQueue = function (_Queue) {
   }, {
     key: "startWrite",
     value: function () {
-      var _startWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
+      var _startWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 if (!this.writePromise) {
-                  _context.next = 5;
-                  break;
+                  this.writePromise = this.doWrite();
                 }
-
-                _context.next = 3;
+                _context2.next = 3;
                 return this.writePromise;
-
               case 3:
                 this.writePromise = null;
-                return _context.abrupt("return");
-
-              case 5:
-                this.writePromise = this.doWrite();
-                _context.next = 8;
-                return this.writePromise;
-
-              case 8:
-                this.writePromise = null;
-
-              case 9:
+              case 4:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-
       function startWrite() {
         return _startWrite.apply(this, arguments);
       }
-
       return startWrite;
     }()
   }, {
     key: "finalize",
     value: function () {
-      var _finalize = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2() {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+      var _finalize = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3() {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 this.stopListening();
-                _context2.next = 3;
+                _context3.next = 3;
                 return this.startWrite();
-
               case 3:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-
       function finalize() {
         return _finalize.apply(this, arguments);
       }
-
       return finalize;
     }()
   }, {
     key: "doWrite",
     value: function () {
-      var _doWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3() {
-        var promises, archiveKeys, i, item, _ref, archiveKey, writePromise, writeResults;
-
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+      var _doWrite = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4() {
+        var promises, archiveKeys, i, item, _ref2, archiveKey, writePromise, promise, writeResults;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 if (!this.length) {
-                  _context3.next = 20;
+                  _context4.next = 21;
                   break;
                 }
-
                 promises = [];
                 archiveKeys = [];
                 i = 0;
-
               case 4:
                 if (!(i < this.writeConcurrency)) {
-                  _context3.next = 14;
+                  _context4.next = 15;
                   break;
                 }
-
                 item = this.dequeue();
-
                 if (item) {
-                  _context3.next = 8;
+                  _context4.next = 8;
                   break;
                 }
-
-                return _context3.abrupt("break", 14);
-
+                return _context4.abrupt("break", 15);
               case 8:
-                _ref = item, archiveKey = _ref.archiveKey, writePromise = _ref.writePromise;
+                _ref2 = item, archiveKey = _ref2.archiveKey, writePromise = _ref2.writePromise;
                 archiveKeys.push(archiveKey);
-                promises.push(writePromise);
-
-              case 11:
+                promise = writePromise();
+                promises.push(promise);
+              case 12:
                 i++;
-                _context3.next = 4;
+                _context4.next = 4;
                 break;
-
-              case 14:
-                _context3.next = 16;
+              case 15:
+                _context4.next = 17;
                 return Promise.allSettled(promises);
-
-              case 16:
-                writeResults = _context3.sent;
+              case 17:
+                writeResults = _context4.sent;
                 this.updateFileMap(archiveKeys, writeResults);
-                _context3.next = 0;
+                _context4.next = 0;
                 break;
-
-              case 20:
-                this.writePromise = null;
-
               case 21:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-
       function doWrite() {
         return _doWrite.apply(this, arguments);
       }
-
       return doWrite;
     }()
   }, {
@@ -209,7 +210,6 @@ var WriteQueue = function (_Queue) {
     value: function updateFileMap(archiveKeys, writeResults) {
       for (var i = 0; i < archiveKeys.length; i++) {
         var archiveKey = archiveKeys[i];
-
         if (archiveKey && 'value' in writeResults[i]) {
           this.fileMap[archiveKey] = writeResults[i].value;
         }
@@ -218,6 +218,5 @@ var WriteQueue = function (_Queue) {
   }]);
   return WriteQueue;
 }(_queue.Queue);
-
 exports.default = WriteQueue;
 //# sourceMappingURL=write-queue.js.map

package/dist/es5/lib/utils/write-queue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/utils/write-queue.ts"],"names":["WriteQueue","listeningInterval","writeConcurrency","intervalId","setInterval","startWrite","bind","clearInterval","writePromise","doWrite","stopListening","length","promises","archiveKeys","i","item","dequeue","archiveKey","push","Promise","allSettled","writeResults","updateFileMap","fileMap","value","Queue"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;IAOqBA,U;;;;;AAOnB,wBAA8E;AAAA;;AAAA,QAAlEC,iBAAkE,uEAAtC,IAAsC;AAAA,QAAhCC,gBAAgC,uEAAL,GAAK;AAAA;AAC5E;AAD4E;AAAA,+FALlC,IAKkC;AAAA,0FAJpC,EAIoC;AAAA;AAAA;AAE5E,UAAKD,iBAAL,GAAyBA,iBAAzB;AACA,UAAKC,gBAAL,GAAwBA,gBAAxB;AAH4E;AAI7E;;;;WAED,0BAAiB;AACf,WAAKC,UAAL,GAAkBC,WAAW,CAAC,KAAKC,UAAL,CAAgBC,IAAhB,CAAqB,IAArB,CAAD,EAA6B,KAAKL,iBAAlC,CAA7B;AACD;;;WAED,yBAAgB;AACd,UAAI,KAAKE,UAAT,EAAqB;AACnBI,QAAAA,aAAa,CAAC,KAAKJ,UAAN,CAAb;AACD;AACF;;;;kFAED;AAAA;AAAA;AAAA;AAAA;AAAA,qBACM,KAAKK,YADX;AAAA;AAAA;AAAA;;AAAA;AAAA,uBAEU,KAAKA,YAFf;;AAAA;AAGI,qBAAKA,YAAL,GAAoB,IAApB;AAHJ;;AAAA;AAME,qBAAKA,YAAL,GAAoB,KAAKC,OAAL,EAApB;AANF;AAAA,uBAOQ,KAAKD,YAPb;;AAAA;AAQE,qBAAKA,YAAL,GAAoB,IAApB;;AARF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;;gFAWA;AAAA;AAAA;AAAA;AAAA;AACE,qBAAKE,aAAL;AADF;AAAA,uBAEQ,KAAKL,UAAL,EAFR;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;;+EAKA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,qBACS,KAAKM,MADd;AAAA;AAAA;AAAA;;AAEUC,gBAAAA,QAFV,GAEwC,EAFxC;AAGUC,gBAAAA,WAHV,GAGgD,EAHhD;AAIaC,gBAAAA,CAJb,GAIiB,CAJjB;;AAAA;AAAA,sBAIoBA,CAAC,GAAG,KAAKZ,gBAJ7B;AAAA;AAAA;AAAA;;AAKYa,gBAAAA,IALZ,GAKmB,KAAKC,OAAL,EALnB;;AAAA,oBAMWD,IANX;AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA,uBASyCA,IATzC,EASaE,UATb,QASaA,UATb,EASyBT,YATzB,QASyBA,YATzB;AAUMK,gBAAAA,WAAW,CAACK,IAAZ,CAAiBD,UAAjB;AACAL,gBAAAA,QAAQ,CAACM,IAAT,CAAcV,YAAd;;AAXN;AAI+CM,gBAAAA,CAAC,EAJhD;AAAA;AAAA;;AAAA;AAAA;AAAA,uBAa+BK,OAAO,CAACC,UAAR,CAAmBR,QAAnB,CAb/B;;AAAA;AAaUS,gBAAAA,YAbV;AAcI,qBAAKC,aAAL,CAAmBT,WAAnB,EAAgCQ,YAAhC;AAdJ;AAAA;;AAAA;AAgBE,qBAAKb,YAAL,GAAoB,IAApB;;AAhBF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O;;;;;;;;;;WAmBA,uBACEK,WADF,EAEEQ,YAFF,EAGE;AACA,WAAK,IAAIP,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGD,WAAW,CAACF,MAAhC,EAAwCG,CAAC,EAAzC,EAA6C;AAC3C,YAAMG,UAAU,GAAGJ,WAAW,CAACC,CAAD,CAA9B;;AACA,YAAIG,UAAU,IAAI,WAAWI,YAAY,CAACP,CAAD,CAAzC,EAA8C;AAC5C,eAAKS,OAAL,CAAaN,UAAb,IAA4BI,YAAY,CAACP,CAAD,CAAb,CAAoDU,KAA/E;AACD;AACF;AACF;;;EApE+DC,Y","sourcesContent":["import {Queue} from './queue';\n\nexport type WriteQueueItem = {\n  archiveKey?: string;\n  writePromise: Promise<string>;\n};\n\nexport default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {\n  private intervalId?: NodeJS.Timeout;\n  public writePromise: Promise<void> | null = null;\n  public fileMap: {[key: string]: string} = {};\n  public listeningInterval: number;\n  public writeConcurrency: number;\n\n  constructor(listeningInterval: number = 2000, writeConcurrency: number = 400) {\n    super();\n    this.listeningInterval = listeningInterval;\n    this.writeConcurrency = writeConcurrency;\n  }\n\n  startListening() {\n    this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);\n  }\n\n  stopListening() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n  }\n\n  async startWrite(): Promise<void> {\n    if (this.writePromise) {\n      await this.writePromise;\n      this.writePromise = null;\n      return;\n    }\n    this.writePromise = this.doWrite();\n    await this.writePromise;\n    this.writePromise = null;\n  }\n\n  async finalize(): Promise<void> {\n    this.stopListening();\n    await this.startWrite();\n  }\n\n  private async doWrite(): Promise<void> {\n    while (this.length) {\n      const promises: Promise<string>[] = [];\n      const archiveKeys: (string | undefined)[] = [];\n      for (let i = 0; i < this.writeConcurrency; i++) {\n        const item = this.dequeue();\n        if (!item) {\n          break;\n        }\n        const {archiveKey, writePromise} = item as WriteQueueItem;\n        archiveKeys.push(archiveKey);\n        promises.push(writePromise);\n      }\n      const writeResults = await Promise.allSettled(promises);\n      this.updateFileMap(archiveKeys, writeResults);\n    }\n    this.writePromise = null;\n  }\n\n  private updateFileMap(\n    archiveKeys: (string | undefined)[],\n    writeResults: PromiseSettledResult<string>[]\n  ) {\n    for (let i = 0; i < archiveKeys.length; i++) {\n      const archiveKey = archiveKeys[i];\n      if (archiveKey && 'value' in writeResults[i]) {\n        this.fileMap[archiveKey] = (writeResults[i] as PromiseFulfilledResult<string>).value;\n      }\n    }\n  }\n}\n"],"file":"write-queue.js"}
+{"version":3,"file":"write-queue.js","names":["MEMORY_LIMIT","WriteQueue","listeningInterval","writeConcurrency","val","writeImmediately","archiveKey","writePromise","result","fileMap","process","memoryUsage","rss","startWrite","intervalId","setInterval","bind","clearInterval","doWrite","stopListening","length","promises","archiveKeys","i","item","dequeue","push","promise","Promise","allSettled","writeResults","updateFileMap","value","Queue"],"sources":["../../../../src/lib/utils/write-queue.ts"],"sourcesContent":["import {Queue} from './queue';\nimport process from 'process';\n\n/** Memory limit size is based on testing */\nconst MEMORY_LIMIT = 4 * 1024 * 1024 * 1024; // 4GB\n\nexport type WriteQueueItem = {\n  archiveKey?: string;\n  /**\n   * writePromise() returns a Promise that will be awaited in Promise.allSettled(promises);\n   * Arguments for this call are specified in writeQueue.enqueue call like this:\n   * await writeQueue.enqueue({\n   *     archiveKey: `nodePages/xxx.json.gz`,\n   *     writePromise: () => writeFileForSlpk(slpkPath, data, `xxx.json`)\n   * });\n   * Note, a function like writeFileForSlpk should NOT be called when initializing the object for enqueue().\n   * If he function is called, the promise will be created\n   * and the function will allocate resources (file descriptors) for file writing.\n   * It will be done for ALL items in the queue, which is not supposed to happen.\n   * That's why the function should be passed as\n   *   writePromise: () => writeFileForSlpk(slpkPath, content, `xxx.json`)\n   * instead of\n   *  writePromise: writeFileForSlpk(slpkPath, content, `xxx.json`) // INCORRECT !\n   */\n  writePromise: () => Promise<string | null>;\n};\n\nexport default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {\n  private intervalId?: NodeJS.Timeout;\n  public writePromise: Promise<void> | null = null;\n  public fileMap: {[key: string]: string} = {};\n  public listeningInterval: number;\n  public writeConcurrency: number;\n\n  constructor(listeningInterval: number = 2000, writeConcurrency: number = 400) {\n    super();\n    this.listeningInterval = listeningInterval;\n    this.writeConcurrency = writeConcurrency;\n  }\n\n  async enqueue(val: T, writeImmediately: boolean = false) {\n    if (writeImmediately) {\n      const {archiveKey, writePromise} = val as WriteQueueItem;\n      const result = await writePromise();\n      if (archiveKey && result) {\n        this.fileMap[archiveKey] = result;\n      }\n    } else {\n      super.enqueue(val);\n      /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */\n      if (process.memoryUsage().rss > MEMORY_LIMIT) {\n        await this.startWrite();\n      }\n    }\n  }\n\n  startListening() {\n    this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);\n  }\n\n  stopListening() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n  }\n\n  async startWrite(): Promise<void> {\n    if (!this.writePromise) {\n      this.writePromise = this.doWrite();\n    }\n    await this.writePromise;\n    this.writePromise = null;\n  }\n\n  async finalize(): Promise<void> {\n    this.stopListening();\n    await this.startWrite();\n  }\n\n  private async doWrite(): Promise<void> {\n    while (this.length) {\n      const promises: Promise<string | null>[] = [];\n      const archiveKeys: (string | undefined)[] = [];\n      for (let i = 0; i < this.writeConcurrency; i++) {\n        const item = this.dequeue();\n        if (!item) {\n          break;\n        }\n        const {archiveKey, writePromise} = item as WriteQueueItem;\n        archiveKeys.push(archiveKey);\n        const promise = writePromise();\n        promises.push(promise);\n      }\n      const writeResults = await Promise.allSettled(promises);\n      this.updateFileMap(archiveKeys, writeResults);\n    }\n  }\n\n  private updateFileMap(\n    archiveKeys: (string | undefined)[],\n    writeResults: PromiseSettledResult<string | null>[]\n  ) {\n    for (let i = 0; i < archiveKeys.length; i++) {\n      const archiveKey = archiveKeys[i];\n      if (archiveKey && 'value' in writeResults[i]) {\n        this.fileMap[archiveKey] = (writeResults[i] as PromiseFulfilledResult<string>).value;\n      }\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/es5/pgm-loader.js

@@ -1,19 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PGMLoader = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _geoid = require("@math.gl/geoid");
+var VERSION = typeof "3.3.0-alpha.11" !== 'undefined' ? "3.3.0-alpha.11" : 'latest';
 
-var VERSION = typeof "3.3.0-alpha.1" !== 'undefined' ? "3.3.0-alpha.1" : 'latest';
 var PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',
@@ -27,7 +23,6 @@ var PGMLoader = {
           switch (_context.prev = _context.next) {
             case 0:
               return _context.abrupt("return", (0, _geoid.parsePGM)(new Uint8Array(arrayBuffer), options));
-
             case 1:
             case "end":
               return _context.stop();
@@ -35,11 +30,9 @@ var PGMLoader = {
         }
       }, _callee);
     }));
-
     function parse(_x, _x2) {
       return _parse.apply(this, arguments);
     }
-
     return parse;
   }(),
   extensions: ['pgm'],

package/dist/es5/pgm-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/pgm-loader.ts"],"names":["VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"mappings":";;;;;;;;;;;;;AAMA;;AAFA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAOO,IAAMC,SAA2B,GAAG;AACzCC,EAAAA,IAAI,EAAE,qCADmC;AAEzCC,EAAAA,EAAE,EAAE,KAFqC;AAGzCC,EAAAA,MAAM,EAAE,gBAHiC;AAIzCC,EAAAA,OAAO,EAAEL,OAJgC;AAKzCM,EAAAA,SAAS,EAAE,CAAC,0BAAD,CAL8B;AAMzCC,EAAAA,KAAK;AAAA,2EAAE,iBAAOC,WAAP,EAAoBC,OAApB;AAAA;AAAA;AAAA;AAAA;AAAA,+CAAgC,qBAAS,IAAIC,UAAJ,CAAeF,WAAf,CAAT,EAAsCC,OAAtC,CAAhC;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAAF;;AAAA;AAAA;AAAA;;AAAA;AAAA,KANoC;AAOzCE,EAAAA,UAAU,EAAE,CAAC,KAAD,CAP6B;AAQzCF,EAAAA,OAAO,EAAE;AAEPG,IAAAA,KAAK,EAAE;AAFA;AARgC,CAApC","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\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\nimport {parsePGM} from '@math.gl/geoid';\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"file":"pgm-loader.js"}
+{"version":3,"file":"pgm-loader.js","names":["VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","parsePGM","Uint8Array","extensions","cubic"],"sources":["../../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parsePGM} from '@math.gl/geoid';\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 * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  // @ts-expect-error LoaderOptions does not have cubic parameter\n  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"mappings":";;;;;;;;;AACA;AAIA,IAAMA,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;;AAKpE,IAAMC,SAA2B,GAAG;EACzCC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK;IAAA,uEAAE,iBAAOC,WAAW,EAAEC,OAAO;MAAA;QAAA;UAAA;YAAA;cAAA,iCAAK,IAAAC,eAAQ,EAAC,IAAIC,UAAU,CAACH,WAAW,CAAC,EAAEC,OAAO,CAAC;YAAA;YAAA;cAAA;UAAA;QAAA;MAAA;IAAA;IAAA;MAAA;IAAA;IAAA;EAAA;EACrFG,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBH,OAAO,EAAE;IAEPI,KAAK,EAAE;EACT;AACF,CAAC;AAAC"}

package/dist/es5/workers/3d-tiles-attributes-worker.js

@@ -1,27 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _workerUtils = require("@loaders.gl/worker-utils");
-
 var _b3dmConverter = _interopRequireDefault(require("../3d-tiles-converter/helpers/b3dm-converter"));
-
 var b3dmConverter = new _b3dmConverter.default();
 (0, _workerUtils.createWorker)(function () {
   var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(data) {
     var options,
-        _args = arguments;
+      _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            return _context.abrupt("return", b3dmConverter.convert(data, options.attributes));
-
+            return _context.abrupt("return", b3dmConverter.convert(data, options.featureAttributes));
           case 2:
           case "end":
             return _context.stop();
@@ -29,7 +23,6 @@ var b3dmConverter = new _b3dmConverter.default();
       }
     }, _callee);
   }));
-
   return function (_x) {
     return _ref.apply(this, arguments);
   };

package/dist/es5/workers/3d-tiles-attributes-worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/workers/3d-tiles-attributes-worker.ts"],"names":["b3dmConverter","B3dmConverter","data","options","convert","attributes"],"mappings":";;;;;;;;AAAA;;AACA;;AAEA,IAAMA,aAAa,GAAG,IAAIC,sBAAJ,EAAtB;AAEA;AAAA,uEAAa,iBAAOC,IAAP;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAaC,YAAAA,OAAb,2DAAuB,EAAvB;AAAA,6CAA8BH,aAAa,CAACI,OAAd,CAAsBF,IAAtB,EAA4BC,OAAO,CAACE,UAApC,CAA9B;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAb;;AAAA;AAAA;AAAA;AAAA","sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport B3dmConverter from '../3d-tiles-converter/helpers/b3dm-converter';\n\nconst b3dmConverter = new B3dmConverter();\n\ncreateWorker(async (data, options = {}) => b3dmConverter.convert(data, options.attributes));\n"],"file":"3d-tiles-attributes-worker.js"}
+{"version":3,"file":"3d-tiles-attributes-worker.js","names":["b3dmConverter","B3dmConverter","createWorker","data","options","convert","featureAttributes"],"sources":["../../../src/workers/3d-tiles-attributes-worker.ts"],"sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport B3dmConverter from '../3d-tiles-converter/helpers/b3dm-converter';\n\nconst b3dmConverter = new B3dmConverter();\n\ncreateWorker(async (data, options = {}) => b3dmConverter.convert(data, options.featureAttributes));\n"],"mappings":";;;;;AAAA;AACA;AAEA,IAAMA,aAAa,GAAG,IAAIC,sBAAa,EAAE;AAEzC,IAAAC,yBAAY;EAAA,qEAAC,iBAAOC,IAAI;IAAA;MAAA;IAAA;MAAA;QAAA;UAAA;YAAEC,OAAO,2DAAG,CAAC,CAAC;YAAA,iCAAKJ,aAAa,CAACK,OAAO,CAACF,IAAI,EAAEC,OAAO,CAACE,iBAAiB,CAAC;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA;EAAA;IAAA;EAAA;AAAA,IAAC"}

package/dist/es5/workers/i3s-attributes-worker.js

@@ -1,30 +1,23 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _workerUtils = require("@loaders.gl/worker-utils");
-
 var _geometryConverter = require("../i3s-converter/helpers/geometry-converter");
-
 (0, _workerUtils.createWorker)(function () {
   var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(data) {
     var options,
-        _args = arguments;
+      _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
             _context.next = 3;
-            return (0, _geometryConverter.convertAttributes)(data, options.useCartesianPositions);
-
+            return (0, _geometryConverter.convertAttributes)(data, options.materialAndTextureList, options.useCartesianPositions);
           case 3:
             return _context.abrupt("return", _context.sent);
-
           case 4:
           case "end":
             return _context.stop();
@@ -32,7 +25,6 @@ var _geometryConverter = require("../i3s-converter/helpers/geometry-converter");
       }
     }, _callee);
   }));
-
   return function (_x) {
     return _ref.apply(this, arguments);
   };

package/dist/es5/workers/i3s-attributes-worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/workers/i3s-attributes-worker.ts"],"names":["data","options","useCartesianPositions"],"mappings":";;;;;;;;AAAA;;AACA;;AAEA;AAAA,uEACE,iBAAOA,IAAP;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAaC,YAAAA,OAAb,2DAAuB,EAAvB;AAAA;AAAA,mBAAoC,0CAAkBD,IAAlB,EAAwBC,OAAO,CAACC,qBAAhC,CAApC;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GADF;;AAAA;AAAA;AAAA;AAAA","sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport {convertAttributes} from '../i3s-converter/helpers/geometry-converter';\n\ncreateWorker(\n  async (data, options = {}) => await convertAttributes(data, options.useCartesianPositions)\n);\n"],"file":"i3s-attributes-worker.js"}
+{"version":3,"file":"i3s-attributes-worker.js","names":["createWorker","data","options","convertAttributes","materialAndTextureList","useCartesianPositions"],"sources":["../../../src/workers/i3s-attributes-worker.ts"],"sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport {convertAttributes} from '../i3s-converter/helpers/geometry-converter';\n\ncreateWorker(\n  async (data, options = {}) =>\n    await convertAttributes(data, options.materialAndTextureList, options.useCartesianPositions)\n);\n"],"mappings":";;;;;AAAA;AACA;AAEA,IAAAA,yBAAY;EAAA,qEACV,iBAAOC,IAAI;IAAA;MAAA;IAAA;MAAA;QAAA;UAAA;YAAEC,OAAO,2DAAG,CAAC,CAAC;YAAA;YAAA,OACjB,IAAAC,oCAAiB,EAACF,IAAI,EAAEC,OAAO,CAACE,sBAAsB,EAAEF,OAAO,CAACG,qBAAqB,CAAC;UAAA;YAAA;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA;EAAA;IAAA;EAAA;AAAA,IAC/F"}

package/dist/esm/3d-tiles-attributes-worker.js

@@ -1,14 +1,16 @@
 import { processOnWorker } from '@loaders.gl/worker-utils';
-const VERSION = typeof "3.3.0-alpha.1" !== 'undefined' ? "3.3.0-alpha.1" : 'latest';
+
+const VERSION = typeof "3.3.0-alpha.11" !== 'undefined' ? "3.3.0-alpha.11" : 'latest';
 export const Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',
   module: 'tile-converter',
   version: VERSION,
   options: {
-    attributes: null
+    featureAttributes: null
   }
 };
+
 export function transform3DTilesAttributesOnWorker(i3sAttributesData, options) {
   return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);
 }

package/dist/esm/3d-tiles-attributes-worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/3d-tiles-attributes-worker.ts"],"names":["processOnWorker","VERSION","Tile3dAttributesWorker","id","name","module","version","options","attributes","transform3DTilesAttributesOnWorker","i3sAttributesData","_typecheckI3SAttributesWorker"],"mappings":"AAGA,SAAQA,eAAR,QAA8B,0BAA9B;AAIA,MAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAeA,OAAO,MAAMC,sBAAsB,GAAG;AACpCC,EAAAA,EAAE,EAAE,qBADgC;AAEpCC,EAAAA,IAAI,EAAE,2BAF8B;AAGpCC,EAAAA,MAAM,EAAE,gBAH4B;AAIpCC,EAAAA,OAAO,EAAEL,OAJ2B;AAKpCM,EAAAA,OAAO,EAAE;AACPC,IAAAA,UAAU,EAAE;AADL;AAL2B,CAA/B;AAaP,OAAO,SAASC,kCAAT,CACLC,iBADK,EAELH,OAFK,EAGiB;AACtB,SAAOP,eAAe,CAACE,sBAAD,EAAyBQ,iBAAzB,EAA4CH,OAA5C,CAAtB;AACD;AAED,OAAO,MAAMI,6BAA2C,GAAGT,sBAApD","sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {FeatureAttribute} from '@loaders.gl/i3s';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\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 Tile3DAttributesWorkerOptions = {\n  featureAttributes: FeatureAttribute | null;\n  source: string;\n};\n\nexport type I3SAttributesData = {\n  tileContent: any;\n  textureFormat: string;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const Tile3dAttributesWorker = {\n  id: '3d-tiles-attributes',\n  name: '3DTiles Attributes Worker',\n  module: 'tile-converter',\n  version: VERSION,\n  options: {\n    attributes: null\n  }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transform3DTilesAttributesOnWorker(\n  i3sAttributesData: I3SAttributesData,\n  options: Tile3DAttributesWorkerOptions\n): Promise<ArrayBuffer> {\n  return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = Tile3dAttributesWorker;\n"],"file":"3d-tiles-attributes-worker.js"}
+{"version":3,"file":"3d-tiles-attributes-worker.js","names":["processOnWorker","VERSION","Tile3dAttributesWorker","id","name","module","version","options","featureAttributes","transform3DTilesAttributesOnWorker","i3sAttributesData","_typecheckI3SAttributesWorker"],"sources":["../../src/3d-tiles-attributes-worker.ts"],"sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {FeatureAttribute} from '@loaders.gl/i3s';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\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 Tile3DAttributesWorkerOptions = {\n  featureAttributes: FeatureAttribute | null;\n  source: string;\n};\n\nexport type I3SAttributesData = {\n  tileContent: any;\n  textureFormat: string;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const Tile3dAttributesWorker = {\n  id: '3d-tiles-attributes',\n  name: '3DTiles Attributes Worker',\n  module: 'tile-converter',\n  version: VERSION,\n  options: {\n    featureAttributes: null\n  }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transform3DTilesAttributesOnWorker(\n  i3sAttributesData: I3SAttributesData,\n  options: Tile3DAttributesWorkerOptions\n): Promise<ArrayBuffer> {\n  return processOnWorker(Tile3dAttributesWorker, i3sAttributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = Tile3dAttributesWorker;\n"],"mappings":"AAGA,SAAQA,eAAe,QAAO,0BAA0B;;AAIxD,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAe3E,OAAO,MAAMC,sBAAsB,GAAG;EACpCC,EAAE,EAAE,qBAAqB;EACzBC,IAAI,EAAE,2BAA2B;EACjCC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,OAAO,EAAE;IACPC,iBAAiB,EAAE;EACrB;AACF,CAAC;;AAKD,OAAO,SAASC,kCAAkC,CAChDC,iBAAoC,EACpCH,OAAsC,EAChB;EACtB,OAAOP,eAAe,CAACE,sBAAsB,EAAEQ,iBAAiB,EAAEH,OAAO,CAAC;AAC5E;AAEA,OAAO,MAAMI,6BAA2C,GAAGT,sBAAsB"}