itowns 2.36.2 → 2.38.1

package/lib/Process/FeatureProcessing.js

@@ -2,17 +2,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var THREE = _interopRequireWildcard(require("three"));
-
 var _LayerUpdateState = _interopRequireDefault(require("../Layer/LayerUpdateState"));
 
 var _ObjectRemovalHelper = _interopRequireDefault(require("./ObjectRemovalHelper"));
@@ -21,48 +15,9 @@ var _handlerNodeError = _interopRequireDefault(require("./handlerNodeError"));
 
 var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+var _GeoidLayer = require("../Layer/GeoidLayer");
 
 var coord = new _Coordinates["default"]('EPSG:4326', 0, 0, 0);
-
-function assignLayer(object, layer) {
-  if (object) {
-    object.layer = layer;
-
-    if (object.material) {
-      object.material.transparent = layer.opacity < 1.0;
-      object.material.opacity = layer.opacity;
-      object.material.wireframe = layer.wireframe;
-    }
-
-    object.layers.set(layer.threejsLayer);
-
-    var _iterator = _createForOfIteratorHelper(object.children),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var c = _step.value;
-        assignLayer(c, layer);
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-
-    return object;
-  }
-}
-
 var _default = {
   update: function update(context, layer, node) {
     if (!node.parent && node.children.length) {
@@ -79,22 +34,25 @@ var _default = {
     if (node.layerUpdateState[layer.id] === undefined) {
       node.layerUpdateState[layer.id] = new _LayerUpdateState["default"]();
     } else if (!node.layerUpdateState[layer.id].canTryUpdate()) {
+      // toggle visibility features
+      node.link.forEach(function (f) {
+        var _f$layer;
+
+        if (((_f$layer = f.layer) === null || _f$layer === void 0 ? void 0 : _f$layer.id) == layer.id) {
+          f.layer.object3d.add(f);
+          f.meshes.position.z = (0, _GeoidLayer.geoidLayerIsVisible)(layer.parent) ? node.geoidHeight : 0;
+          f.meshes.updateMatrixWorld();
+        }
+      });
       return;
     }
 
-    var features = node.children.filter(function (n) {
-      return n.layer == layer;
-    });
-
-    if (features.length > 0) {
-      return features;
-    }
-
     var extentsDestination = node.getExtentsByProjection(layer.source.crs) || [node.extent];
     var zoomDest = extentsDestination[0].zoom; // check if it's tile level is equal to display level layer.
 
     if (zoomDest != layer.zoom.min || // check if there's data in extent tile.
-    !this.source.extentInsideLimit(node.extent, zoomDest) || layer.source.isFileSource && !node.extent.isPointInside(layer.source.extent.center(coord))) {
+    !this.source.extentInsideLimit(node.extent, zoomDest) || // In FileSource case, check if the feature center is in extent tile.
+    layer.source.isFileSource && !node.extent.isPointInside(layer.source.extent.center(coord))) {
       // if not, there's not data to add at this tile.
       node.layerUpdateState[layer.id].noMoreUpdatePossible();
       return;
@@ -108,38 +66,32 @@ var _default = {
       threejsLayer: layer.threejsLayer,
       requester: node
     };
-    return context.scheduler.execute(command).then(function (result) {
-      // if request return empty json, WFSProvider.getFeatures return undefined
-      result = result[0];
-
-      if (result) {
-        assignLayer(result, layer); // call onMeshCreated callback if needed
-
-        if (layer.onMeshCreated) {
-          layer.onMeshCreated(result);
+    return context.scheduler.execute(command).then(function (featureMeshes) {
+      node.layerUpdateState[layer.id].noMoreUpdatePossible();
+      featureMeshes.forEach(function (featureMesh) {
+        if (featureMesh) {
+          featureMesh.as(context.view.referenceCrs);
+          featureMesh.meshes.position.z = (0, _GeoidLayer.geoidLayerIsVisible)(layer.parent) ? node.geoidHeight : 0;
+          featureMesh.updateMatrixWorld();
+
+          if (layer.onMeshCreated) {
+            layer.onMeshCreated(featureMesh, context);
+          }
+
+          if (!node.parent) {
+            // TODO: Clean cache needs a refactory, because it isn't really efficient and used
+            _ObjectRemovalHelper["default"].removeChildrenAndCleanupRecursively(layer, featureMesh);
+          } else {
+            layer.object3d.add(featureMesh);
+            node.link.push(featureMesh);
+          }
+
+          featureMesh.layer = layer;
+        } else {
+          // TODO: verify if it's possible the featureMesh is undefined.
+          node.layerUpdateState[layer.id].failure(1, true);
         }
-
-        node.layerUpdateState[layer.id].success();
-
-        if (!node.parent) {
-          _ObjectRemovalHelper["default"].removeChildrenAndCleanupRecursively(layer, result);
-
-          return;
-        } // remove old group layer
-
-
-        node.remove.apply(node, (0, _toConsumableArray2["default"])(node.children.filter(function (c) {
-          return c.layer && c.layer.id == layer.id;
-        })));
-        var group = new THREE.Group();
-        group.layer = layer;
-        group.matrixWorld.copy(node.matrixWorld).invert();
-        group.matrixWorld.decompose(group.position, group.quaternion, group.scale);
-        node.add(group.add(result));
-        group.updateMatrixWorld(true);
-      } else {
-        node.layerUpdateState[layer.id].failure(1, true);
-      }
+      });
     }, function (err) {
       return (0, _handlerNodeError["default"])(err, node, layer, node.level, context.view);
     });

package/lib/Process/LayeredMaterialNodeProcessing.js

@@ -5,10 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateLayeredMaterialNodeImagery = updateLayeredMaterialNodeImagery;
-exports.updateLayeredMaterialNodeElevation = updateLayeredMaterialNodeElevation;
+exports.SIZE_TEXTURE_TILE = exports.SIZE_DIAGONAL_TEXTURE = void 0;
 exports.removeLayeredMaterialNodeLayer = removeLayeredMaterialNodeLayer;
-exports.SIZE_DIAGONAL_TEXTURE = exports.SIZE_TEXTURE_TILE = void 0;
+exports.updateLayeredMaterialNodeElevation = updateLayeredMaterialNodeElevation;
+exports.updateLayeredMaterialNodeImagery = updateLayeredMaterialNodeImagery;
 
 var _LayerUpdateStrategy = require("../Layer/LayerUpdateStrategy");
 
@@ -91,10 +91,12 @@ function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
     }
 
     if (!nodeLayer) {
+      var _parent$material;
+
       // Create new raster node
       nodeLayer = layer.setupRasterNode(node); // Init the node by parent
 
-      var parentLayer = parent.material && parent.material.getLayer(layer.id);
+      var parentLayer = (_parent$material = parent.material) === null || _parent$material === void 0 ? void 0 : _parent$material.getLayer(layer.id);
       nodeLayer.initFromParent(parentLayer, extentsDestination);
     } // Proposed new process, two separate processes:
     //      * FIRST PASS: initNodeXXXFromParent and get out of the function
@@ -199,8 +201,10 @@ function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
   }
 
   if (node.layerUpdateState[layer.id] === undefined) {
+    var _parent$material2;
+
     node.layerUpdateState[layer.id] = new _LayerUpdateState["default"]();
-    var parentLayer = parent.material && parent.material.getLayer(layer.id);
+    var parentLayer = (_parent$material2 = parent.material) === null || _parent$material2 === void 0 ? void 0 : _parent$material2.getLayer(layer.id);
     nodeLayer.initFromParent(parentLayer, extentsDestination);
 
     if (nodeLayer.level >= layer.source.zoom.min) {
@@ -259,11 +263,16 @@ function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
 
 function removeLayeredMaterialNodeLayer(layerId) {
   return function (node) {
-    if (node.material && node.material.removeLayer) {
+    var _node$material;
+
+    if ((_node$material = node.material) !== null && _node$material !== void 0 && _node$material.removeLayer) {
       node.material.removeLayer(layerId);
 
       if (node.material.elevationLayerIds[0] == layerId) {
-        node.setBBoxZ(0, 0);
+        node.setBBoxZ({
+          min: 0,
+          max: 0
+        });
       }
     }
 

package/lib/Process/ObjectRemovalHelper.js

@@ -107,6 +107,10 @@ var _default = {
       return (c.layer && c.layer.id) === layer.id;
     });
 
+    if (obj.link) {
+      toRemove = toRemove.concat(obj.link);
+    }
+
     var _iterator2 = _createForOfIteratorHelper(toRemove),
         _step2;
 

package/lib/Provider/3dTilesProvider.js

@@ -32,7 +32,8 @@ function b3dmToMesh(data, layer, url) {
     overrideMaterials: layer.overrideMaterials,
     doNotPatchMaterial: layer.doNotPatchMaterial,
     opacity: layer.opacity,
-    registeredExtensions: layer.registeredExtensions
+    registeredExtensions: layer.registeredExtensions,
+    layer: layer
   };
   return _B3dmParser["default"].parse(data, options).then(function (result) {
     var batchTable = result.batchTable; // object3d is actually a THREE.Scene
@@ -104,12 +105,6 @@ function executeCommand(command) {
     obj.layers.set(layer.threejsLayer);
     obj.userData.metadata = metadata;
     obj.layer = layer;
-
-    if (obj.material) {
-      obj.material.transparent = layer.opacity < 1.0;
-      obj.material.opacity = layer.opacity;
-      obj.material.wireframe = layer.wireframe;
-    }
   };
 
   if (path) {

package/lib/Provider/Fetcher.js

@@ -38,9 +38,12 @@ function getTextureFloat(buffer) {
   if (isWebGL2) {
     var texture = new _three.DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, _three.RedFormat, _three.FloatType);
     texture.internalFormat = 'R32F';
+    texture.needsUpdate = true;
     return texture;
   } else {
-    return new _three.DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, _three.AlphaFormat, _three.FloatType);
+    var _texture = new _three.DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, _three.AlphaFormat, _three.FloatType);
+
+    return _texture;
   }
 }
 /**

package/lib/Provider/TileProvider.js

@@ -9,6 +9,12 @@ exports["default"] = void 0;
 
 var _CancelledCommandException = _interopRequireDefault(require("../Core/Scheduler/CancelledCommandException"));
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 var _default = {
   executeCommand: function executeCommand(command) {
     var promises = [];
@@ -20,8 +26,18 @@ var _default = {
       return Promise.reject(new _CancelledCommandException["default"](command));
     }
 
-    for (var i = 0, size = extentsSource.length; i < size; i++) {
-      promises.push(layer.convert(requester, extentsSource[i]));
+    var _iterator = _createForOfIteratorHelper(extentsSource),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var extent = _step.value;
+        promises.push(layer.convert(requester, extent));
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
 
     return Promise.all(promises);

package/lib/Provider/URLBuilder.js

@@ -98,7 +98,7 @@ var _default = {
    *
    * @return {string} the formed url
    */
-  bbox: function bbox(bbox, source) {
+  bbox: function (bbox, source) {
     var precision = source.crs == 'EPSG:4326' ? 9 : 2;
     bbox.as(source.crs, extent);
     var w = extent.west.toFixed(precision);

package/lib/Renderer/Camera.js

@@ -13,6 +13,10 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
+var _classPrivateFieldGet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldGet"));
+
+var _classPrivateFieldSet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldSet"));
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
@@ -23,6 +27,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
 /**
  * @typedef     {object}    Camera~CAMERA_TYPE
  * Stores the different types of camera usable in iTowns.
@@ -97,6 +105,10 @@ function updatePreSse(camera, height, fov) {
  */
 
 
+var _viewMatrixNeedsUpdate = /*#__PURE__*/new WeakMap();
+
+var _viewMatrix = /*#__PURE__*/new WeakMap();
+
 var Camera = /*#__PURE__*/function () {
   /**
    * @param   {string}                crs                                     The camera's coordinate projection system.
@@ -112,10 +124,22 @@ var Camera = /*#__PURE__*/function () {
    * @constructor
    */
   function Camera(crs, width, height) {
-    var _this = this;
+    var _this$camera3D$aspect,
+        _this = this;
 
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     (0, _classCallCheck2["default"])(this, Camera);
+
+    _classPrivateFieldInitSpec(this, _viewMatrixNeedsUpdate, {
+      writable: true,
+      value: true
+    });
+
+    _classPrivateFieldInitSpec(this, _viewMatrix, {
+      writable: true,
+      value: new THREE.Matrix4()
+    });
+
     this.crs = crs;
 
     if (options.isCamera) {
@@ -136,11 +160,9 @@ var Camera = /*#__PURE__*/function () {
       }
     }
 
-    this.camera3D.aspect = this.camera3D.aspect !== undefined ? this.camera3D.aspect : 1;
-    this._viewMatrix = new THREE.Matrix4();
+    this.camera3D.aspect = (_this$camera3D$aspect = this.camera3D.aspect) !== null && _this$camera3D$aspect !== void 0 ? _this$camera3D$aspect : 1;
     this.width = width;
     this.height = height;
-    this._viewMatrixNeedsUpdate = true;
     this.resize(width, height);
     this._preSSE = Infinity;
 
@@ -189,7 +211,7 @@ var Camera = /*#__PURE__*/function () {
 
       if (this.camera3D.updateProjectionMatrix) {
         this.camera3D.updateProjectionMatrix();
-        this._viewMatrixNeedsUpdate = true;
+        (0, _classPrivateFieldSet2["default"])(this, _viewMatrixNeedsUpdate, true);
       }
     }
   }, {
@@ -197,7 +219,7 @@ var Camera = /*#__PURE__*/function () {
     value: function update() {
       // update matrix
       this.camera3D.updateMatrixWorld();
-      this._viewMatrixNeedsUpdate = true;
+      (0, _classPrivateFieldSet2["default"])(this, _viewMatrixNeedsUpdate, true);
     }
     /**
      * Return the position in the requested CRS, or in camera's CRS if undefined.
@@ -232,18 +254,17 @@ var Camera = /*#__PURE__*/function () {
   }, {
     key: "isSphereVisible",
     value: function isSphereVisible(sphere, matrixWorld) {
-      if (this._viewMatrixNeedsUpdate) {
+      if ((0, _classPrivateFieldGet2["default"])(this, _viewMatrixNeedsUpdate)) {
         // update visibility testing matrix
-        this._viewMatrix.multiplyMatrices(this.camera3D.projectionMatrix, this.camera3D.matrixWorldInverse);
-
-        this._viewMatrixNeedsUpdate = false;
+        (0, _classPrivateFieldGet2["default"])(this, _viewMatrix).multiplyMatrices(this.camera3D.projectionMatrix, this.camera3D.matrixWorldInverse);
+        (0, _classPrivateFieldSet2["default"])(this, _viewMatrixNeedsUpdate, false);
       }
 
       if (matrixWorld) {
-        tmp.matrix.multiplyMatrices(this._viewMatrix, matrixWorld);
+        tmp.matrix.multiplyMatrices((0, _classPrivateFieldGet2["default"])(this, _viewMatrix), matrixWorld);
         tmp.frustum.setFromProjectionMatrix(tmp.matrix);
       } else {
-        tmp.frustum.setFromProjectionMatrix(this._viewMatrix);
+        tmp.frustum.setFromProjectionMatrix((0, _classPrivateFieldGet2["default"])(this, _viewMatrix));
       }
 
       return tmp.frustum.intersectsSphere(sphere);

package/lib/Renderer/ColorLayersOrdering.js

@@ -17,7 +17,9 @@ function updateLayersOrdering(geometryLayer, imageryLayers) {
   var sequence = _Layer.ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
 
   var cO = function (object) {
-    if (object.material && object.material.setSequence) {
+    var _object$material;
+
+    if ((_object$material = object.material) !== null && _object$material !== void 0 && _object$material.setSequence) {
       object.material.setSequence(sequence);
     }
   };

package/lib/Renderer/LayeredMaterial.js

@@ -7,9 +7,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unpack1K = unpack1K;
+exports["default"] = exports.colorLayerEffects = exports.ELEVATION_MODES = void 0;
 exports.getMaxColorSamplerUnitsCount = getMaxColorSamplerUnitsCount;
-exports["default"] = exports.ELEVATION_MODES = exports.colorLayerEffects = void 0;
+exports.unpack1K = unpack1K;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -23,6 +23,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _classPrivateFieldSet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldSet"));
+
+var _classPrivateFieldGet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldGet"));
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var _ShaderUtils = _interopRequireDefault(require("./Shader/ShaderUtils"));
@@ -41,6 +45,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -48,7 +56,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 /* babel-plugin-inline-import './Shader/TileVS.glsl' */
-var TileVS = "#include <itowns/WebGL2_pars_vertex>\n#include <itowns/precision_qualifier>\n#include <common>\n#include <itowns/project_pars_vertex>\n#include <itowns/elevation_pars_vertex>\n#include <logdepthbuf_pars_vertex>\nattribute vec2      uv_0;\n#if NUM_CRS > 1\nattribute float     uv_1;\n#endif\nattribute vec3      normal;\n\nuniform mat4 modelMatrix;\nuniform bool lightingEnabled;\nvarying vec2 vHighPrecisionZW;\n\n#if MODE == MODE_FINAL\n#include <fog_pars_vertex>\nvarying vec3        vUv;\nvarying vec3        vNormal;\n#endif\nvoid main() {\n        vec2 uv = vec2(uv_0.x, 1.0 - uv_0.y);\n\n        #include <begin_vertex>\n        #include <itowns/elevation_vertex>\n        #include <project_vertex>\n        #include <logdepthbuf_vertex>\n        vHighPrecisionZW = gl_Position.zw;\n#if MODE == MODE_FINAL\n        #include <fog_vertex>\n        #if NUM_CRS > 1\n        vUv = vec3(uv_0, (uv_1 > 0.) ? uv_1 : uv_0.y); // set uv_1 = uv_0 if uv_1 is undefined\n        #else\n        vUv = vec3(uv_0, 0.0);\n        #endif\n        vNormal = normalize ( mat3( modelMatrix[0].xyz, modelMatrix[1].xyz, modelMatrix[2].xyz ) * normal );\n#endif\n}\n";
+var TileVS = "#include <itowns/WebGL2_pars_vertex>\n#include <itowns/precision_qualifier>\n#include <common>\n#include <itowns/project_pars_vertex>\n#include <itowns/elevation_pars_vertex>\n#include <logdepthbuf_pars_vertex>\nattribute vec2      uv_0;\n#if NUM_CRS > 1\nattribute float     uv_1;\n#endif\nattribute vec3      normal;\n\nuniform mat4 modelMatrix;\nuniform bool lightingEnabled;\nvarying vec2 vHighPrecisionZW;\n\n#if MODE == MODE_FINAL\n#include <fog_pars_vertex>\nvarying vec3        vUv;\nvarying vec3        vNormal;\n#endif\nvoid main() {\n        vec2 uv = vec2(uv_0.x, 1.0 - uv_0.y);\n\n        #include <begin_vertex>\n        #include <itowns/elevation_vertex>\n        #include <itowns/geoid_vertex>\n        #include <project_vertex>\n        #include <logdepthbuf_vertex>\n        vHighPrecisionZW = gl_Position.zw;\n#if MODE == MODE_FINAL\n        #include <fog_vertex>\n        #if NUM_CRS > 1\n        vUv = vec3(uv_0, (uv_1 > 0.) ? uv_1 : uv_0.y); // set uv_1 = uv_0 if uv_1 is undefined\n        #else\n        vUv = vec3(uv_0, 0.0);\n        #endif\n        vNormal = normalize ( mat3( modelMatrix[0].xyz, modelMatrix[1].xyz, modelMatrix[2].xyz ) * normal );\n#endif\n}\n";
 
 /* babel-plugin-inline-import './Shader/TileFS.glsl' */
 var TileFS = "#include <itowns/WebGL2_pars_fragment>\n#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#include <itowns/pitUV>\n#include <itowns/color_layers_pars_fragment>\n#if MODE == MODE_FINAL\n#include <itowns/fog_pars_fragment>\n#include <itowns/overlay_pars_fragment>\n#include <itowns/lighting_pars_fragment>\n#endif\n#include <itowns/mode_pars_fragment>\n\nuniform vec3        diffuse;\nuniform float       opacity;\nvarying vec3        vUv; // uv_0.x/uv_1.x, uv_0.y, uv_1.y\nvarying vec2        vHighPrecisionZW;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n\n#if MODE == MODE_ID\n\n    #include <itowns/mode_id_fragment>\n\n#elif MODE == MODE_DEPTH\n\n    #include <itowns/mode_depth_fragment>\n\n#else\n\n    gl_FragColor = vec4(diffuse, opacity);\n\n    uvs[0] = vec3(vUv.xy, 0.);\n\n#if NUM_CRS > 1\n    uvs[1] = vec3(vUv.x, fract(vUv.z), floor(vUv.z));\n#endif\n\n    vec4 color;\n    #pragma unroll_loop\n    for ( int i = 0; i < NUM_FS_TEXTURES; i ++ ) {\n        color = getLayerColor( i , colorTextures[ i ], colorOffsetScales[ i ], colorLayers[ i ]);\n        gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n    }\n\n  #if defined(DEBUG)\n    if (showOutline) {\n        #pragma unroll_loop\n        for ( int i = 0; i < NUM_CRS; i ++) {\n            color = getOutlineColor( outlineColors[ i ], uvs[ i ].xy);\n            gl_FragColor.rgb = mix(gl_FragColor.rgb, color.rgb, color.a);\n        }\n    }\n  #endif\n\n    #include <itowns/fog_fragment>\n    #include <itowns/lighting_fragment>\n    #include <itowns/overlay_fragment>\n\n#endif\n}\n";
@@ -150,6 +158,8 @@ exports.ELEVATION_MODES = ELEVATION_MODES;
 var nbSamplers;
 var fragmentShader = [];
 
+var _visible = /*#__PURE__*/new WeakMap();
+
 var LayeredMaterial = /*#__PURE__*/function (_THREE$RawShaderMater) {
   (0, _inherits2["default"])(LayeredMaterial, _THREE$RawShaderMater);
 
@@ -162,6 +172,12 @@ var LayeredMaterial = /*#__PURE__*/function (_THREE$RawShaderMater) {
     var crsCount = arguments.length > 1 ? arguments[1] : undefined;
     (0, _classCallCheck2["default"])(this, LayeredMaterial);
     _this = _super.call(this, options);
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _visible, {
+      writable: true,
+      value: true
+    });
+
     nbSamplers = nbSamplers || [samplersElevationCount, getMaxColorSamplerUnitsCount()];
     _this.defines.NUM_VS_TEXTURES = nbSamplers[0];
     _this.defines.NUM_FS_TEXTURES = nbSamplers[1];
@@ -201,7 +217,9 @@ var LayeredMaterial = /*#__PURE__*/function (_THREE$RawShaderMater) {
 
     _CommonMaterial["default"].setUniformProperty((0, _assertThisInitialized2["default"])(_this), 'overlayColor', new THREE.Color(1.0, 0.3, 0.0));
 
-    _CommonMaterial["default"].setUniformProperty((0, _assertThisInitialized2["default"])(_this), 'objectId', 0); // > 0 produces gaps,
+    _CommonMaterial["default"].setUniformProperty((0, _assertThisInitialized2["default"])(_this), 'objectId', 0);
+
+    _CommonMaterial["default"].setUniformProperty((0, _assertThisInitialized2["default"])(_this), 'geoidHeight', 0.0); // > 0 produces gaps,
     // < 0 causes oversampling of textures
     // = 0 causes sampling artefacts due to bad estimation of texture-uv gradients
     // best is a small negative number
@@ -222,16 +240,23 @@ var LayeredMaterial = /*#__PURE__*/function (_THREE$RawShaderMater) {
     _this.uniforms.colorLayers = new THREE.Uniform(new Array(nbSamplers[1]).fill(defaultStructLayer));
     _this.uniforms.colorTextures = new THREE.Uniform(new Array(nbSamplers[1]).fill(defaultTex));
     _this.uniforms.colorOffsetScales = new THREE.Uniform(new Array(nbSamplers[1]).fill(identityOffsetScale));
-    _this.uniforms.colorTextureCount = new THREE.Uniform(0);
-    var _visible = _this.visible; // can't do an ES6 setter/getter here
+    _this.uniforms.colorTextureCount = new THREE.Uniform(0); // can't do an ES6 setter/getter here
 
     Object.defineProperty((0, _assertThisInitialized2["default"])(_this), 'visible', {
+      // Knowing the visibility of a `LayeredMaterial` is useful. For example in a
+      // `GlobeView`, if you zoom in, "parent" tiles seems hidden; in fact, there
+      // are not, it is only their material (so `LayeredMaterial`) that is set to
+      // not visible.
+      // Adding an event when changing this property can be useful to hide others
+      // things, like in `TileDebug`, or in later PR to come (#1303 for example).
+      //
+      // TODO : verify if there is a better mechanism to avoid this event
       get: function get() {
-        return _visible;
+        return (0, _classPrivateFieldGet2["default"])(this, _visible);
       },
       set: function set(v) {
-        if (_visible != v) {
-          _visible = v;
+        if ((0, _classPrivateFieldGet2["default"])(this, _visible) != v) {
+          (0, _classPrivateFieldSet2["default"])(this, _visible, v);
           this.dispatchEvent({
             type: v ? 'shown' : 'hidden'
           });

package/lib/Renderer/OBB.js

@@ -13,8 +13,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -78,7 +76,7 @@ var OBB = /*#__PURE__*/function (_THREE$Object3D) {
       max: 0,
       scale: 1.0
     };
-    return (0, _possibleConstructorReturn2["default"])(_this, (0, _assertThisInitialized2["default"])(_this));
+    return _this;
   }
   /**
    * Creates a new instance of the object with same properties than original.
@@ -121,32 +119,28 @@ var OBB = /*#__PURE__*/function (_THREE$Object3D) {
       this.updateMatrixWorld(true);
     }
     /**
-     * Update z min and z max of oriented bounding box
+     * Update z min, z max and z scale of oriented bounding box
      *
-     * @param {number}  min The minimum of oriented bounding box
-     * @param {number}  max The maximum of oriented bounding box
-     * @param {number} scale
+     * @param {Object}  [elevation={}]
+     * @param {number}  [elevation.min]             The minimum of oriented bounding box
+     * @param {number}  [elevation.max]             The maximum of oriented bounding box
+     * @param {number}  [elevation.scale]           The scale of oriented bounding box Z axis
+     * @param {number}  [elevation.geoidHeight]     The geoid height added to ellipsoid.
      */
 
   }, {
     key: "updateZ",
-    value: function updateZ(min, max) {
-      var scale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.z.scale;
-      this.z = {
-        min: min,
-        max: max,
-        scale: scale,
-        delta: Math.abs(max - min) * scale
-      };
-      this.box3D.min.z = this.natBox.min.z + min * scale;
-      this.box3D.max.z = this.natBox.max.z + max * scale;
-    }
-  }, {
-    key: "updateScaleZ",
-    value: function updateScaleZ(scale) {
-      if (scale > 0) {
-        this.updateZ(this.z.min, this.z.max, scale);
-      }
+    value: function updateZ() {
+      var _elevation$min, _elevation$max;
+
+      var elevation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      this.z.min = (_elevation$min = elevation.min) !== null && _elevation$min !== void 0 ? _elevation$min : this.z.min;
+      this.z.max = (_elevation$max = elevation.max) !== null && _elevation$max !== void 0 ? _elevation$max : this.z.max;
+      this.z.scale = elevation.scale > 0 ? elevation.scale : this.z.scale;
+      this.z.delta = Math.abs(this.z.max - this.z.min) * this.z.scale;
+      var geoidHeight = elevation.geoidHeight || 0;
+      this.box3D.min.z = this.natBox.min.z + this.z.min * this.z.scale + geoidHeight;
+      this.box3D.max.z = this.natBox.max.z + this.z.max * this.z.scale + geoidHeight;
     }
     /**
      * Determines if the sphere is above the XY space of the box
@@ -200,7 +194,10 @@ var OBB = /*#__PURE__*/function (_THREE$Object3D) {
         obb.box3D.copy(geometry.boundingBox);
         obb.natBox.copy(geometry.boundingBox);
         this.copy(obb);
-        this.updateZ(minHeight, maxHeight);
+        this.updateZ({
+          min: minHeight,
+          max: maxHeight
+        });
         this.position.copy(position);
         this.quaternion.copy(quaternion);
         this.updateMatrixWorld(true);