npm - itowns - Versions diffs - 2.44.3-next.35 → 2.44.3-next.37 - Mend

itowns 2.44.3-next.35 → 2.44.3-next.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/dist/itowns.js +1 -1
package/dist/itowns.js.map +1 -1
package/examples/copc_simple_loader.html +15 -5
package/lib/Core/MainLoop.js +1 -3
package/lib/Core/Prefab/TileBuilder.js +8 -5
package/lib/Core/Scheduler/Cache.js +1 -240
package/lib/Core/Style.js +11 -8
package/lib/Core/TileGeometry.js +2 -2
package/lib/Layer/CopcLayer.js +2 -2
package/lib/Layer/EntwinePointTileLayer.js +2 -2
package/lib/Layer/Layer.js +10 -5
package/lib/Layer/PointCloudLayer.js +5 -3
package/lib/Layer/Potree2Layer.js +2 -0
package/lib/Layer/PotreeLayer.js +2 -0
package/lib/Renderer/PointsMaterial.js +4 -4
package/lib/Source/FileSource.js +8 -6
package/lib/Source/OrientedImageSource.js +2 -2
package/lib/Source/Source.js +24 -41
package/lib/Source/VectorTilesSource.js +5 -11
package/lib/Source/WFSSource.js +3 -3
package/package.json +2 -1

package/examples/copc_simple_loader.html CHANGED Viewed

@@ -19,7 +19,7 @@
     </head>
     <body>
         <div id="description">Specify the URL of a COPC file to load:
-            <input type="text" id="url" />
+            <input type="text" id="copc_url" />
             <button onclick="readURL()">Load</button>
             <div>
                 <button onClick="loadAutzen()">Load Autzen Stadium (80mb)</button>
@@ -71,7 +71,7 @@
             function readURL() {
-                const url = document.getElementById('url').value;
+                const url = document.getElementById('copc_url').value;
                 if (url) {
                     setUrl(url);
@@ -81,7 +81,7 @@
             function setUrl(url) {
                 if (!url) return;
-                const input_url = document.getElementById('url');
+                const input_url = document.getElementById('copc_url');
                 if (!input_url) return;
                 uri.searchParams.set('copc', url);
@@ -93,6 +93,13 @@
             function load(url) {
+                const options = {};
+                const urlParams = uri.searchParams
+                urlParams.keys().forEach(key => {
+                    if (key !== 'copc') {
+                        options[key] = parseInt(urlParams.get(key), 10);
+                    }
+                });
                 const source = new itowns.CopcSource({ url });
                 if (layer) {
@@ -102,12 +109,15 @@
                     layer.delete();
                 }
-                layer = new itowns.CopcLayer('COPC', {
+                const config = {
                     source,
                     crs: view.referenceCrs,
                     sseThreshold: 2,
                     pointBudget: 3000000,
-                });
+                    ...options,
+                };
+                layer = new itowns.CopcLayer('COPC', config);
                 view.addLayer(layer).then(onLayerReady);
                 layer.whenReady
                     .then(() => debug.PointCloudDebug.initTools(view, layer, gui));

package/lib/Core/MainLoop.js CHANGED Viewed

@@ -42,7 +42,6 @@ function updateElements(context, geometryLayer, elements) {
         for (const attachedLayer of geometryLayer.attachedLayers) {
           if (attachedLayer.ready) {
             attachedLayer.update(context, attachedLayer, sub.element, sub.parent);
-            attachedLayer.cache.flush();
           }
         }
       } else if (sub.elements) {
@@ -56,7 +55,6 @@ function updateElements(context, geometryLayer, elements) {
           for (const attachedLayer of geometryLayer.attachedLayers) {
             if (attachedLayer.ready) {
               attachedLayer.update(context, attachedLayer, sub.elements[i], sub.parent);
-              attachedLayer.cache.flush();
             }
           }
         }
@@ -140,7 +138,7 @@ class MainLoop extends EventDispatcher {
         }
         // Clear the cache of expired resources
-        geometryLayer.cache.flush();
         view.execFrameRequesters(MAIN_LOOP_EVENTS.AFTER_LAYER_UPDATE, dt, this.#updateLoopRestarted, geometryLayer);
       }
     }

package/lib/Core/Prefab/TileBuilder.js CHANGED Viewed

@@ -1,10 +1,12 @@
 import * as THREE from 'three';
 import { TileGeometry } from "../TileGeometry.js";
-import Cache from "../Scheduler/Cache.js";
+import { LRUCache } from 'lru-cache';
 import { computeBuffers } from "./computeBufferTileGeometry.js";
 import OBB from "../../Renderer/OBB.js";
 const cacheBuffer = new Map();
-const cacheTile = new Cache();
+const cacheTile = new LRUCache({
+  max: 500
+});
 /**
  * Reference to a tile's extent with rigid transformations.
@@ -19,7 +21,8 @@ export function newTileGeometry(builder, params) {
   } = builder.computeShareableExtent(params.extent);
   const south = shareableExtent.south.toFixed(6);
   const bufferKey = `${builder.crs}_${params.disableSkirt ? 0 : 1}_${params.segments}`;
-  let promiseGeometry = cacheTile.get(south, params.level, bufferKey);
+  const key = `s${south}l${params.level}bK${bufferKey}`;
+  let promiseGeometry = cacheTile.get(key);
   // build geometry if doesn't exist
   if (!promiseGeometry) {
@@ -27,7 +30,7 @@ export function newTileGeometry(builder, params) {
     promiseGeometry = new Promise(r => {
       resolve = r;
     });
-    cacheTile.set(promiseGeometry, south, params.level, bufferKey);
+    cacheTile.set(key, promiseGeometry);
     params.extent = shareableExtent;
     params.center = builder.center(params.extent).clone();
     // Read previously cached values (index and uv.wgs84 only
@@ -63,7 +66,7 @@ export function newTileGeometry(builder, params) {
     };
     const geometry = new TileGeometry(builder, params, gpuBuffers);
     geometry.OBB = new OBB(geometry.boundingBox.min, geometry.boundingBox.max);
-    geometry.initRefCount(cacheTile, [south, params.level, bufferKey]);
+    geometry.initRefCount(cacheTile, key);
     resolve(geometry);
     return Promise.resolve({
       geometry,

package/lib/Core/Scheduler/Cache.js CHANGED Viewed

@@ -1,5 +1,3 @@
-let entry;
 /**
  * Cache policies for flushing. Those policies can be used when something is
  * [set]{@link Cache.set} into the Cache, as the lifetime property.
@@ -16,241 +14,4 @@ export const CACHE_POLICIES = {
   INFINITE: Infinity,
   TEXTURE: 900000,
   GEOMETRY: 900000
-};
-/**
- * This is a copy of the Map object, except that it also store a value for last
- * time used. This value is used for cache expiration mechanism.
- *
- * @example
- * import Cache, { CACHE_POLICIES } from 'Core/Scheduler/Cache';
- *
- * const cache = new Cache(CACHE_POLICIES.TEXTURE)
- * cache.set({ bar: 1 }, 'foo');
- * cache.set({ bar: 32 }, 'foo', 'toto');
- *
- * cache.get('foo');
- *
- * cache.delete('foo');
- *
- * cache.clear();
- *
- * cache.flush();
- */
-class Cache {
-  /**
-   * @param      {number}  [lifetime=CACHE_POLICIES.INFINITE]  The cache expiration time for all values.
-   */
-  constructor() {
-    let lifetime = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : CACHE_POLICIES.INFINITE;
-    this.lifeTime = lifetime;
-    this.lastTimeFlush = Date.now();
-    this.data = new Map();
-  }
-  /**
-   * Returns the entry related to the specified key, content in array, from the cache.
-   * The array contents one to three key.
-   * The last time used property of the entry is updated to extend the longevity of the
-   * entry.
-   *
-   * @param {string[]|number[]} keyArray key array ([key0, key1, key3])
-   *
-   * @return {Object}
-   */
-  getByArray(keyArray) {
-    return this.get(keyArray[0], keyArray[1], keyArray[2]);
-  }
-  /**
-  * Adds or updates an entry with specified keys array ([key0, key1, key3]).
-  * Caution: it overrides any existing entry already set at this/those key/s.
-  *
-  * @param {Object} value to add in cache
-  * @param {string[]|number[]} keyArray key array ([key0, key1, key3])
-  *
-  * @return {Object} the added value
-  */
-  setByArray(value, keyArray) {
-    return this.set(value, keyArray[0], keyArray[1], keyArray[2]);
-  }
-  /**
-   * Returns the entry related to the specified key from the cache. The last
-   * time used property of the entry is updated to extend the longevity of the
-   * entry.
-   *
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   *
-   * @return {Object}
-   */
-  get(key1, key2, key3) {
-    const entry_1 = this.data.get(key1);
-    if (entry_1 == undefined) {
-      return;
-    }
-    if (entry_1.lastTimeUsed != undefined) {
-      entry = entry_1;
-    } else {
-      const entry_2 = entry_1.get(key2);
-      if (entry_2 == undefined) {
-        return;
-      }
-      if (entry_2.lastTimeUsed != undefined) {
-        entry = entry_2;
-      } else {
-        const entry_3 = entry_2.get(key3);
-        if (entry_3 == undefined) {
-          return;
-        }
-        entry = entry_3;
-      }
-    }
-    if (entry.value) {
-      entry.lastTimeUsed = Date.now();
-      return entry.value;
-    }
-  }
-  /**
-   * Adds or updates an entry with specified keys (up to 3).
-   * Caution: it overrides any existing entry already set at this/those key/s.
-   *
-   *
-   * @param {Object} value to add in cache
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   *
-   * @return {Object} the added value
-   */
-  set(value, key1, key2, key3) {
-    entry = {
-      value,
-      lastTimeUsed: Date.now()
-    };
-    if (key2 == undefined) {
-      this.data.set(key1, entry);
-      return value;
-    }
-    if (!this.data.get(key1)) {
-      this.data.set(key1, new Map());
-    }
-    const entry_map = this.data.get(key1);
-    if (key3 == undefined) {
-      entry_map.set(key2, entry);
-      return value;
-    }
-    if (!entry_map.get(key2)) {
-      entry_map.set(key2, new Map());
-    }
-    entry_map.get(key2).set(key3, entry);
-    return value;
-  }
-  /**
-   * Deletes the specified entry from the cache.
-   *
-   * @param {string|number} key1
-   * @param {string|number} [key2]
-   * @param {string|number} [key3]
-   */
-  delete(key1, key2, key3) {
-    const entry_1 = this.data.get(key1);
-    if (entry_1 === undefined) {
-      return;
-    }
-    if (entry_1.lastTimeUsed != undefined) {
-      delete this.data.get(key1);
-      this.data.delete(key1);
-    } else {
-      const entry_2 = entry_1.get(key2);
-      if (entry_2 === undefined) {
-        return;
-      }
-      if (entry_2.lastTimeUsed != undefined) {
-        delete entry_1.get(key2);
-        entry_1.delete(key2);
-        if (entry_1.size == 0) {
-          this.data.delete(key1);
-        }
-      } else {
-        const entry_3 = entry_2.get(key3);
-        if (entry_3 === undefined) {
-          return;
-        }
-        delete entry_2.get(key3);
-        entry_2.delete(key3);
-        if (entry_2.size == 0) {
-          entry_1.delete(key2);
-          if (entry_1.size == 0) {
-            this.data.delete(key1);
-          }
-        }
-      }
-    }
-  }
-  /**
-   * Removes all entries of the cache.
-   *
-   */
-  clear() {
-    this.data.clear();
-  }
-  /**
-   * Flush the cache: entries that have been present for too long since the
-   * last time they were used, are removed from the cache. By default, the
-   * time is the current time, but the interval can be reduced by doing
-   * something like `Cache.flush(Date.now() - reductionTime)`. If you want to
-   * clear the whole cache, use {@link Cache.clear} instead.
-   *
-   * @param {number} [time=Date.now()]
-   */
-  flush() {
-    let time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : Date.now();
-    if (this.lifeTime == CACHE_POLICIES.INFINITE || this.lifeTime > time - this.lastTimeFlush || !this.data.size) {
-      return;
-    }
-    this.lastTimeFlush = Infinity;
-    this.data.forEach((v1, i) => {
-      if (this.lifeTime < time - v1.lastTimeUsed) {
-        delete this.data.get(i);
-        this.data.delete(i);
-      } else {
-        v1.forEach((v2, j) => {
-          if (this.lifeTime < time - v2.lastTimeUsed) {
-            delete v1.get(j);
-            v1.delete(j);
-          } else {
-            v2.forEach((v3, k) => {
-              if (this.lifeTime < time - v3.lastTimeUsed) {
-                delete v2.get(k);
-                v2.delete(k);
-              } else {
-                // Work for the moment because all flushed caches have 3 key!
-                this.lastTimeFlush = Math.min(this.lastTimeFlush, v3.lastTimeUsed);
-              }
-            });
-            if (!v2.size) {
-              delete v1.get(j);
-              v1.delete(j);
-            }
-          }
-        });
-        if (!v1.size) {
-          delete this.data.get(i);
-          this.data.delete(i);
-        }
-      }
-    });
-    if (this.data.size == 0) {
-      this.lastTimeFlush = Date.now();
-    }
-  }
-}
-export default Cache;
+};

package/lib/Core/Style.js CHANGED Viewed

@@ -1,11 +1,13 @@
-import Cache from "./Scheduler/Cache.js";
+import { LRUCache } from 'lru-cache';
 import Fetcher from "../Provider/Fetcher.js";
 import { Color } from 'three';
 import { deltaE } from "../Renderer/Color.js";
 import Coordinates from "./Geographic/Coordinates.js";
 /* babel-plugin-inline-import './StyleChunk/itowns_stroke_single_before.css' */
 const itowns_stroke_single_before = ".itowns-stroke-single:before {\n    display: var(--text_stroke_display);\n    content: attr(data-before);\n    opacity: 1;\n    position: absolute;\n    -webkit-text-stroke-width: var(--text_stroke_width);\n    -webkit-text-stroke-color: var(--text_stroke_color);\n    left: 0;\n    right: 0;\n    bottom: 0;\n    top: 0;\n    z-index: -1;\n    white-space: inherit;\n    overflow-wrap: inherit;\n    letter-spacing: inherit;\n    text-align: inherit;\n    padding: inherit;\n    font-family: inherit;\n    text-transform: inherit;\n    max-width: inherit;\n    font-size: inherit;\n}\n";
-const cacheStyle = new Cache();
+const cachedImg = new LRUCache({
+  max: 500
+});
 const matrix = document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGMatrix();
 const canvas = document.createElement('canvas');
 function baseAltitudeDefault(properties, ctx) {
@@ -37,13 +39,14 @@ export function readExpression(property, ctx) {
   }
   return property;
 }
-async function loadImage(source) {
-  let promise = cacheStyle.get(source, 'null');
+async function loadImage(url) {
+  const imgUrl = url.split('?')[0];
+  let promise = cachedImg.get(imgUrl);
   if (!promise) {
-    promise = Fetcher.texture(source, {
+    promise = Fetcher.texture(url, {
       crossOrigin: 'anonymous'
     });
-    cacheStyle.set(promise, source, 'null');
+    cachedImg.set(imgUrl, promise);
   }
   return (await promise).image;
 }
@@ -64,7 +67,7 @@ function replaceWhitePxl(imgd, color, id) {
   if (!color) {
     return imgd;
   }
-  const imgdColored = cacheStyle.get(id, color);
+  const imgdColored = cachedImg.get(`${id}_${color}`);
   if (!imgdColored) {
     const pix = imgd.data;
     const newColor = new Color(color);
@@ -75,7 +78,7 @@ function replaceWhitePxl(imgd, color, id) {
       pix[i + 1] = pix[i + 1] * d + newColor.g * 255 * (1 - d);
       pix[i + 2] = pix[i + 2] * d + newColor.b * 255 * (1 - d);
     }
-    cacheStyle.set(imgd, id, color);
+    cachedImg.set(`${id}_${color}`, imgd);
     return imgd;
   }
   return imgdColored;

package/lib/Core/TileGeometry.js CHANGED Viewed

@@ -71,7 +71,7 @@ export class TileGeometry extends THREE.BufferGeometry {
    * @param cacheTile - The [Cache] used to store this geometry.
    * @param keys - The [south, level, epsg] key of this geometry.
    */
-  initRefCount(cacheTile, keys) {
+  initRefCount(cacheTile, key) {
     if (this._refCount !== null) {
       return;
     }
@@ -87,7 +87,7 @@ export class TileGeometry extends THREE.BufferGeometry {
           //  (in THREE.WebGLBindingStates code).
           this.index = null;
           delete this.attributes.uv;
-          cacheTile.delete(...keys);
+          cacheTile.delete(key);
           super.dispose();
           // THREE.BufferGeometry.prototype.dispose.call(this);
         }

package/lib/Layer/CopcLayer.js CHANGED Viewed

@@ -49,8 +49,8 @@ class CopcLayer extends PointCloudLayer {
       this.root = new CopcNode(0, 0, 0, 0, pageOffset, pageLength, this, -1);
       this.root.bbox.min.fromArray(cube, 0);
       this.root.bbox.max.fromArray(cube, 3);
-      this.minElevationRange = source.header.min[2];
-      this.maxElevationRange = source.header.max[2];
+      this.minElevationRange = this.minElevationRange ?? source.header.min[2];
+      this.maxElevationRange = this.maxElevationRange ?? source.header.max[2];
       this.scale = new THREE.Vector3(1.0, 1.0, 1.0);
       this.offset = new THREE.Vector3(0.0, 0.0, 0.0);
       return this.root.loadOctree().then(resolve);

package/lib/Layer/EntwinePointTileLayer.js CHANGED Viewed

@@ -58,8 +58,8 @@ class EntwinePointTileLayer extends PointCloudLayer {
       this.root = new EntwinePointTileNode(0, 0, 0, 0, this, -1);
       this.root.bbox.min.fromArray(this.source.boundsConforming, 0);
       this.root.bbox.max.fromArray(this.source.boundsConforming, 3);
-      this.minElevationRange = this.source.boundsConforming[2];
-      this.maxElevationRange = this.source.boundsConforming[5];
+      this.minElevationRange = this.minElevationRange ?? this.source.boundsConforming[2];
+      this.maxElevationRange = this.maxElevationRange ?? this.source.boundsConforming[5];
       this.extent = Extent.fromBox3(config.crs || 'EPSG:4326', this.root.bbox);
       return this.root.loadOctree().then(resolve);
     });

package/lib/Layer/Layer.js CHANGED Viewed

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import { STRATEGY_MIN_NETWORK_TRAFFIC } from "./LayerUpdateStrategy.js";
 import InfoLayer from "./InfoLayer.js";
 import Source from "../Source/Source.js";
-import Cache from "../Core/Scheduler/Cache.js";
+import { LRUCache } from 'lru-cache';
 import Style from "../Core/Style.js";
 /**
@@ -195,7 +195,12 @@ class Layer extends THREE.EventDispatcher {
     /**
      * @type {Cache}
      */
-    this.cache = new Cache(cacheLifeTime);
+    this.cache = new LRUCache({
+      max: 500,
+      ...(cacheLifeTime !== Infinity && {
+        ttl: cacheLifeTime
+      })
+    });
     this.mergeFeatures = mergeFeatures;
   }
   addInitializationStep() {
@@ -267,13 +272,13 @@ class Layer extends THREE.EventDispatcher {
     return data;
   }
   getData(from, to) {
-    const key = this.source.requestToKey(this.source.isVectorSource ? to : from);
-    let data = this.cache.getByArray(key);
+    const key = this.source.getDataKey(this.source.isVectorSource ? to : from);
+    let data = this.cache.get(key);
     if (!data) {
       data = this.source.loadData(from, this).then(feat => this.convert(feat, to), err => {
         throw err;
       });
-      this.cache.setByArray(data, key);
+      this.cache.set(key, data);
     }
     return data;
   }

package/lib/Layer/PointCloudLayer.js CHANGED Viewed

@@ -130,7 +130,9 @@ class PointCloudLayer extends GeometryLayer {
    * contains three elements `name, protocol, extent`, these elements will be
    * available using `layer.name` or something else depending on the property
    * name. See the list of properties to know which one can be specified.
-   * @param {Source} config.source - Description and options of the source.
+   * @param {Source} config.source - Description and options of the source See @Layer.
+   * @param {number}  [options.minElevationRange] - Min value for the elevation range (default value will be taken from the source.metadata).
+   * @param {number}  [options.maxElevationRange] - Max value for the elevation range (default value will be taken from the source.metadata).
    */
   constructor(id) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -144,8 +146,8 @@ class PointCloudLayer extends GeometryLayer {
       sseThreshold = 2,
       minIntensityRange = 1,
       maxIntensityRange = 65536,
-      minElevationRange = 0,
-      maxElevationRange = 1000,
+      minElevationRange,
+      maxElevationRange,
       minAngleRange = -90,
       maxAngleRange = 90,
       material = {},

package/lib/Layer/Potree2Layer.js CHANGED Viewed

@@ -154,6 +154,8 @@ class Potree2Layer extends PointCloudLayer {
       const root = new Potree2Node(0, 0, this);
       root.bbox = boundingBox;
       root.boundingSphere = boundingBox.getBoundingSphere(new THREE.Sphere());
+      this.minElevationRange = this.minElevationRange ?? metadata.boundingBox.min[2];
+      this.maxElevationRange = this.maxElevationRange ?? metadata.boundingBox.max[2];
       root.id = 'r';
       root.depth = 0;
       root.nodeType = 2;

package/lib/Layer/PotreeLayer.js CHANGED Viewed

@@ -62,6 +62,8 @@ class PotreeLayer extends PointCloudLayer {
       this.root = new PotreeNode(0, 0, this);
       this.root.bbox.min.set(cloud.boundingBox.lx, cloud.boundingBox.ly, cloud.boundingBox.lz);
       this.root.bbox.max.set(cloud.boundingBox.ux, cloud.boundingBox.uy, cloud.boundingBox.uz);
+      this.minElevationRange = this.minElevationRange ?? cloud.boundingBox.lz;
+      this.maxElevationRange = this.maxElevationRange ?? cloud.boundingBox.uz;
       this.extent = Extent.fromBox3(this.source.crs || 'EPSG:4326', this.root.bbox);
       return this.root.loadOctree().then(resolve);
     });

package/lib/Renderer/PointsMaterial.js CHANGED Viewed

@@ -262,10 +262,7 @@ class PointsMaterial extends THREE.ShaderMaterial {
    * @param      {number}  [options.mode=PNTS_MODE.COLOR]  display mode.
    * @param      {number}  [options.shape=PNTS_SHAPE.CIRCLE]  rendered points shape.
    * @param      {THREE.Vector4}  [options.overlayColor=new THREE.Vector4(0, 0, 0, 0)]  overlay color.
-   * @param      {THREE.Vector2}  [options.intensityRange=new THREE.Vector2(1, 65536)]  intensity range.
-   * @param      {THREE.Vector2}  [options.elevationRange=new THREE.Vector2(0, 1000)]  elevation range.
-   * @param      {THREE.Vector2}  [options.angleRange=new THREE.Vector2(-90, 90)]  scan angle range.
-   * @param      {Scheme}  [options.classificationScheme]  LUT for point classification colorization.
+    * @param      {Scheme}  [options.classificationScheme]  LUT for point classification colorization.
    * @param      {Scheme}  [options.discreteScheme]  LUT for other discret point values colorization.
    * @param      {string}  [options.gradient]  Descrition of the gradient to use for continuous point values.
    *                          (Default value will be the 'SPECTRAL' gradient from Utils/Gradients)
@@ -273,6 +270,9 @@ class PointsMaterial extends THREE.ShaderMaterial {
    * @param      {number}  [options.minAttenuatedSize=3]  minimum scale used by 'ATTENUATED' size mode
    * @param      {number}  [options.maxAttenuatedSize=10]  maximum scale used by 'ATTENUATED' size mode
    *
+   * @property {THREE.Vector2}  [options.intensityRange=new THREE.Vector2(1, 65536)]  intensity range (default value will be [1, 65536] if not defined at Layer level).
+   * @property {THREE.Vector2}  [options.elevationRange=new THREE.Vector2(0, 1000)]  elevation range (default value will be [0, 1000] if not defined at Layer level).
+   * @property {THREE.Vector2}  [options.angleRange=new THREE.Vector2(-90, 90)]  scan angle range (default value will be [-90, 90] if not defined at Layer level).
    * @property {Scheme}  classificationScheme - Color scheme for point classification values.
    * @property {Scheme}  discreteScheme - Color scheme for all other discrete values.
    * @property {object}  gradients - Descriptions of all available gradients.

package/lib/Source/FileSource.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import Source from "./Source.js";
-import Cache from "../Core/Scheduler/Cache.js";
+import { LRUCache } from 'lru-cache';
 /**
  * An object defining the source of a single resource to get from a direct
@@ -133,8 +133,10 @@ class FileSource extends Source {
         this.fetchedData = f;
       });
     } else if (source.features) {
-      this._featuresCaches[source.features.crs] = new Cache();
-      this._featuresCaches[source.features.crs].setByArray(Promise.resolve(source.features), [0]);
+      this._featuresCaches[source.features.crs] = new LRUCache({
+        max: 500
+      });
+      this._featuresCaches[source.features.crs].set(0, Promise.resolve(source.features));
     }
     this.whenReady.then(() => this.fetchedData);
     this.zoom = {
@@ -148,14 +150,14 @@ class FileSource extends Source {
   onLayerAdded(options) {
     options.in = this;
     super.onLayerAdded(options);
-    let features = this._featuresCaches[options.out.crs].getByArray([0]);
+    let features = this._featuresCaches[options.out.crs].get(0);
     if (!features) {
       options.out.buildExtent = this.crs != 'EPSG:4978';
       if (options.out.buildExtent) {
         options.out.forcedExtentCrs = options.out.crs != 'EPSG:4978' ? options.out.crs : this.crs;
       }
       features = this.parser(this.fetchedData, options);
-      this._featuresCaches[options.out.crs].setByArray(features, [0]);
+      this._featuresCaches[options.out.crs].set(0, features);
     }
     features.then(data => {
       if (data.extent) {
@@ -177,7 +179,7 @@ class FileSource extends Source {
    * @return     {FeatureCollection|Texture}  The parsed data.
    */
   loadData(extent, out) {
-    return this._featuresCaches[out.crs].getByArray([0]);
+    return this._featuresCaches[out.crs].get(0);
   }
   extentInsideLimit(extent) {
     return this.extent.intersectsExtent(extent);

package/lib/Source/OrientedImageSource.js CHANGED Viewed

@@ -41,8 +41,8 @@ class OrientedImageSource extends Source {
   urlFromExtent(imageInfo) {
     return this.imageUrl(imageInfo.cameraId, imageInfo.panoId);
   }
-  requestToKey(image) {
-    return [image.cameraId, image.panoId];
+  getDataKey(image) {
+    return `c${image.cameraId}p${image.panoId}`;
   }
   /**