itowns 2.42.1-next.9 → 2.43.1-next.0

package/lib/Source/TMSSource.js

@@ -1,17 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Source = _interopRequireDefault(require("./Source"));
-var _URLBuilder = _interopRequireDefault(require("../Provider/URLBuilder"));
-var _Extent = _interopRequireWildcard(require("../Core/Geographic/Extent"));
-var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const extent = new _Extent.default(_Crs.default.tms_4326, 0, 0, 0);
+import Source from "./Source.js";
+import URLBuilder from "../Provider/URLBuilder.js";
+import Extent, { globalExtentTMS } from "../Core/Geographic/Extent.js";
+import CRS from "../Core/Geographic/Crs.js";
+const extent = new Extent(CRS.tms_4326, 0, 0, 0);
 
 /**
  * @classdesc
@@ -78,7 +69,7 @@ const extent = new _Extent.default(_Crs.default.tms_4326, 0, 0, 0);
  * // Add the layer to the view
  * view.addLayer(imageryLayer);
  */
-class TMSSource extends _Source.default {
+class TMSSource extends Source {
   /**
    * @param {Object} source - An object that can contain all properties of a
    * TMSSource and {@link Source}. Only `url` is mandatory.
@@ -94,12 +85,11 @@ class TMSSource extends _Source.default {
     this.isTMSSource = true;
     if (!source.extent) {
       // default to the global extent
-      this.extent = _Extent.globalExtentTMS.get(source.crs);
+      this.extent = globalExtentTMS.get(source.crs);
     }
     this.zoom = source.zoom;
     this.isInverted = source.isInverted || false;
-    this.url = source.url;
-    this.crs = _Crs.default.formatToTms(source.crs);
+    this.crs = CRS.formatToTms(source.crs);
     this.tileMatrixSetLimits = source.tileMatrixSetLimits;
     this.extentSetlimits = {};
     this.tileMatrixCallback = source.tileMatrixCallback || (zoomLevel => zoomLevel);
@@ -121,7 +111,7 @@ class TMSSource extends _Source.default {
     }
   }
   urlFromExtent(extent) {
-    return _URLBuilder.default.xyz(extent, this);
+    return URLBuilder.xyz(extent, this);
   }
   onLayerAdded(options) {
     super.onLayerAdded(options);
@@ -142,7 +132,7 @@ class TMSSource extends _Source.default {
           east,
           south
         } = extent.set(i, tmsl.maxTileRow, tmsl.maxTileCol).as(crs);
-        this.extentSetlimits[crs][i] = new _Extent.default(crs, west, east, south, north);
+        this.extentSetlimits[crs][i] = new Extent(crs, west, east, south, north);
       }
     }
   }
@@ -153,5 +143,4 @@ class TMSSource extends _Source.default {
     return zoom >= this.zoom.min && zoom <= this.zoom.max && (this.extentSetlimits[extent.crs] == undefined || this.extentSetlimits[extent.crs][zoom].intersectsExtent(extent));
   }
 }
-var _default = TMSSource;
-exports.default = _default;
+export default TMSSource;

package/lib/Source/VectorTilesSource.js

@@ -1,18 +1,24 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _mapboxGlStyleSpec = require("@mapbox/mapbox-gl-style-spec");
-var _Style = _interopRequireDefault(require("../Core/Style"));
-var _TMSSource = _interopRequireDefault(require("./TMSSource"));
-var _Fetcher = _interopRequireDefault(require("../Provider/Fetcher"));
-var _MapBoxUrlParser = _interopRequireDefault(require("../Parser/MapBoxUrlParser"));
+import { featureFilter } from '@mapbox/mapbox-gl-style-spec';
+import Style from "../Core/Style.js";
+import TMSSource from "./TMSSource.js";
+import URLBuilder from "../Provider/URLBuilder.js";
+import Fetcher from "../Provider/Fetcher.js";
+import urlParser from "../Parser/MapBoxUrlParser.js";
 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
@@ -24,7 +30,7 @@ function toTMSUrl(url) {
  * @property {boolean} [symbolToCircle=false] - If true, all symbols from a tile
  * will be considered as circle, and render as circles.
  */
-class VectorTilesSource extends _TMSSource.default {
+class VectorTilesSource extends TMSSource {
   /**
    * @param {Object} source - An object that can contain all properties of a
    * VectorTilesSource and {@link Source}.
@@ -59,6 +65,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;
@@ -66,8 +73,8 @@ class VectorTilesSource extends _TMSSource.default {
     this.accessToken = source.accessToken;
     if (source.style) {
       if (typeof source.style == 'string') {
-        const styleUrl = _MapBoxUrlParser.default.normalizeStyleURL(source.style, this.accessToken);
-        promise = _Fetcher.default.json(styleUrl, this.networkOptions);
+        const styleUrl = urlParser.normalizeStyleURL(source.style, this.accessToken);
+        promise = Fetcher.json(styleUrl, this.networkOptions);
       } else {
         promise = Promise.resolve(source.style);
       }
@@ -78,24 +85,22 @@ class VectorTilesSource extends _TMSSource.default {
       this.jsonStyle = style;
       const baseurl = source.sprite || style.sprite;
       if (baseurl) {
-        const spriteUrl = _MapBoxUrlParser.default.normalizeSpriteURL(baseurl, '', '.json', this.accessToken);
-        return _Fetcher.default.json(spriteUrl, this.networkOptions).then(sprites => {
+        const spriteUrl = urlParser.normalizeSpriteURL(baseurl, '', '.json', this.accessToken);
+        return Fetcher.json(spriteUrl, this.networkOptions).then(sprites => {
           this.sprites = sprites;
-          const imgUrl = _MapBoxUrlParser.default.normalizeSpriteURL(baseurl, '', '.png', this.accessToken);
+          const imgUrl = urlParser.normalizeSpriteURL(baseurl, '', '.png', this.accessToken);
           this.sprites.source = imgUrl;
           return style;
         });
       }
       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') {
           this.backgroundLayer = layer;
         } else if (ffilter(layer)) {
-          const style = _Style.default.setFromVectorTileLayer(layer, this.sprites, order, this.symbolToCircle);
+          const style = Style.setFromVectorTileLayer(layer, this.sprites, order, this.symbolToCircle);
           this.styles[layer.id] = style;
           if (!this.layers[layer['source-layer']]) {
             this.layers[layer['source-layer']] = [];
@@ -103,7 +108,7 @@ class VectorTilesSource extends _TMSSource.default {
           this.layers[layer['source-layer']].push({
             id: layer.id,
             order,
-            filterExpression: (0, _mapboxGlStyleSpec.featureFilter)(layer.filter),
+            filterExpression: featureFilter(layer.filter),
             zoom: {
               min: layer.minzoom || 0,
               max: layer.maxzoom || 24
@@ -112,17 +117,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 = urlParser.normalizeSourceURL(sourceVT.url, this.accessToken);
+            return Fetcher.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.xyz(extent, {
+      tileMatrixCallback: this.tileMatrixCallback,
+      url
     });
   }
   onLayerAdded(options) {
@@ -134,6 +152,29 @@ 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;
+export default VectorTilesSource;

package/lib/Source/WFSSource.js

@@ -1,13 +1,7 @@
-"use strict";
+import Source from "./Source.js";
+import URLBuilder from "../Provider/URLBuilder.js";
+import CRS from "../Core/Geographic/Crs.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Source = _interopRequireDefault(require("./Source"));
-var _URLBuilder = _interopRequireDefault(require("../Provider/URLBuilder"));
-var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
 /**
  * @classdesc
  * An object defining the source of resources to get from a
@@ -102,7 +96,7 @@ var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
  * // Add the layer
  * view.addLayer(geometryLayer);
  */
-class WFSSource extends _Source.default {
+class WFSSource extends Source {
   /**
    * @param {Object} source - An object that can contain all properties of a
    * WFSSource and {@link Source}. `url`, `typeName` and `crs` are
@@ -158,18 +152,17 @@ class WFSSource extends _Source.default {
     return super.handlingError(err);
   }
   requestToKey(extent) {
-    if (_Crs.default.isTms(extent.crs)) {
+    if (CRS.isTms(extent.crs)) {
       return super.requestToKey(extent);
     } else {
       return [extent.zoom, extent.south, extent.west];
     }
   }
   urlFromExtent(extent) {
-    return _URLBuilder.default.bbox(extent, this);
+    return URLBuilder.bbox(extent, this);
   }
   extentInsideLimit(extent) {
     return this.extent.intersectsExtent(extent);
   }
 }
-var _default = WFSSource;
-exports.default = _default;
+export default WFSSource;

package/lib/Source/WMSSource.js

@@ -1,12 +1,6 @@
-"use strict";
+import Source from "./Source.js";
+import URLBuilder from "../Provider/URLBuilder.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Source = _interopRequireDefault(require("./Source"));
-var _URLBuilder = _interopRequireDefault(require("../Provider/URLBuilder"));
 /**
  * @classdesc
  * An object defining the source of images to get from a
@@ -72,7 +66,7 @@ var _URLBuilder = _interopRequireDefault(require("../Provider/URLBuilder"));
  * // Add the layer
  * view.addLayer(colorlayer);
  */
-class WMSSource extends _Source.default {
+class WMSSource extends Source {
   /**
    * @param {Object} source - An object that can contain all properties of
    * WMSSource and {@link Source}. `url`, `name`, `extent` and `crs`
@@ -130,11 +124,10 @@ class WMSSource extends _Source.default {
     }
   }
   urlFromExtent(extent) {
-    return _URLBuilder.default.bbox(extent, this);
+    return URLBuilder.bbox(extent, this);
   }
   extentInsideLimit(extent) {
     return this.extent.intersectsExtent(extent);
   }
 }
-var _default = WMSSource;
-exports.default = _default;
+export default WMSSource;

package/lib/Source/WMTSSource.js

@@ -1,11 +1,5 @@
-"use strict";
+import TMSSource from "./TMSSource.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _TMSSource = _interopRequireDefault(require("./TMSSource"));
 /**
  * @classdesc
  * An object defining the source of resources to get from a
@@ -65,7 +59,7 @@ var _TMSSource = _interopRequireDefault(require("./TMSSource"));
  * // Add the layer
  * view.addLayer(colorLayer);
  */
-class WMTSSource extends _TMSSource.default {
+class WMTSSource extends TMSSource {
   /**
    * @param {Object} source - An object that can contain all properties of a
    * WMTSSource and {@link Source}. Only `url`, `name` and `crs` are mandatory.
@@ -92,5 +86,4 @@ class WMTSSource extends _TMSSource.default {
     }
   }
 }
-var _default = WMTSSource;
-exports.default = _default;
+export default WMTSSource;

package/lib/ThreeExtended/capabilities/WebGL.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 class WebGL {
   static isWebGLAvailable() {
     try {
@@ -67,5 +61,4 @@ class WebGL {
     return element;
   }
 }
-var _default = WebGL;
-exports.default = _default;
+export default WebGL;