@loaders.gl/tiles 3.1.0 → 3.1.1

package/dist/bundle.js

@@ -3196,7 +3196,26 @@
     }
   });
 
-  // ../../node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js
+  // ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+    return obj;
+  }
+  var init_defineProperty = __esm({
+    "../../node_modules/@babel/runtime/helpers/esm/defineProperty.js"() {
+    }
+  });
+
+  // node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js
   function getHiResTimestamp() {
     let timestamp;
     if (typeof window !== "undefined" && window.performance) {
@@ -3210,20 +3229,34 @@
     return timestamp;
   }
   var init_hi_res_timestamp = __esm({
-    "../../node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js"() {
+    "node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js"() {
     }
   });
 
-  // ../../node_modules/@probe.gl/stats/dist/esm/lib/stat.js
+  // node_modules/@probe.gl/stats/dist/esm/lib/stat.js
   var Stat;
   var init_stat = __esm({
-    "../../node_modules/@probe.gl/stats/dist/esm/lib/stat.js"() {
+    "node_modules/@probe.gl/stats/dist/esm/lib/stat.js"() {
+      init_defineProperty();
       init_hi_res_timestamp();
       Stat = class {
         constructor(name, type) {
+          _defineProperty(this, "name", void 0);
+          _defineProperty(this, "type", void 0);
+          _defineProperty(this, "sampleSize", 1);
+          _defineProperty(this, "time", void 0);
+          _defineProperty(this, "count", void 0);
+          _defineProperty(this, "samples", void 0);
+          _defineProperty(this, "lastTiming", void 0);
+          _defineProperty(this, "lastSampleTime", void 0);
+          _defineProperty(this, "lastSampleCount", void 0);
+          _defineProperty(this, "_count", 0);
+          _defineProperty(this, "_time", 0);
+          _defineProperty(this, "_samples", 0);
+          _defineProperty(this, "_startTime", 0);
+          _defineProperty(this, "_timerPending", false);
           this.name = name;
           this.type = type;
-          this.sampleSize = 1;
           this.reset();
         }
         setSampleSize(samples) {
@@ -3319,22 +3352,23 @@
     }
   });
 
-  // ../../node_modules/@probe.gl/stats/dist/esm/lib/stats.js
+  // node_modules/@probe.gl/stats/dist/esm/lib/stats.js
   var Stats;
   var init_stats = __esm({
-    "../../node_modules/@probe.gl/stats/dist/esm/lib/stats.js"() {
+    "node_modules/@probe.gl/stats/dist/esm/lib/stats.js"() {
+      init_defineProperty();
       init_stat();
       Stats = class {
-        constructor({
-          id,
-          stats
-        }) {
-          this.id = id;
+        constructor(options) {
+          _defineProperty(this, "id", void 0);
+          _defineProperty(this, "stats", {});
+          this.id = options.id;
           this.stats = {};
-          this._initializeStats(stats);
+          this._initializeStats(options.stats);
           Object.seal(this);
         }
-        get(name, type = "count") {
+        get(name) {
+          let type = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "count";
           return this._getOrCreate({
             name,
             type
@@ -3366,7 +3400,8 @@
           });
           return table;
         }
-        _initializeStats(stats = []) {
+        _initializeStats() {
+          let stats = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
           stats.forEach((stat) => this._getOrCreate(stat));
         }
         _getOrCreate(stat) {
@@ -3390,9 +3425,9 @@
     }
   });
 
-  // ../../node_modules/@probe.gl/stats/dist/esm/index.js
+  // node_modules/@probe.gl/stats/dist/esm/index.js
   var init_esm3 = __esm({
-    "../../node_modules/@probe.gl/stats/dist/esm/index.js"() {
+    "node_modules/@probe.gl/stats/dist/esm/index.js"() {
       init_stats();
       init_stat();
       init_hi_res_timestamp();
@@ -3434,7 +3469,7 @@
   var DEFAULT_VERSION, VERSION;
   var init_version = __esm({
     "../worker-utils/src/lib/env-utils/version.ts"() {
-      DEFAULT_VERSION = "beta";
+      DEFAULT_VERSION = "latest";
       VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : DEFAULT_VERSION;
       if (typeof __VERSION__ === "undefined") {
         console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
@@ -3869,7 +3904,7 @@
   var init_get_worker_url = __esm({
     "../worker-utils/src/lib/worker-api/get-worker-url.ts"() {
       init_assert3();
-      NPM_TAG = "beta";
+      NPM_TAG = "latest";
     }
   });
 
@@ -4033,11 +4068,230 @@
     }
   });
 
+  // ../loader-utils/node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js
+  function getHiResTimestamp2() {
+    let timestamp;
+    if (typeof window !== "undefined" && window.performance) {
+      timestamp = window.performance.now();
+    } else if (typeof process !== "undefined" && process.hrtime) {
+      const timeParts = process.hrtime();
+      timestamp = timeParts[0] * 1e3 + timeParts[1] / 1e6;
+    } else {
+      timestamp = Date.now();
+    }
+    return timestamp;
+  }
+  var init_hi_res_timestamp2 = __esm({
+    "../loader-utils/node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js"() {
+    }
+  });
+
+  // ../loader-utils/node_modules/@probe.gl/stats/dist/esm/lib/stat.js
+  var Stat2;
+  var init_stat2 = __esm({
+    "../loader-utils/node_modules/@probe.gl/stats/dist/esm/lib/stat.js"() {
+      init_defineProperty();
+      init_hi_res_timestamp2();
+      Stat2 = class {
+        constructor(name, type) {
+          _defineProperty(this, "name", void 0);
+          _defineProperty(this, "type", void 0);
+          _defineProperty(this, "sampleSize", 1);
+          _defineProperty(this, "time", void 0);
+          _defineProperty(this, "count", void 0);
+          _defineProperty(this, "samples", void 0);
+          _defineProperty(this, "lastTiming", void 0);
+          _defineProperty(this, "lastSampleTime", void 0);
+          _defineProperty(this, "lastSampleCount", void 0);
+          _defineProperty(this, "_count", 0);
+          _defineProperty(this, "_time", 0);
+          _defineProperty(this, "_samples", 0);
+          _defineProperty(this, "_startTime", 0);
+          _defineProperty(this, "_timerPending", false);
+          this.name = name;
+          this.type = type;
+          this.reset();
+        }
+        setSampleSize(samples) {
+          this.sampleSize = samples;
+          return this;
+        }
+        incrementCount() {
+          this.addCount(1);
+          return this;
+        }
+        decrementCount() {
+          this.subtractCount(1);
+          return this;
+        }
+        addCount(value) {
+          this._count += value;
+          this._samples++;
+          this._checkSampling();
+          return this;
+        }
+        subtractCount(value) {
+          this._count -= value;
+          this._samples++;
+          this._checkSampling();
+          return this;
+        }
+        addTime(time) {
+          this._time += time;
+          this.lastTiming = time;
+          this._samples++;
+          this._checkSampling();
+          return this;
+        }
+        timeStart() {
+          this._startTime = getHiResTimestamp2();
+          this._timerPending = true;
+          return this;
+        }
+        timeEnd() {
+          if (!this._timerPending) {
+            return this;
+          }
+          this.addTime(getHiResTimestamp2() - this._startTime);
+          this._timerPending = false;
+          this._checkSampling();
+          return this;
+        }
+        getSampleAverageCount() {
+          return this.sampleSize > 0 ? this.lastSampleCount / this.sampleSize : 0;
+        }
+        getSampleAverageTime() {
+          return this.sampleSize > 0 ? this.lastSampleTime / this.sampleSize : 0;
+        }
+        getSampleHz() {
+          return this.lastSampleTime > 0 ? this.sampleSize / (this.lastSampleTime / 1e3) : 0;
+        }
+        getAverageCount() {
+          return this.samples > 0 ? this.count / this.samples : 0;
+        }
+        getAverageTime() {
+          return this.samples > 0 ? this.time / this.samples : 0;
+        }
+        getHz() {
+          return this.time > 0 ? this.samples / (this.time / 1e3) : 0;
+        }
+        reset() {
+          this.time = 0;
+          this.count = 0;
+          this.samples = 0;
+          this.lastTiming = 0;
+          this.lastSampleTime = 0;
+          this.lastSampleCount = 0;
+          this._count = 0;
+          this._time = 0;
+          this._samples = 0;
+          this._startTime = 0;
+          this._timerPending = false;
+          return this;
+        }
+        _checkSampling() {
+          if (this._samples === this.sampleSize) {
+            this.lastSampleTime = this._time;
+            this.lastSampleCount = this._count;
+            this.count += this._count;
+            this.time += this._time;
+            this.samples += this._samples;
+            this._time = 0;
+            this._count = 0;
+            this._samples = 0;
+          }
+        }
+      };
+    }
+  });
+
+  // ../loader-utils/node_modules/@probe.gl/stats/dist/esm/lib/stats.js
+  var Stats2;
+  var init_stats2 = __esm({
+    "../loader-utils/node_modules/@probe.gl/stats/dist/esm/lib/stats.js"() {
+      init_defineProperty();
+      init_stat2();
+      Stats2 = class {
+        constructor(options) {
+          _defineProperty(this, "id", void 0);
+          _defineProperty(this, "stats", {});
+          this.id = options.id;
+          this.stats = {};
+          this._initializeStats(options.stats);
+          Object.seal(this);
+        }
+        get(name) {
+          let type = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "count";
+          return this._getOrCreate({
+            name,
+            type
+          });
+        }
+        get size() {
+          return Object.keys(this.stats).length;
+        }
+        reset() {
+          for (const key in this.stats) {
+            this.stats[key].reset();
+          }
+          return this;
+        }
+        forEach(fn) {
+          for (const key in this.stats) {
+            fn(this.stats[key]);
+          }
+        }
+        getTable() {
+          const table = {};
+          this.forEach((stat) => {
+            table[stat.name] = {
+              time: stat.time || 0,
+              count: stat.count || 0,
+              average: stat.getAverageTime() || 0,
+              hz: stat.getHz() || 0
+            };
+          });
+          return table;
+        }
+        _initializeStats() {
+          let stats = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
+          stats.forEach((stat) => this._getOrCreate(stat));
+        }
+        _getOrCreate(stat) {
+          if (!stat || !stat.name) {
+            return null;
+          }
+          const {
+            name,
+            type
+          } = stat;
+          if (!this.stats[name]) {
+            if (stat instanceof Stat2) {
+              this.stats[name] = stat;
+            } else {
+              this.stats[name] = new Stat2(name, type);
+            }
+          }
+          return this.stats[name];
+        }
+      };
+    }
+  });
+
+  // ../loader-utils/node_modules/@probe.gl/stats/dist/esm/index.js
+  var init_esm4 = __esm({
+    "../loader-utils/node_modules/@probe.gl/stats/dist/esm/index.js"() {
+      init_stats2();
+      init_stat2();
+      init_hi_res_timestamp2();
+    }
+  });
+
   // ../loader-utils/src/lib/request-utils/request-scheduler.ts
   var STAT_QUEUED_REQUESTS, STAT_ACTIVE_REQUESTS, STAT_CANCELLED_REQUESTS, STAT_QUEUED_REQUESTS_EVER, STAT_ACTIVE_REQUESTS_EVER, DEFAULT_PROPS2, RequestScheduler;
   var init_request_scheduler = __esm({
     "../loader-utils/src/lib/request-utils/request-scheduler.ts"() {
-      init_esm3();
+      init_esm4();
       STAT_QUEUED_REQUESTS = "Queued Requests";
       STAT_ACTIVE_REQUESTS = "Active Requests";
       STAT_CANCELLED_REQUESTS = "Cancelled Requests";
@@ -4055,7 +4309,7 @@
           this.requestMap = new Map();
           this.deferredUpdate = null;
           this.props = { ...DEFAULT_PROPS2, ...props };
-          this.stats = new Stats({ id: this.props.id });
+          this.stats = new Stats2({ id: this.props.id });
           this.stats.get(STAT_QUEUED_REQUESTS);
           this.stats.get(STAT_ACTIVE_REQUESTS);
           this.stats.get(STAT_CANCELLED_REQUESTS);
@@ -4936,7 +5190,7 @@
   });
 
   // ../../node_modules/@math.gl/culling/dist/esm/index.js
-  var init_esm4 = __esm({
+  var init_esm5 = __esm({
     "../../node_modules/@math.gl/culling/dist/esm/index.js"() {
       init_constants2();
       init_axis_aligned_bounding_box();
@@ -4958,7 +5212,7 @@
   function getFrameState(viewport, frameNumber) {
     const { cameraDirection, cameraUp, height } = viewport;
     const { metersPerUnit } = viewport.distanceScales;
-    const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];
+    const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
     const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(viewportCenterCartographic, new Vector3());
     const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);
     const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);
@@ -4995,7 +5249,7 @@
   var init_frame_state = __esm({
     "src/tileset/helpers/frame-state.ts"() {
       init_esm();
-      init_esm4();
+      init_esm5();
       init_esm2();
       scratchVector7 = new Vector3();
       scratchPosition3 = new Vector3();
@@ -5458,7 +5712,7 @@
   });
 
   // ../../node_modules/probe.gl/dist/esm/utils/hi-res-timestamp.js
-  function getHiResTimestamp2() {
+  function getHiResTimestamp3() {
     let timestamp;
     if (isBrowser4 && window_3.performance) {
       timestamp = window_3.performance.now();
@@ -5470,7 +5724,7 @@
     }
     return timestamp;
   }
-  var init_hi_res_timestamp2 = __esm({
+  var init_hi_res_timestamp3 = __esm({
     "../../node_modules/probe.gl/dist/esm/utils/hi-res-timestamp.js"() {
       init_globals4();
     }
@@ -5597,7 +5851,7 @@
       init_color();
       init_autobind();
       init_assert4();
-      init_hi_res_timestamp2();
+      init_hi_res_timestamp3();
       originalConsole = {
         debug: isBrowser4 ? console.debug || console.log : console.log,
         log: console.log,
@@ -5621,8 +5875,8 @@
         }) {
           this.id = id;
           this.VERSION = VERSION2;
-          this._startTs = getHiResTimestamp2();
-          this._deltaTs = getHiResTimestamp2();
+          this._startTs = getHiResTimestamp3();
+          this._deltaTs = getHiResTimestamp3();
           this.LOG_THROTTLE_TIMEOUT = 0;
           this._storage = new LocalStorage("__probe-".concat(this.id, "__"), DEFAULT_SETTINGS);
           this.userData = {};
@@ -5643,10 +5897,10 @@
           return this._storage.config.level;
         }
         getTotal() {
-          return Number((getHiResTimestamp2() - this._startTs).toPrecision(10));
+          return Number((getHiResTimestamp3() - this._startTs).toPrecision(10));
         }
         getDelta() {
-          return Number((getHiResTimestamp2() - this._deltaTs).toPrecision(10));
+          return Number((getHiResTimestamp3() - this._deltaTs).toPrecision(10));
         }
         set priority(newPriority) {
           this.level = newPriority;
@@ -5801,11 +6055,11 @@
             assert4(method);
             opts.total = this.getTotal();
             opts.delta = this.getDelta();
-            this._deltaTs = getHiResTimestamp2();
+            this._deltaTs = getHiResTimestamp3();
             const tag = opts.tag || opts.message;
             if (opts.once) {
               if (!cache[tag]) {
-                cache[tag] = getHiResTimestamp2();
+                cache[tag] = getHiResTimestamp3();
               } else {
                 return noop2;
               }
@@ -5820,13 +6074,42 @@
     }
   });
 
+  // ../../node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js
+  var init_hi_res_timestamp4 = __esm({
+    "../../node_modules/@probe.gl/stats/dist/esm/utils/hi-res-timestamp.js"() {
+    }
+  });
+
+  // ../../node_modules/@probe.gl/stats/dist/esm/lib/stat.js
+  var init_stat3 = __esm({
+    "../../node_modules/@probe.gl/stats/dist/esm/lib/stat.js"() {
+      init_hi_res_timestamp4();
+    }
+  });
+
+  // ../../node_modules/@probe.gl/stats/dist/esm/lib/stats.js
+  var init_stats3 = __esm({
+    "../../node_modules/@probe.gl/stats/dist/esm/lib/stats.js"() {
+      init_stat3();
+    }
+  });
+
+  // ../../node_modules/@probe.gl/stats/dist/esm/index.js
+  var init_esm6 = __esm({
+    "../../node_modules/@probe.gl/stats/dist/esm/index.js"() {
+      init_stats3();
+      init_stat3();
+      init_hi_res_timestamp4();
+    }
+  });
+
   // ../../node_modules/probe.gl/dist/esm/index.js
   var esm_default;
-  var init_esm5 = __esm({
+  var init_esm7 = __esm({
     "../../node_modules/probe.gl/dist/esm/index.js"() {
       init_log();
       init_log();
-      init_esm3();
+      init_esm6();
       esm_default = new Log({
         id: "probe.gl"
       });
@@ -5837,7 +6120,7 @@
   var probeLog, NullLog, ConsoleLog;
   var init_loggers = __esm({
     "../core/src/lib/loader-utils/loggers.ts"() {
-      init_esm5();
+      init_esm7();
       probeLog = new Log({ id: "loaders.gl" });
       NullLog = class {
         log() {
@@ -6695,7 +6978,7 @@
   var init_bounding_volume = __esm({
     "src/tileset/helpers/bounding-volume.ts"() {
       init_esm();
-      init_esm4();
+      init_esm5();
       init_esm2();
       init_src2();
       scratchScale = new Vector3();
@@ -7128,7 +7411,7 @@
   var init_tile_3d = __esm({
     "src/tileset/tile-3d.ts"() {
       init_esm();
-      init_esm4();
+      init_esm5();
       init_src3();
       init_constants3();
       init_bounding_volume();

package/dist/es5/tileset/helpers/frame-state.js

@@ -20,7 +20,7 @@ function getFrameState(viewport, frameNumber) {
       cameraUp = viewport.cameraUp,
       height = viewport.height;
   var metersPerUnit = viewport.distanceScales.metersPerUnit;
-  var viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];
+  var viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
 
   var viewportCenterCartesian = _geospatial.Ellipsoid.WGS84.cartographicToCartesian(viewportCenterCartographic, new _core.Vector3());
 

package/dist/es5/tileset/helpers/frame-state.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/tileset/helpers/frame-state.ts"],"names":["scratchVector","Vector3","scratchPosition","cullingVolume","CullingVolume","Plane","getFrameState","viewport","frameNumber","cameraDirection","cameraUp","height","metersPerUnit","distanceScales","viewportCenterCartographic","longitude","latitude","viewportCenterCartesian","Ellipsoid","WGS84","cartographicToCartesian","enuToFixedTransform","eastNorthUpToFixedFrame","cameraPositionCartographic","unprojectPosition","cameraPosition","cameraPositionCartesian","cameraDirectionCartesian","transformAsVector","scale","normalize","cameraUpCartesian","commonSpacePlanesToWGS84","camera","position","direction","up","sseDenominator","frustumPlanes","getFrustumPlanes","i","dir","plane","distanceToCenter","normal","dot","center","copy","distance","add","cartographicPos","cartesianPos","planes","fromPointNormal","subtract"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AAeA,IAAMA,aAAa,GAAG,IAAIC,aAAJ,EAAtB;AACA,IAAMC,eAAe,GAAG,IAAID,aAAJ,EAAxB;AACA,IAAME,aAAa,GAAG,IAAIC,sBAAJ,CAAkB,CACtC,IAAIC,cAAJ,EADsC,EAEtC,IAAIA,cAAJ,EAFsC,EAGtC,IAAIA,cAAJ,EAHsC,EAItC,IAAIA,cAAJ,EAJsC,EAKtC,IAAIA,cAAJ,EALsC,EAMtC,IAAIA,cAAJ,EANsC,CAAlB,CAAtB;;AAWO,SAASC,aAAT,CAAuBC,QAAvB,EAAiCC,WAAjC,EAAkE;AAEvE,MAAOC,eAAP,GAA4CF,QAA5C,CAAOE,eAAP;AAAA,MAAwBC,QAAxB,GAA4CH,QAA5C,CAAwBG,QAAxB;AAAA,MAAkCC,MAAlC,GAA4CJ,QAA5C,CAAkCI,MAAlC;AACA,MAAOC,aAAP,GAAwBL,QAAQ,CAACM,cAAjC,CAAOD,aAAP;AAEA,MAAME,0BAA0B,GAAG,CAACP,QAAQ,CAACQ,SAAV,EAAqBR,QAAQ,CAACS,QAA9B,EAAwC,CAAxC,CAAnC;;AAGA,MAAMC,uBAAuB,GAAGC,sBAAUC,KAAV,CAAgBC,uBAAhB,CAC9BN,0BAD8B,EAE9B,IAAIb,aAAJ,EAF8B,CAAhC;;AAIA,MAAMoB,mBAAmB,GAAGH,sBAAUC,KAAV,CAAgBG,uBAAhB,CAAwCL,uBAAxC,CAA5B;;AAEA,MAAMM,0BAA0B,GAAGhB,QAAQ,CAACiB,iBAAT,CAA2BjB,QAAQ,CAACkB,cAApC,CAAnC;;AACA,MAAMC,uBAAuB,GAAGR,sBAAUC,KAAV,CAAgBC,uBAAhB,CAC9BG,0BAD8B,EAE9B,IAAItB,aAAJ,EAF8B,CAAhC;;AAMA,MAAM0B,wBAAwB,GAAG,IAAI1B,aAAJ,CAE/BoB,mBAAmB,CAACO,iBAApB,CAAsC,IAAI3B,aAAJ,CAAYQ,eAAZ,EAA6BoB,KAA7B,CAAmCjB,aAAnC,CAAtC,CAF+B,EAG/BkB,SAH+B,EAAjC;AAIA,MAAMC,iBAAiB,GAAG,IAAI9B,aAAJ,CAExBoB,mBAAmB,CAACO,iBAApB,CAAsC,IAAI3B,aAAJ,CAAYS,QAAZ,EAAsBmB,KAAtB,CAA4BjB,aAA5B,CAAtC,CAFwB,EAGxBkB,SAHwB,EAA1B;AAKAE,EAAAA,wBAAwB,CAACzB,QAAD,EAAWU,uBAAX,CAAxB;AAGA,SAAO;AACLgB,IAAAA,MAAM,EAAE;AACNC,MAAAA,QAAQ,EAAER,uBADJ;AAENS,MAAAA,SAAS,EAAER,wBAFL;AAGNS,MAAAA,EAAE,EAAEL;AAHE,KADH;AAMLxB,IAAAA,QAAQ,EAARA,QANK;AAOLI,IAAAA,MAAM,EAANA,MAPK;AAQLR,IAAAA,aAAa,EAAbA,aARK;AASLK,IAAAA,WAAW,EAAXA,WATK;AAUL6B,IAAAA,cAAc,EAAE;AAVX,GAAP;AAYD;;AAED,SAASL,wBAAT,CAAkCzB,QAAlC,EAA4CU,uBAA5C,EAAqE;AAEnE,MAAMqB,aAAa,GAAG/B,QAAQ,CAACgC,gBAAT,EAAtB;AACA,MAAIC,CAAC,GAAG,CAAR;;AACA,OAAK,IAAMC,GAAX,IAAkBH,aAAlB,EAAiC;AAC/B,QAAMI,KAAK,GAAGJ,aAAa,CAACG,GAAD,CAA3B;AACA,QAAME,gBAAgB,GAAGD,KAAK,CAACE,MAAN,CAAaC,GAAb,CAAiBtC,QAAQ,CAACuC,MAA1B,CAAzB;AACA5C,IAAAA,eAAe,CACZ6C,IADH,CACQL,KAAK,CAACE,MADd,EAEGf,KAFH,CAESa,KAAK,CAACM,QAAN,GAAiBL,gBAF1B,EAGGM,GAHH,CAGO1C,QAAQ,CAACuC,MAHhB;AAIA,QAAMI,eAAe,GAAG3C,QAAQ,CAACiB,iBAAT,CAA2BtB,eAA3B,CAAxB;;AAEA,QAAMiD,YAAY,GAAGjC,sBAAUC,KAAV,CAAgBC,uBAAhB,CAAwC8B,eAAxC,EAAyD,IAAIjD,aAAJ,EAAzD,CAArB;;AAEAE,IAAAA,aAAa,CAACiD,MAAd,CAAqBZ,CAAC,EAAtB,EAA0Ba,eAA1B,CACEF,YADF,EAGEnD,aAAa,CAAC+C,IAAd,CAAmB9B,uBAAnB,EAA4CqC,QAA5C,CAAqDH,YAArD,CAHF;AAKD;AACF","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {CullingVolume, Plane} from '@math.gl/culling';\nimport {Ellipsoid} from '@math.gl/geospatial';\n\nexport type FrameState = {\n  camera: {\n    position: number[];\n    direction: number[];\n    up: number[];\n  };\n  viewport: {[key: string]: any};\n  height: number;\n  cullingVolume: CullingVolume;\n  frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?\n  sseDenominator: number; // Assumes fovy = 60 degrees\n};\n\nconst scratchVector = new Vector3();\nconst scratchPosition = new Vector3();\nconst cullingVolume = new CullingVolume([\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane()\n]);\n\n// Extracts a frame state appropriate for tile culling from a deck.gl viewport\n// TODO - this could likely be generalized and merged back into deck.gl for other culling scenarios\nexport function getFrameState(viewport, frameNumber: number): FrameState {\n  // Traverse and and request. Update _selectedTiles so that we know what to render.\n  const {cameraDirection, cameraUp, height} = viewport;\n  const {metersPerUnit} = viewport.distanceScales;\n\n  const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?\n  const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    viewportCenterCartographic,\n    new Vector3()\n  );\n  const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);\n\n  const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);\n  const cameraPositionCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    cameraPositionCartographic,\n    new Vector3()\n  );\n\n  // These should still be normalized as the transform has scale 1 (goes from meters to meters)\n  const cameraDirectionCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraDirection).scale(metersPerUnit))\n  ).normalize();\n  const cameraUpCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))\n  ).normalize();\n\n  commonSpacePlanesToWGS84(viewport, viewportCenterCartesian);\n\n  // TODO: make a file/class for frameState and document what needs to be attached to this so that traversal can function\n  return {\n    camera: {\n      position: cameraPositionCartesian,\n      direction: cameraDirectionCartesian,\n      up: cameraUpCartesian\n    },\n    viewport,\n    height,\n    cullingVolume,\n    frameNumber, // TODO: This can be the same between updates, what number is unique for between updates?\n    sseDenominator: 1.15 // Assumes fovy = 60 degrees\n  };\n}\n\nfunction commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {\n  // Extract frustum planes based on current view.\n  const frustumPlanes = viewport.getFrustumPlanes();\n  let i = 0;\n  for (const dir in frustumPlanes) {\n    const plane = frustumPlanes[dir];\n    const distanceToCenter = plane.normal.dot(viewport.center);\n    scratchPosition\n      .copy(plane.normal)\n      .scale(plane.distance - distanceToCenter)\n      .add(viewport.center);\n    const cartographicPos = viewport.unprojectPosition(scratchPosition);\n\n    const cartesianPos = Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new Vector3());\n\n    cullingVolume.planes[i++].fromPointNormal(\n      cartesianPos,\n      // Want the normal to point into the frustum since that's what culling expects\n      scratchVector.copy(viewportCenterCartesian).subtract(cartesianPos)\n    );\n  }\n}\n"],"file":"frame-state.js"}
+{"version":3,"sources":["../../../../src/tileset/helpers/frame-state.ts"],"names":["scratchVector","Vector3","scratchPosition","cullingVolume","CullingVolume","Plane","getFrameState","viewport","frameNumber","cameraDirection","cameraUp","height","metersPerUnit","distanceScales","viewportCenterCartographic","unprojectPosition","center","viewportCenterCartesian","Ellipsoid","WGS84","cartographicToCartesian","enuToFixedTransform","eastNorthUpToFixedFrame","cameraPositionCartographic","cameraPosition","cameraPositionCartesian","cameraDirectionCartesian","transformAsVector","scale","normalize","cameraUpCartesian","commonSpacePlanesToWGS84","camera","position","direction","up","sseDenominator","frustumPlanes","getFrustumPlanes","i","dir","plane","distanceToCenter","normal","dot","copy","distance","add","cartographicPos","cartesianPos","planes","fromPointNormal","subtract"],"mappings":"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","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {CullingVolume, Plane} from '@math.gl/culling';\nimport {Ellipsoid} from '@math.gl/geospatial';\n\nexport type FrameState = {\n  camera: {\n    position: number[];\n    direction: number[];\n    up: number[];\n  };\n  viewport: {[key: string]: any};\n  height: number;\n  cullingVolume: CullingVolume;\n  frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?\n  sseDenominator: number; // Assumes fovy = 60 degrees\n};\n\nconst scratchVector = new Vector3();\nconst scratchPosition = new Vector3();\nconst cullingVolume = new CullingVolume([\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane()\n]);\n\n// Extracts a frame state appropriate for tile culling from a deck.gl viewport\n// TODO - this could likely be generalized and merged back into deck.gl for other culling scenarios\nexport function getFrameState(viewport, frameNumber: number): FrameState {\n  // Traverse and and request. Update _selectedTiles so that we know what to render.\n  const {cameraDirection, cameraUp, height} = viewport;\n  const {metersPerUnit} = viewport.distanceScales;\n\n  const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?\n  const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    viewportCenterCartographic,\n    new Vector3()\n  );\n  const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);\n\n  const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);\n  const cameraPositionCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    cameraPositionCartographic,\n    new Vector3()\n  );\n\n  // These should still be normalized as the transform has scale 1 (goes from meters to meters)\n  const cameraDirectionCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraDirection).scale(metersPerUnit))\n  ).normalize();\n  const cameraUpCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))\n  ).normalize();\n\n  commonSpacePlanesToWGS84(viewport, viewportCenterCartesian);\n\n  // TODO: make a file/class for frameState and document what needs to be attached to this so that traversal can function\n  return {\n    camera: {\n      position: cameraPositionCartesian,\n      direction: cameraDirectionCartesian,\n      up: cameraUpCartesian\n    },\n    viewport,\n    height,\n    cullingVolume,\n    frameNumber, // TODO: This can be the same between updates, what number is unique for between updates?\n    sseDenominator: 1.15 // Assumes fovy = 60 degrees\n  };\n}\n\nfunction commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {\n  // Extract frustum planes based on current view.\n  const frustumPlanes = viewport.getFrustumPlanes();\n  let i = 0;\n  for (const dir in frustumPlanes) {\n    const plane = frustumPlanes[dir];\n    const distanceToCenter = plane.normal.dot(viewport.center);\n    scratchPosition\n      .copy(plane.normal)\n      .scale(plane.distance - distanceToCenter)\n      .add(viewport.center);\n    const cartographicPos = viewport.unprojectPosition(scratchPosition);\n\n    const cartesianPos = Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new Vector3());\n\n    cullingVolume.planes[i++].fromPointNormal(\n      cartesianPos,\n      // Want the normal to point into the frustum since that's what culling expects\n      scratchVector.copy(viewportCenterCartesian).subtract(cartesianPos)\n    );\n  }\n}\n"],"file":"frame-state.js"}

package/dist/esm/tileset/helpers/frame-state.js

@@ -13,7 +13,7 @@ export function getFrameState(viewport, frameNumber) {
   const {
     metersPerUnit
   } = viewport.distanceScales;
-  const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];
+  const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
   const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(viewportCenterCartographic, new Vector3());
   const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);
   const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);

package/dist/esm/tileset/helpers/frame-state.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/tileset/helpers/frame-state.ts"],"names":["Vector3","CullingVolume","Plane","Ellipsoid","scratchVector","scratchPosition","cullingVolume","getFrameState","viewport","frameNumber","cameraDirection","cameraUp","height","metersPerUnit","distanceScales","viewportCenterCartographic","longitude","latitude","viewportCenterCartesian","WGS84","cartographicToCartesian","enuToFixedTransform","eastNorthUpToFixedFrame","cameraPositionCartographic","unprojectPosition","cameraPosition","cameraPositionCartesian","cameraDirectionCartesian","transformAsVector","scale","normalize","cameraUpCartesian","commonSpacePlanesToWGS84","camera","position","direction","up","sseDenominator","frustumPlanes","getFrustumPlanes","i","dir","plane","distanceToCenter","normal","dot","center","copy","distance","add","cartographicPos","cartesianPos","planes","fromPointNormal","subtract"],"mappings":"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","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {CullingVolume, Plane} from '@math.gl/culling';\nimport {Ellipsoid} from '@math.gl/geospatial';\n\nexport type FrameState = {\n  camera: {\n    position: number[];\n    direction: number[];\n    up: number[];\n  };\n  viewport: {[key: string]: any};\n  height: number;\n  cullingVolume: CullingVolume;\n  frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?\n  sseDenominator: number; // Assumes fovy = 60 degrees\n};\n\nconst scratchVector = new Vector3();\nconst scratchPosition = new Vector3();\nconst cullingVolume = new CullingVolume([\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane()\n]);\n\n// Extracts a frame state appropriate for tile culling from a deck.gl viewport\n// TODO - this could likely be generalized and merged back into deck.gl for other culling scenarios\nexport function getFrameState(viewport, frameNumber: number): FrameState {\n  // Traverse and and request. Update _selectedTiles so that we know what to render.\n  const {cameraDirection, cameraUp, height} = viewport;\n  const {metersPerUnit} = viewport.distanceScales;\n\n  const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?\n  const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    viewportCenterCartographic,\n    new Vector3()\n  );\n  const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);\n\n  const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);\n  const cameraPositionCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    cameraPositionCartographic,\n    new Vector3()\n  );\n\n  // These should still be normalized as the transform has scale 1 (goes from meters to meters)\n  const cameraDirectionCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraDirection).scale(metersPerUnit))\n  ).normalize();\n  const cameraUpCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))\n  ).normalize();\n\n  commonSpacePlanesToWGS84(viewport, viewportCenterCartesian);\n\n  // TODO: make a file/class for frameState and document what needs to be attached to this so that traversal can function\n  return {\n    camera: {\n      position: cameraPositionCartesian,\n      direction: cameraDirectionCartesian,\n      up: cameraUpCartesian\n    },\n    viewport,\n    height,\n    cullingVolume,\n    frameNumber, // TODO: This can be the same between updates, what number is unique for between updates?\n    sseDenominator: 1.15 // Assumes fovy = 60 degrees\n  };\n}\n\nfunction commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {\n  // Extract frustum planes based on current view.\n  const frustumPlanes = viewport.getFrustumPlanes();\n  let i = 0;\n  for (const dir in frustumPlanes) {\n    const plane = frustumPlanes[dir];\n    const distanceToCenter = plane.normal.dot(viewport.center);\n    scratchPosition\n      .copy(plane.normal)\n      .scale(plane.distance - distanceToCenter)\n      .add(viewport.center);\n    const cartographicPos = viewport.unprojectPosition(scratchPosition);\n\n    const cartesianPos = Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new Vector3());\n\n    cullingVolume.planes[i++].fromPointNormal(\n      cartesianPos,\n      // Want the normal to point into the frustum since that's what culling expects\n      scratchVector.copy(viewportCenterCartesian).subtract(cartesianPos)\n    );\n  }\n}\n"],"file":"frame-state.js"}
+{"version":3,"sources":["../../../../src/tileset/helpers/frame-state.ts"],"names":["Vector3","CullingVolume","Plane","Ellipsoid","scratchVector","scratchPosition","cullingVolume","getFrameState","viewport","frameNumber","cameraDirection","cameraUp","height","metersPerUnit","distanceScales","viewportCenterCartographic","unprojectPosition","center","viewportCenterCartesian","WGS84","cartographicToCartesian","enuToFixedTransform","eastNorthUpToFixedFrame","cameraPositionCartographic","cameraPosition","cameraPositionCartesian","cameraDirectionCartesian","transformAsVector","scale","normalize","cameraUpCartesian","commonSpacePlanesToWGS84","camera","position","direction","up","sseDenominator","frustumPlanes","getFrustumPlanes","i","dir","plane","distanceToCenter","normal","dot","copy","distance","add","cartographicPos","cartesianPos","planes","fromPointNormal","subtract"],"mappings":"AAAA,SAAQA,OAAR,QAAsB,eAAtB;AACA,SAAQC,aAAR,EAAuBC,KAAvB,QAAmC,kBAAnC;AACA,SAAQC,SAAR,QAAwB,qBAAxB;AAeA,MAAMC,aAAa,GAAG,IAAIJ,OAAJ,EAAtB;AACA,MAAMK,eAAe,GAAG,IAAIL,OAAJ,EAAxB;AACA,MAAMM,aAAa,GAAG,IAAIL,aAAJ,CAAkB,CACtC,IAAIC,KAAJ,EADsC,EAEtC,IAAIA,KAAJ,EAFsC,EAGtC,IAAIA,KAAJ,EAHsC,EAItC,IAAIA,KAAJ,EAJsC,EAKtC,IAAIA,KAAJ,EALsC,EAMtC,IAAIA,KAAJ,EANsC,CAAlB,CAAtB;AAWA,OAAO,SAASK,aAAT,CAAuBC,QAAvB,EAAiCC,WAAjC,EAAkE;AAEvE,QAAM;AAACC,IAAAA,eAAD;AAAkBC,IAAAA,QAAlB;AAA4BC,IAAAA;AAA5B,MAAsCJ,QAA5C;AACA,QAAM;AAACK,IAAAA;AAAD,MAAkBL,QAAQ,CAACM,cAAjC;AAEA,QAAMC,0BAA0B,GAAGP,QAAQ,CAACQ,iBAAT,CAA2BR,QAAQ,CAACS,MAApC,CAAnC;AAGA,QAAMC,uBAAuB,GAAGf,SAAS,CAACgB,KAAV,CAAgBC,uBAAhB,CAC9BL,0BAD8B,EAE9B,IAAIf,OAAJ,EAF8B,CAAhC;AAIA,QAAMqB,mBAAmB,GAAGlB,SAAS,CAACgB,KAAV,CAAgBG,uBAAhB,CAAwCJ,uBAAxC,CAA5B;AAEA,QAAMK,0BAA0B,GAAGf,QAAQ,CAACQ,iBAAT,CAA2BR,QAAQ,CAACgB,cAApC,CAAnC;AACA,QAAMC,uBAAuB,GAAGtB,SAAS,CAACgB,KAAV,CAAgBC,uBAAhB,CAC9BG,0BAD8B,EAE9B,IAAIvB,OAAJ,EAF8B,CAAhC;AAMA,QAAM0B,wBAAwB,GAAG,IAAI1B,OAAJ,CAE/BqB,mBAAmB,CAACM,iBAApB,CAAsC,IAAI3B,OAAJ,CAAYU,eAAZ,EAA6BkB,KAA7B,CAAmCf,aAAnC,CAAtC,CAF+B,EAG/BgB,SAH+B,EAAjC;AAIA,QAAMC,iBAAiB,GAAG,IAAI9B,OAAJ,CAExBqB,mBAAmB,CAACM,iBAApB,CAAsC,IAAI3B,OAAJ,CAAYW,QAAZ,EAAsBiB,KAAtB,CAA4Bf,aAA5B,CAAtC,CAFwB,EAGxBgB,SAHwB,EAA1B;AAKAE,EAAAA,wBAAwB,CAACvB,QAAD,EAAWU,uBAAX,CAAxB;AAGA,SAAO;AACLc,IAAAA,MAAM,EAAE;AACNC,MAAAA,QAAQ,EAAER,uBADJ;AAENS,MAAAA,SAAS,EAAER,wBAFL;AAGNS,MAAAA,EAAE,EAAEL;AAHE,KADH;AAMLtB,IAAAA,QANK;AAOLI,IAAAA,MAPK;AAQLN,IAAAA,aARK;AASLG,IAAAA,WATK;AAUL2B,IAAAA,cAAc,EAAE;AAVX,GAAP;AAYD;;AAED,SAASL,wBAAT,CAAkCvB,QAAlC,EAA4CU,uBAA5C,EAAqE;AAEnE,QAAMmB,aAAa,GAAG7B,QAAQ,CAAC8B,gBAAT,EAAtB;AACA,MAAIC,CAAC,GAAG,CAAR;;AACA,OAAK,MAAMC,GAAX,IAAkBH,aAAlB,EAAiC;AAC/B,UAAMI,KAAK,GAAGJ,aAAa,CAACG,GAAD,CAA3B;AACA,UAAME,gBAAgB,GAAGD,KAAK,CAACE,MAAN,CAAaC,GAAb,CAAiBpC,QAAQ,CAACS,MAA1B,CAAzB;AACAZ,IAAAA,eAAe,CACZwC,IADH,CACQJ,KAAK,CAACE,MADd,EAEGf,KAFH,CAESa,KAAK,CAACK,QAAN,GAAiBJ,gBAF1B,EAGGK,GAHH,CAGOvC,QAAQ,CAACS,MAHhB;AAIA,UAAM+B,eAAe,GAAGxC,QAAQ,CAACQ,iBAAT,CAA2BX,eAA3B,CAAxB;AAEA,UAAM4C,YAAY,GAAG9C,SAAS,CAACgB,KAAV,CAAgBC,uBAAhB,CAAwC4B,eAAxC,EAAyD,IAAIhD,OAAJ,EAAzD,CAArB;AAEAM,IAAAA,aAAa,CAAC4C,MAAd,CAAqBX,CAAC,EAAtB,EAA0BY,eAA1B,CACEF,YADF,EAGE7C,aAAa,CAACyC,IAAd,CAAmB3B,uBAAnB,EAA4CkC,QAA5C,CAAqDH,YAArD,CAHF;AAKD;AACF","sourcesContent":["import {Vector3} from '@math.gl/core';\nimport {CullingVolume, Plane} from '@math.gl/culling';\nimport {Ellipsoid} from '@math.gl/geospatial';\n\nexport type FrameState = {\n  camera: {\n    position: number[];\n    direction: number[];\n    up: number[];\n  };\n  viewport: {[key: string]: any};\n  height: number;\n  cullingVolume: CullingVolume;\n  frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?\n  sseDenominator: number; // Assumes fovy = 60 degrees\n};\n\nconst scratchVector = new Vector3();\nconst scratchPosition = new Vector3();\nconst cullingVolume = new CullingVolume([\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane(),\n  new Plane()\n]);\n\n// Extracts a frame state appropriate for tile culling from a deck.gl viewport\n// TODO - this could likely be generalized and merged back into deck.gl for other culling scenarios\nexport function getFrameState(viewport, frameNumber: number): FrameState {\n  // Traverse and and request. Update _selectedTiles so that we know what to render.\n  const {cameraDirection, cameraUp, height} = viewport;\n  const {metersPerUnit} = viewport.distanceScales;\n\n  const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.\n  // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?\n  const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    viewportCenterCartographic,\n    new Vector3()\n  );\n  const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);\n\n  const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);\n  const cameraPositionCartesian = Ellipsoid.WGS84.cartographicToCartesian(\n    cameraPositionCartographic,\n    new Vector3()\n  );\n\n  // These should still be normalized as the transform has scale 1 (goes from meters to meters)\n  const cameraDirectionCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraDirection).scale(metersPerUnit))\n  ).normalize();\n  const cameraUpCartesian = new Vector3(\n    // @ts-ignore\n    enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))\n  ).normalize();\n\n  commonSpacePlanesToWGS84(viewport, viewportCenterCartesian);\n\n  // TODO: make a file/class for frameState and document what needs to be attached to this so that traversal can function\n  return {\n    camera: {\n      position: cameraPositionCartesian,\n      direction: cameraDirectionCartesian,\n      up: cameraUpCartesian\n    },\n    viewport,\n    height,\n    cullingVolume,\n    frameNumber, // TODO: This can be the same between updates, what number is unique for between updates?\n    sseDenominator: 1.15 // Assumes fovy = 60 degrees\n  };\n}\n\nfunction commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {\n  // Extract frustum planes based on current view.\n  const frustumPlanes = viewport.getFrustumPlanes();\n  let i = 0;\n  for (const dir in frustumPlanes) {\n    const plane = frustumPlanes[dir];\n    const distanceToCenter = plane.normal.dot(viewport.center);\n    scratchPosition\n      .copy(plane.normal)\n      .scale(plane.distance - distanceToCenter)\n      .add(viewport.center);\n    const cartographicPos = viewport.unprojectPosition(scratchPosition);\n\n    const cartesianPos = Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new Vector3());\n\n    cullingVolume.planes[i++].fromPointNormal(\n      cartesianPos,\n      // Want the normal to point into the frustum since that's what culling expects\n      scratchVector.copy(viewportCenterCartesian).subtract(cartesianPos)\n    );\n  }\n}\n"],"file":"frame-state.js"}

package/dist/tileset/helpers/frame-state.js

@@ -20,7 +20,7 @@ function getFrameState(viewport, frameNumber) {
     // Traverse and and request. Update _selectedTiles so that we know what to render.
     const { cameraDirection, cameraUp, height } = viewport;
     const { metersPerUnit } = viewport.distanceScales;
-    const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];
+    const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
     // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.
     // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?
     const viewportCenterCartesian = geospatial_1.Ellipsoid.WGS84.cartographicToCartesian(viewportCenterCartographic, new core_1.Vector3());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tiles",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Common components for different tiles loaders.",
   "license": "MIT",
   "publishConfig": {
@@ -33,16 +33,16 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/bundle.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "3.1.0",
-    "@loaders.gl/math": "3.1.0",
+    "@loaders.gl/loader-utils": "3.1.1",
+    "@loaders.gl/math": "3.1.1",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
     "@math.gl/web-mercator": "^3.5.1",
-    "@probe.gl/stats": "^3.4.0"
+    "@probe.gl/stats": "^3.5.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "3.1.0-beta.1"
+    "@loaders.gl/core": "3.1.0"
   },
-  "gitHead": "b02a011b5a6d6aa6c5870819045c70db168cb930"
+  "gitHead": "ed3c238bcb68ab5a2d4ddc64319f6f4c02a20df7"
 }

package/src/tileset/helpers/frame-state.ts

@@ -33,7 +33,7 @@ export function getFrameState(viewport, frameNumber: number): FrameState {
   const {cameraDirection, cameraUp, height} = viewport;
   const {metersPerUnit} = viewport.distanceScales;
 
-  const viewportCenterCartographic = [viewport.longitude, viewport.latitude, 0];
+  const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
   // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.
   // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?
   const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(