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

package/lib/Source/Source.js

@@ -8,38 +8,17 @@ import GTXParser from "../Parser/GTXParser.js";
 import ISGParser from "../Parser/ISGParser.js";
 import VectorTileParser from "../Parser/VectorTileParser.js";
 import Fetcher from "../Provider/Fetcher.js";
-import Cache from "../Core/Scheduler/Cache.js";
+// import Cache from 'Core/Scheduler/Cache';
+import { LRUCache } from 'lru-cache';
 
 /** @private */
 export const supportedParsers = new Map([['application/geo+json', GeoJsonParser.parse], ['application/json', GeoJsonParser.parse], ['application/kml', KMLParser.parse], ['application/gpx', GpxParser.parse], ['application/x-protobuf;type=mapbox-vector', VectorTileParser.parse], ['application/gtx', GTXParser.parse], ['application/isg', ISGParser.parse], ['application/gdf', GDFParser.parse]]);
 const noCache = {
-  getByArray: () => {},
-  setByArray: a => a,
+  get: () => {},
+  set: a => a,
   clear: () => {}
 };
 
-/**
- * @property {string} crs - data crs projection.
- * @property {boolean} isInverted - This option is to be set to the
- * correct value, true or false (default being false), if the computation of
- * the coordinates needs to be inverted to same scheme as OSM, Google Maps
- * or other system. See [this link](
- * https://alastaira.wordpress.com/2011/07/06/converting-tms-tile-coordinates-to-googlebingosm-tile-coordinates)
- * for more informations.
- *
- */
-class InformationsData {
-  constructor(options) {
-    if (options.projection) {
-      console.warn('Source projection parameter is deprecated, use crs instead.');
-      options.crs = options.crs || options.projection;
-    }
-    if (options.crs) {
-      CRS.isValid(options.crs);
-    }
-    this.crs = options.crs;
-  }
-}
 /**
  * This interface describes parsing options.
  * @typedef {Object} ParsingOptions
@@ -93,13 +72,20 @@ let uid = 0;
  *  depending on the current fetched tile for example</li>
  * </ul>
  */
-class Source extends InformationsData {
+class Source {
   /**
    * @param {Object} source - An object that can contain all properties of a
    * Source. Only the `url` property is mandatory.
    */
   constructor(source) {
-    super(source);
+    if (source.projection) {
+      console.warn('Source projection parameter is deprecated, use crs instead.');
+      source.crs = source.crs || source.projection;
+    }
+    if (source.crs) {
+      CRS.isValid(source.crs);
+    }
+    this.crs = source.crs;
     this.isSource = true;
     if (!source.url) {
       throw new Error('New Source: url is required');
@@ -141,8 +127,8 @@ class Source extends InformationsData {
   urlFromExtent() {
     throw new Error('In extended Source, you have to implement the method urlFromExtent!');
   }
-  requestToKey(extent) {
-    return [extent.zoom, extent.row, extent.col];
+  getDataKey(extent) {
+    return `z${extent.zoom}r${extent.row}c${extent.col}`;
   }
 
   /**
@@ -155,23 +141,18 @@ class Source extends InformationsData {
    */
   loadData(extent, out) {
     const cache = this._featuresCaches[out.crs];
-    const key = this.requestToKey(extent);
+    const key = this.getDataKey(extent);
+    // console.log('Source.loadData', key);
     // try to get parsed data from cache
-    let features = cache.getByArray(key);
+    let features = cache.get(key);
     if (!features) {
       // otherwise fetch/parse the data
-      features = cache.setByArray(this.fetcher(this.urlFromExtent(extent), this.networkOptions).then(file => this.parser(file, {
+      features = this.fetcher(this.urlFromExtent(extent), this.networkOptions).then(file => this.parser(file, {
         out,
         in: this,
         extent
-      })).catch(err => this.handlingError(err)), key);
-      if (this.onParsedFile) {
-        features.then(feat => {
-          this.onParsedFile(feat);
-          console.warn('Source.onParsedFile was deprecated');
-          return feat;
-        });
-      }
+      })).catch(err => this.handlingError(err));
+      cache.set(key, features);
     }
     return features;
   }
@@ -187,7 +168,9 @@ class Source extends InformationsData {
       // Cache feature only if it's vector data, the feature are cached in source.
       // It's not necessary to cache raster in Source,
       // because it's already cached on layer.
-      this._featuresCaches[options.out.crs] = this.isVectorSource ? new Cache() : noCache;
+      this._featuresCaches[options.out.crs] = this.isVectorSource ? new LRUCache({
+        max: 500
+      }) : noCache;
     }
   }
 

package/lib/Source/VectorTilesSource.js

@@ -164,23 +164,17 @@ class VectorTilesSource extends TMSSource {
   }
   loadData(extent, out) {
     const cache = this._featuresCaches[out.crs];
-    const key = this.requestToKey(extent);
+    const key = this.getDataKey(extent);
     // try to get parsed data from cache
-    let features = cache.getByArray(key);
+    let features = cache.get(key);
     if (!features) {
       // otherwise fetch/parse the data
-      features = cache.setByArray(Promise.all(this.urls.map(url => this.fetcher(this.urlFromExtent(extent, url), this.networkOptions).then(file => this.parser(file, {
+      features = Promise.all(this.urls.map(url => this.fetcher(this.urlFromExtent(extent, url), this.networkOptions).then(file => this.parser(file, {
         out,
         in: this,
         extent
-      })))).then(collections => mergeCollections(collections)).catch(err => this.handlingError(err)), key);
-      if (this.onParsedFile) {
-        features.then(feat => {
-          this.onParsedFile(feat);
-          console.warn('Source.onParsedFile was deprecated');
-          return feat;
-        });
-      }
+      })))).then(collections => mergeCollections(collections)).catch(err => this.handlingError(err));
+      cache.set(key, features);
     }
     return features;
   }

package/lib/Source/WFSSource.js

@@ -152,11 +152,11 @@ class WFSSource extends Source {
     }
     return super.handlingError(err);
   }
-  requestToKey(extent) {
+  getDataKey(extent) {
     if (extent.isTile) {
-      return super.requestToKey(extent);
+      return super.getDataKey(extent);
     } else {
-      return [extent.zoom, extent.south, extent.west];
+      return `z${extent.zoom}s${extent.south}w${extent.west}`;
     }
   }
   urlFromExtent(extentOrTile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.35",
+  "version": "2.44.3-next.37",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -66,6 +66,7 @@
     "copc": "^0.0.6",
     "earcut": "^3.0.0",
     "js-priority-queue": "^0.1.5",
+    "lru-cache": "^11.0.1",
     "pbf": "^4.0.1",
     "shpjs": "^6.1.0",
     "threads": "^1.7.0"