itowns 2.42.1-next.14 → 2.42.1-next.15

package/lib/Parser/GeoJsonParser.js

@@ -203,7 +203,7 @@ var _default = {
     _in.crs = _in.crs || readCRS(json);
     if (out.filteringExtent) {
       if (typeof out.filteringExtent == 'boolean') {
-        out.filterExtent = json.extent.as(_in.crs);
+        out.filterExtent = options.extent.as(_in.crs);
       } else if (out.filteringExtent.isExtent) {
         out.filterExtent = out.filteringExtent;
       }

package/lib/Parser/VectorTileParser.js

@@ -118,12 +118,12 @@ function readPBF(file, options) {
   }
 
   // x,y,z tile coordinates
-  const x = file.extent.col;
-  const z = file.extent.zoom;
+  const x = options.extent.col;
+  const z = options.extent.zoom;
   // We need to move from TMS to Google/Bing/OSM coordinates
   // https://alastaira.wordpress.com/2011/07/06/converting-tms-tile-coordinates-to-googlebingosm-tile-coordinates/
   // Only if the layer.origin is top
-  const y = options.in.isInverted ? file.extent.row : (1 << z) - file.extent.row - 1;
+  const y = options.in.isInverted ? options.extent.row : (1 << z) - options.extent.row - 1;
   const collection = new _Feature.FeatureCollection(options.out);
   const vFeature = vectorTile.layers[sourceLayers[0]];
   // TODO: verify if size is correct because is computed with only one feature (vFeature).
@@ -141,7 +141,7 @@ function readPBF(file, options) {
       const vtFeature = sourceLayer.feature(i);
       vtFeature.tileNumbers = {
         x,
-        y: file.extent.row,
+        y: options.extent.row,
         z
       };
       const layers = options.in.layers[layer_id].filter(l => l.filterExpression.filter({
@@ -169,7 +169,7 @@ function readPBF(file, options) {
   collection.features.sort((a, b) => a.order - b.order);
   // TODO verify if is needed to updateExtent for previous features.
   collection.updateExtent();
-  collection.extent = file.extent;
+  collection.extent = options.extent;
   collection.isInverted = options.in.isInverted;
   return Promise.resolve(collection);
 }

package/lib/Provider/Fetcher.js

@@ -205,6 +205,37 @@ var _default = {
       }
       return Promise.resolve(all);
     });
+  },
+  get() {
+    let format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    const [type, subtype] = format.split('/');
+    switch (type) {
+      case 'application':
+        switch (subtype) {
+          case 'geo+json':
+          case 'json':
+            return this.json;
+          case 'kml':
+          case 'gpx':
+            return this.xml;
+          case 'x-protobuf;type=mapbox-vector':
+          case 'gtx':
+            return this.arrayBuffer;
+          case 'isg':
+          case 'gdf':
+          default:
+            return this.text;
+        }
+      case 'image':
+        switch (subtype) {
+          case 'x-bil;bits=32':
+            return this.textureFloat;
+          default:
+            return this.texture;
+        }
+      default:
+        return this.texture;
+    }
   }
 };
 exports.default = _default;

package/lib/Renderer/RasterTile.js

@@ -95,7 +95,7 @@ class RasterTile extends THREE.EventDispatcher {
     this.material.layersNeedUpdate = true;
   }
   setTexture(index, texture, offsetScale) {
-    this.level = texture && index == 0 ? texture.extent.zoom : this.level;
+    this.level = texture && texture.extent && index == 0 ? texture.extent.zoom : this.level;
     this.textures[index] = texture || null;
     this.offsetScales[index] = offsetScale;
     this.material.layersNeedUpdate = true;

package/lib/Source/OrientedImageSource.js

@@ -23,7 +23,6 @@ class OrientedImageSource extends _Source.default {
    * to find the good texture for each camera for each panoramic.
    */
   constructor(source) {
-    source.format = source.format || 'json';
     super(source);
     this.isOrientedImageSource = true;
 

package/lib/Source/Source.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.supportedParsers = exports.supportedFetchers = exports.default = void 0;
+exports.supportedParsers = exports.default = void 0;
 var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
 var _GeoJsonParser = _interopRequireDefault(require("../Parser/GeoJsonParser"));
 var _KMLParser = _interopRequireDefault(require("../Parser/KMLParser"));
@@ -16,9 +16,7 @@ var _VectorTileParser = _interopRequireDefault(require("../Parser/VectorTilePars
 var _Fetcher = _interopRequireDefault(require("../Provider/Fetcher"));
 var _Cache = _interopRequireDefault(require("../Core/Scheduler/Cache"));
 var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
-const supportedFetchers = new Map([['image/x-bil;bits=32', _Fetcher.default.textureFloat], ['geojson', _Fetcher.default.json], ['application/json', _Fetcher.default.json], ['application/kml', _Fetcher.default.xml], ['application/gpx', _Fetcher.default.xml], ['application/x-protobuf;type=mapbox-vector', _Fetcher.default.arrayBuffer], ['application/gtx', _Fetcher.default.arrayBuffer], ['application/isg', _Fetcher.default.text], ['application/gdf', _Fetcher.default.text]]);
-exports.supportedFetchers = supportedFetchers;
-const supportedParsers = new Map([['geojson', _GeoJsonParser.default.parse], ['application/json', _GeoJsonParser.default.parse], ['application/kml', _KMLParser.default.parse], ['application/gpx', _GpxParser.default.parse], ['application/x-protobuf;type=mapbox-vector', _VectorTileParser.default.parse], ['application/gtx', _GTXParser.default.parse], ['application/isg', _ISGParser.default.parse], ['application/gdf', _GDFParser.default.parse]]);
+const supportedParsers = new Map([['application/geo+json', _GeoJsonParser.default.parse], ['application/json', _GeoJsonParser.default.parse], ['application/kml', _KMLParser.default.parse], ['application/gpx', _GpxParser.default.parse], ['application/x-protobuf;type=mapbox-vector', _VectorTileParser.default.parse], ['application/gtx', _GTXParser.default.parse], ['application/isg', _ISGParser.default.parse], ['application/gdf', _GDFParser.default.parse]]);
 exports.supportedParsers = supportedParsers;
 const noCache = {
   getByArray: () => {},
@@ -56,13 +54,6 @@ class InformationsData {
  */
 // eslint-disable-next-line
 class /* istanbul ignore next */ParsingOptions {}
-function fetchSourceData(source, extent) {
-  const url = source.urlFromExtent(extent);
-  return source.fetcher(url, source.networkOptions).then(f => {
-    f.extent = extent;
-    return f;
-  }, err => source.handlingError(err));
-}
 let uid = 0;
 
 /**
@@ -125,8 +116,11 @@ class Source extends InformationsData {
     this.uid = uid++;
     this.url = source.url;
     this.format = source.format;
-    this.fetcher = source.fetcher || supportedFetchers.get(source.format) || _Fetcher.default.texture;
-    this.parser = source.parser || supportedParsers.get(source.format) || (d => d);
+    this.fetcher = source.fetcher || _Fetcher.default.get(source.format);
+    this.parser = source.parser || supportedParsers.get(source.format) || ((d, opt) => {
+      d.extent = opt.extent;
+      return d;
+    });
     this.isVectorSource = (source.parser || supportedParsers.get(source.format)) != undefined;
     this.networkOptions = source.networkOptions || {
       crossOrigin: 'anonymous'
@@ -174,10 +168,12 @@ class Source extends InformationsData {
     let features = cache.getByArray(key);
     if (!features) {
       // otherwise fetch/parse the data
-      features = cache.setByArray(fetchSourceData(this, extent).then(file => this.parser(file, {
+      features = cache.setByArray(this.fetcher(this.urlFromExtent(extent), this.networkOptions).then(file => this.parser(file, {
         out,
-        in: this
-      }), err => this.handlingError(err)), key);
+        in: this,
+        extent
+      })).catch(err => this.handlingError(err)), key);
+
       /* istanbul ignore next */
       if (this.onParsedFile) {
         features.then(feat => {

package/lib/Source/TMSSource.js

@@ -98,7 +98,6 @@ class TMSSource extends _Source.default {
     }
     this.zoom = source.zoom;
     this.isInverted = source.isInverted || false;
-    this.url = source.url;
     this.crs = _Crs.default.formatToTms(source.crs);
     this.tileMatrixSetLimits = source.tileMatrixSetLimits;
     this.extentSetlimits = {};

package/lib/Source/VectorTilesSource.js

@@ -8,11 +8,24 @@ exports.default = void 0;
 var _mapboxGlStyleSpec = require("@mapbox/mapbox-gl-style-spec");
 var _Style = _interopRequireDefault(require("../Core/Style"));
 var _TMSSource = _interopRequireDefault(require("./TMSSource"));
+var _URLBuilder = _interopRequireDefault(require("../Provider/URLBuilder"));
 var _Fetcher = _interopRequireDefault(require("../Provider/Fetcher"));
 var _MapBoxUrlParser = _interopRequireDefault(require("../Parser/MapBoxUrlParser"));
 function toTMSUrl(url) {
   return url.replace(/\{/g, '${');
 }
+function mergeCollections(collections) {
+  const collection = collections[0];
+  collections.forEach((col, index) => {
+    if (index === 0) {
+      return;
+    }
+    col.features.forEach(feature => {
+      collection.features.push(feature);
+    });
+  });
+  return collection;
+}
 
 /**
  * @classdesc
@@ -59,6 +72,7 @@ class VectorTilesSource extends _TMSSource.default {
     source.url = source.url || '.';
     super(source);
     const ffilter = source.filter || (() => true);
+    this.urls = [];
     this.layers = {};
     this.styles = {};
     let promise;
@@ -88,8 +102,6 @@ class VectorTilesSource extends _TMSSource.default {
       }
       return style;
     }).then(style => {
-      const s = Object.keys(style.sources)[0];
-      const os = style.sources[s];
       style.layers.forEach((layer, order) => {
         layer.sourceUid = this.uid;
         if (layer.type === 'background') {
@@ -112,17 +124,30 @@ class VectorTilesSource extends _TMSSource.default {
         }
       });
       if (this.url == '.') {
-        if (os.url) {
-          const urlSource = _MapBoxUrlParser.default.normalizeSourceURL(os.url, this.accessToken);
-          return _Fetcher.default.json(urlSource, this.networkOptions).then(tileJSON => {
-            if (tileJSON.tiles[0]) {
-              this.url = toTMSUrl(tileJSON.tiles[0]);
-            }
-          });
-        } else if (os.tiles[0]) {
-          this.url = toTMSUrl(os.tiles[0]);
-        }
+        const TMSUrlList = Object.values(style.sources).map(sourceVT => {
+          if (sourceVT.url) {
+            const urlSource = _MapBoxUrlParser.default.normalizeSourceURL(sourceVT.url, this.accessToken);
+            return _Fetcher.default.json(urlSource, this.networkOptions).then(tileJSON => {
+              if (tileJSON.tiles[0]) {
+                return toTMSUrl(tileJSON.tiles[0]);
+              }
+            });
+          } else if (sourceVT.tiles) {
+            return Promise.resolve(toTMSUrl(sourceVT.tiles[0]));
+          }
+          return Promise.reject();
+        });
+        return Promise.all(TMSUrlList);
       }
+      return Promise.resolve([this.url]);
+    }).then(TMSUrlList => {
+      this.urls = Array.from(new Set(TMSUrlList));
+    });
+  }
+  urlFromExtent(extent, url) {
+    return _URLBuilder.default.xyz(extent, {
+      tileMatrixCallback: this.tileMatrixCallback,
+      url
     });
   }
   onLayerAdded(options) {
@@ -134,6 +159,30 @@ class VectorTilesSource extends _TMSSource.default {
       }
     }
   }
+  loadData(extent, out) {
+    const cache = this._featuresCaches[out.crs];
+    const key = this.requestToKey(extent);
+    // try to get parsed data from cache
+    let features = cache.getByArray(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, {
+        out,
+        in: this,
+        extent
+      })))).then(collections => mergeCollections(collections)).catch(err => this.handlingError(err)), key);
+
+      /* istanbul ignore next */
+      if (this.onParsedFile) {
+        features.then(feat => {
+          this.onParsedFile(feat);
+          console.warn('Source.onParsedFile was deprecated');
+          return feat;
+        });
+      }
+    }
+    return features;
+  }
 }
 var _default = VectorTilesSource;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.42.1-next.14",
+  "version": "2.42.1-next.15",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "exports": {