itowns 2.42.1-next.2 → 2.42.1-next.20

package/lib/Layer/RasterLayer.js

@@ -1,21 +1,14 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Layer = _interopRequireDefault(require("./Layer"));
-var _LayeredMaterialNodeProcessing = require("../Process/LayeredMaterialNodeProcessing");
-var _textureConverter = _interopRequireDefault(require("../Converter/textureConverter"));
-var _Cache = require("../Core/Scheduler/Cache");
-class RasterLayer extends _Layer.default {
+import Layer from "./Layer.js";
+import { removeLayeredMaterialNodeLayer } from "../Process/LayeredMaterialNodeProcessing.js";
+import textureConverter from "../Converter/textureConverter.js";
+import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
+class RasterLayer extends Layer {
   constructor(id, config) {
-    config.cacheLifeTime = config.cacheLifeTime ?? _Cache.CACHE_POLICIES.TEXTURE;
+    config.cacheLifeTime = config.cacheLifeTime ?? CACHE_POLICIES.TEXTURE;
     super(id, config);
   }
   convert(data, extentDestination) {
-    return _textureConverter.default.convert(data, extentDestination, this);
+    return textureConverter.convert(data, extentDestination, this);
   }
 
   /**
@@ -27,9 +20,8 @@ class RasterLayer extends _Layer.default {
       this.cache.clear();
     }
     for (const root of this.parent.level0Nodes) {
-      root.traverse((0, _LayeredMaterialNodeProcessing.removeLayeredMaterialNodeLayer)(this.id));
+      root.traverse(removeLayeredMaterialNodeLayer(this.id));
     }
   }
 }
-var _default = RasterLayer;
-exports.default = _default;
+export default RasterLayer;

package/lib/Layer/ReferencingLayerProperties.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 // next step is move these properties to Style class
 // and hide transparent mechanism
 
@@ -60,5 +54,4 @@ function ReferLayerProperties(material, layer) {
   }
   return material;
 }
-var _default = ReferLayerProperties;
-exports.default = _default;
+export default ReferLayerProperties;

package/lib/Layer/TiledGeometryLayer.js

@@ -1,21 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _GeometryLayer = _interopRequireDefault(require("./GeometryLayer"));
-var _InfoLayer = require("./InfoLayer");
-var _Picking = _interopRequireDefault(require("../Core/Picking"));
-var _convertToTile = _interopRequireDefault(require("../Converter/convertToTile"));
-var _ObjectRemovalHelper = _interopRequireDefault(require("../Process/ObjectRemovalHelper"));
-var _LayeredMaterialNodeProcessing = require("../Process/LayeredMaterialNodeProcessing");
-var _Layer = require("./Layer");
-var _Cache = require("../Core/Scheduler/Cache");
-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; }
+import * as THREE from 'three';
+import GeometryLayer from "./GeometryLayer.js";
+import { InfoTiledGeometryLayer } from "./InfoLayer.js";
+import Picking from "../Core/Picking.js";
+import convertToTile from "../Converter/convertToTile.js";
+import ObjectRemovalHelper from "../Process/ObjectRemovalHelper.js";
+import { SIZE_DIAGONAL_TEXTURE } from "../Process/LayeredMaterialNodeProcessing.js";
+import { ImageryLayers } from "./Layer.js";
+import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
 const subdivisionVector = new THREE.Vector3();
 const boundingSphereCenter = new THREE.Vector3();
 
@@ -24,9 +15,10 @@ const boundingSphereCenter = new THREE.Vector3();
  * @property {boolean} isTiledGeometryLayer - Used to checkout whether this
  * layer is a TiledGeometryLayer. Default is true. You should not change this,
  * as it is used internally for optimisation.
- *
+ * @property {boolean} hideSkirt (default false) - Used to hide the skirt (tile borders).
+ * Useful when the layer opacity < 1
  */
-class TiledGeometryLayer extends _GeometryLayer.default {
+class TiledGeometryLayer extends GeometryLayer {
   /**
    * A layer extending the {@link GeometryLayer}, but with a tiling notion.
    *
@@ -69,17 +61,18 @@ class TiledGeometryLayer extends _GeometryLayer.default {
    */
   constructor(id, object3d, schemeTile, builder, config) {
     // cacheLifeTime = CACHE_POLICIES.INFINITE because the cache is handled by the builder
-    config.cacheLifeTime = _Cache.CACHE_POLICIES.INFINITE;
+    config.cacheLifeTime = CACHE_POLICIES.INFINITE;
     config.source = false;
     super(id, object3d, config);
     this.isTiledGeometryLayer = true;
     // TODO : this should be add in a preprocess method specific to GeoidLayer.
     this.object3d.geoidHeight = 0;
     this.protocol = 'tile';
+    this._hideSkirt = false;
     this.sseSubdivisionThreshold = this.sseSubdivisionThreshold || 1.0;
     this.schemeTile = schemeTile;
     this.builder = builder;
-    this.info = new _InfoLayer.InfoTiledGeometryLayer(this);
+    this.info = new InfoTiledGeometryLayer(this);
     if (!this.schemeTile) {
       throw new Error(`Cannot init tiled layer without schemeTile for layer ${this.id}`);
     }
@@ -96,9 +89,21 @@ class TiledGeometryLayer extends _GeometryLayer.default {
       this.object3d.add(...level0s);
       this.object3d.updateMatrixWorld();
     }));
-    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (_LayeredMaterialNodeProcessing.SIZE_DIAGONAL_TEXTURE * 2);
+    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (SIZE_DIAGONAL_TEXTURE * 2);
+  }
+  get hideSkirt() {
+    return this._hideSkirt;
+  }
+  set hideSkirt(value) {
+    this._hideSkirt = value;
+    for (const node of this.level0Nodes) {
+      node.traverse(obj => {
+        if (obj.isTileMesh) {
+          obj.geometry.hideSkirt = value;
+        }
+      });
+    }
   }
-
   /**
    * Picking method for this layer. It uses the {@link Picking#pickTilesAt}
    * method.
@@ -115,7 +120,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
   pickObjectsAt(view, coordinates) {
     let radius = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.options.defaultPickingRadius;
     let target = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    return _Picking.default.pickTilesAt(view, coordinates, radius, this, target);
+    return Picking.pickTilesAt(view, coordinates, radius, this, target);
   }
 
   /**
@@ -163,7 +168,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
     // Prepare ColorLayer sequence order
     // In this moment, there is only one color layers sequence, because they are attached to tileLayer.
     // In future, the sequence must be returned by parent geometry layer.
-    this.colorLayersOrder = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(context.colorLayers);
+    this.colorLayersOrder = ImageryLayers.getColorLayersIdOrderedBySequence(context.colorLayers);
     let commonAncestor;
     for (const source of sources.values()) {
       if (source.isCamera) {
@@ -211,7 +216,7 @@ class TiledGeometryLayer extends _GeometryLayer.default {
    */
   update(context, layer, node) {
     if (!node.parent) {
-      return _ObjectRemovalHelper.default.removeChildrenAndCleanup(this, node);
+      return ObjectRemovalHelper.removeChildrenAndCleanup(this, node);
     }
     // early exit if parent' subdivision is in progress
     if (node.parent.pendingSubdivision) {
@@ -236,17 +241,17 @@ class TiledGeometryLayer extends _GeometryLayer.default {
       }
       if (node.material.visible) {
         if (!requestChildrenUpdate) {
-          return _ObjectRemovalHelper.default.removeChildren(this, node);
+          return ObjectRemovalHelper.removeChildren(this, node);
         }
       }
       return requestChildrenUpdate ? node.children.filter(n => n.layer == this) : undefined;
     }
     node.material.visible = false;
     this.info.update(node);
-    return _ObjectRemovalHelper.default.removeChildren(this, node);
+    return ObjectRemovalHelper.removeChildren(this, node);
   }
   convert(requester, extent) {
-    return _convertToTile.default.convert(requester, extent, this);
+    return convertToTile.convert(requester, extent, this);
   }
   countColorLayersTextures() {
     return arguments.length;
@@ -403,9 +408,8 @@ class TiledGeometryLayer extends _GeometryLayer.default {
 
     // The screen space error is calculated to have a correct texture display.
     // For the projection of a texture's texel to be less than or equal to one pixel
-    const sse = node.screenSize / (_LayeredMaterialNodeProcessing.SIZE_DIAGONAL_TEXTURE * 2);
+    const sse = node.screenSize / (SIZE_DIAGONAL_TEXTURE * 2);
     return this.sseSubdivisionThreshold < sse;
   }
 }
-var _default = TiledGeometryLayer;
-exports.default = _default;
+export default TiledGeometryLayer;