itowns 2.44.3-next.34 → 2.44.3-next.36

package/lib/Core/Feature.js

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import Extent from "./Geographic/Extent.js";
 import Coordinates from "./Geographic/Coordinates.js";
-import Style from "./Style.js";
+import StyleOptions from "./StyleOptions.js";
 function defaultExtent(crs) {
   return new Extent(crs, Infinity, -Infinity, Infinity, -Infinity);
 }
@@ -247,7 +247,7 @@ class Feature {
     }
     this._pos = 0;
     this._pushValues = (this.size === 3 ? push3DValues : push2DValues).bind(this);
-    this.style = Style.setFromProperties;
+    this.style = StyleOptions.setFromProperties;
   }
   /**
    * Instance a new {@link FeatureGeometry}  and push in {@link Feature}.

package/lib/Core/MainLoop.js

@@ -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

@@ -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

@@ -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;
+};