itowns 2.37.0 → 2.38.2

package/lib/Converter/Feature2Mesh.js

@@ -9,14 +9,42 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _classPrivateFieldGet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldGet"));
+
+var _classPrivateFieldSet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldSet"));
+
 var THREE = _interopRequireWildcard(require("three"));
 
 var _earcut = _interopRequireDefault(require("earcut"));
 
 var _Feature = require("../Core/Feature");
 
+var _ReferencingLayerProperties = _interopRequireDefault(require("../Layer/ReferencingLayerProperties"));
+
 var _Undeprecator = require("../Core/Deprecated/Undeprecator");
 
+var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
+
+var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
+
+var _OrientationUtils = _interopRequireDefault(require("../Utils/OrientationUtils"));
+
+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; }
@@ -27,11 +55,129 @@ 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; }
 
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+
+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"); } }
+
+var coord = new _Coordinates["default"]('EPSG:4326', 0, 0, 0);
+var dim_ref = new THREE.Vector2();
+var dim = new THREE.Vector2();
+var extent = new _Extent["default"]('EPSG:4326', 0, 0, 0, 0);
+
 var _color = new THREE.Color();
 
 var maxValueUint8 = Math.pow(2, 8) - 1;
 var maxValueUint16 = Math.pow(2, 16) - 1;
 var maxValueUint32 = Math.pow(2, 32) - 1;
+var crsWGS84 = 'EPSG:4326';
+
+var _currentCrs = /*#__PURE__*/new WeakMap();
+
+var _originalCrs = /*#__PURE__*/new WeakMap();
+
+var _collection = /*#__PURE__*/new WeakMap();
+
+var _place = /*#__PURE__*/new WeakMap();
+
+var FeatureMesh = /*#__PURE__*/function (_THREE$Group) {
+  (0, _inherits2["default"])(FeatureMesh, _THREE$Group);
+
+  var _super = _createSuper(FeatureMesh);
+
+  function FeatureMesh(meshes, collection) {
+    var _THREE$Group2;
+
+    var _this;
+
+    (0, _classCallCheck2["default"])(this, FeatureMesh);
+    _this = _super.call(this);
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _currentCrs, {
+      writable: true,
+      value: void 0
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _originalCrs, {
+      writable: true,
+      value: void 0
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _collection, {
+      writable: true,
+      value: new THREE.Group()
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _place, {
+      writable: true,
+      value: new THREE.Group()
+    });
+
+    _this.meshes = (_THREE$Group2 = new THREE.Group()).add.apply(_THREE$Group2, (0, _toConsumableArray2["default"])(meshes));
+    (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection, new THREE.Group().add(_this.meshes));
+    (0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection).quaternion.copy(collection.quaternion);
+    (0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection).position.copy(collection.position);
+    (0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection).scale.copy(collection.scale);
+    (0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection).updateMatrix();
+    (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _originalCrs, collection.crs);
+    (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _currentCrs, (0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _originalCrs));
+    _this.extent = collection.extent;
+
+    _this.add((0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _place).add((0, _classPrivateFieldGet2["default"])((0, _assertThisInitialized2["default"])(_this), _collection)));
+
+    return _this;
+  }
+
+  (0, _createClass2["default"])(FeatureMesh, [{
+    key: "as",
+    value: function as(crs) {
+      if ((0, _classPrivateFieldGet2["default"])(this, _currentCrs) !== crs) {
+        (0, _classPrivateFieldSet2["default"])(this, _currentCrs, crs);
+
+        if (crs == (0, _classPrivateFieldGet2["default"])(this, _originalCrs)) {
+          // reset transformation
+          this.place.position.set(0, 0, 0);
+          this.position.set(0, 0, 0);
+          this.scale.set(1, 1, 1);
+          this.quaternion.identity();
+        } else {
+          // calculate the scale transformation to transform the feature.extent
+          // to feature.extent.as(crs)
+          coord.crs = _Crs["default"].formatToEPSG((0, _classPrivateFieldGet2["default"])(this, _originalCrs));
+          extent.copy(this.extent).applyMatrix4((0, _classPrivateFieldGet2["default"])(this, _collection).matrix);
+          extent.as(coord.crs, extent);
+          extent.spatialEuclideanDimensions(dim_ref);
+          extent.planarDimensions(dim);
+
+          if (dim.x && dim.y) {
+            this.scale.copy(dim_ref).divide(dim).setZ(1);
+          } // Position and orientation
+          // remove original position
+
+
+          (0, _classPrivateFieldGet2["default"])(this, _place).position.copy((0, _classPrivateFieldGet2["default"])(this, _collection).position).negate(); // get mesh coordinate
+
+          coord.setFromVector3((0, _classPrivateFieldGet2["default"])(this, _collection).position); // get method to calculate orientation
+
+          var crsInput = (0, _classPrivateFieldGet2["default"])(this, _originalCrs) == 'EPSG:3857' ? crsWGS84 : (0, _classPrivateFieldGet2["default"])(this, _originalCrs);
+
+          var crs2crs = _OrientationUtils["default"].quaternionFromCRSToCRS(crsInput, crs); // calculate orientation to crs
+
+
+          crs2crs(coord.as(crsWGS84), this.quaternion); // transform position to crs
+
+          coord.as(crs, coord).toVector3(this.position);
+        }
+      }
+
+      return this;
+    }
+  }]);
+  return FeatureMesh;
+}(THREE.Group);
 
 function toColor(color) {
   if (color) {
@@ -94,12 +240,21 @@ function coordinatesToVertices(ptsIn, normals, target, zTranslation) {
   offsetOut *= 3;
   var endIn = startIn + countIn;
 
-  for (var i = startIn, j = offsetOut; i < endIn; i += 3, j += 3) {
-    // move the vertex following the normal, to put the point on the good altitude
-    // fill the vertices array at the offset position
-    target[j] = ptsIn[i] + normals[i] * zTranslation;
-    target[j + 1] = ptsIn[i + 1] + normals[i + 1] * zTranslation;
-    target[j + 2] = ptsIn[i + 2] + normals[i + 2] * zTranslation;
+  if (normals) {
+    for (var i = startIn, j = offsetOut; i < endIn; i += 3, j += 3) {
+      // move the vertex following the normal, to put the point on the good altitude
+      // fill the vertices array at the offset position
+      target[j] = ptsIn[i] + normals[i] * zTranslation;
+      target[j + 1] = ptsIn[i + 1] + normals[i + 1] * zTranslation;
+      target[j + 2] = ptsIn[i + 2] + normals[i + 2] * zTranslation;
+    }
+  } else {
+    for (var _i = startIn, _j = offsetOut; _i < endIn; _i += 3, _j += 3) {
+      // move the vertex following the z axe
+      target[_j] = ptsIn[_i];
+      target[_j + 1] = ptsIn[_i + 1];
+      target[_j + 2] = ptsIn[_i + 2] + zTranslation;
+    }
   }
 }
 /*
@@ -148,8 +303,6 @@ function addExtrudedPolygonSideFaces(indices, length, offset, count, isClockWise
   }
 }
 
-var pointMaterial = new THREE.PointsMaterial();
-
 function featureToPoint(feature, options) {
   var ptsIn = feature.vertices;
   var normals = feature.normals;
@@ -174,14 +327,15 @@ function featureToPoint(feature, options) {
       _step;
 
   try {
-    var _loop = function () {
+    var _loop = function _loop() {
       var geometry = _step.value;
-      var style = feature.style.drawingStylefromContext({
+      var context = {
         globals: globals,
         properties: function properties() {
           return geometry.properties;
         }
-      });
+      };
+      var style = feature.style.drawingStylefromContext(context);
       var start = geometry.indices[0].offset;
       var count = geometry.indices[0].count;
       fillColorArray(colors, count, toColor(style.point.color), start);
@@ -210,12 +364,10 @@ function featureToPoint(feature, options) {
     geom.setAttribute('batchId', new THREE.BufferAttribute(batchIds, 1));
   }
 
-  pointMaterial.size = feature.style.point.radius;
-  return new THREE.Points(geom, pointMaterial);
+  options.pointMaterial.size = feature.style.point.radius;
+  return new THREE.Points(geom, options.pointMaterial);
 }
 
-var lineMaterial = new THREE.LineBasicMaterial();
-
 function featureToLine(feature, options) {
   var ptsIn = feature.vertices;
   var normals = feature.normals;
@@ -237,7 +389,7 @@ function featureToLine(feature, options) {
   geom.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
   var lines; // TODO CREATE material for each feature
 
-  lineMaterial.linewidth = feature.style.stroke.width;
+  options.lineMaterial.linewidth = feature.style.stroke.width;
   var globals = {
     stroke: true
   };
@@ -251,14 +403,15 @@ function featureToLine(feature, options) {
         _step2;
 
     try {
-      var _loop2 = function () {
+      var _loop2 = function _loop2() {
         var geometry = _step2.value;
-        var style = feature.style.drawingStylefromContext({
+        var context = {
           globals: globals,
           properties: function properties() {
             return geometry.properties;
           }
-        });
+        };
+        var style = feature.style.drawingStylefromContext(context);
         var start = geometry.indices[0].offset; // To avoid integer overflow with indice value (16 bits)
 
         if (start > 0xffff) {
@@ -304,14 +457,15 @@ function featureToLine(feature, options) {
     }
 
     geom.setIndex(new THREE.BufferAttribute(indices, 1));
-    lines = new THREE.LineSegments(geom, lineMaterial);
+    lines = new THREE.LineSegments(geom, options.lineMaterial);
   } else {
-    var style = feature.style.drawingStylefromContext({
+    var context = {
       globals: globals,
       properties: function properties() {
         return feature.geometries[0].properties;
       }
-    });
+    };
+    var style = feature.style.drawingStylefromContext(context);
     fillColorArray(colors, count, toColor(style.stroke.color));
     geom.setAttribute('color', new THREE.BufferAttribute(colors, 3, true));
 
@@ -321,14 +475,12 @@ function featureToLine(feature, options) {
       geom.setAttribute('batchId', new THREE.BufferAttribute(batchIds, 1));
     }
 
-    lines = new THREE.Line(geom, lineMaterial);
+    lines = new THREE.Line(geom, options.lineMaterial);
   }
 
   return lines;
 }
 
-var material = new THREE.MeshBasicMaterial();
-
 function featureToPolygon(feature, options) {
   var ptsIn = feature.vertices;
   var normals = feature.normals;
@@ -354,7 +506,7 @@ function featureToPolygon(feature, options) {
       _step3;
 
   try {
-    var _loop3 = function () {
+    var _loop3 = function _loop3() {
       var geometry = _step3.value;
       var start = geometry.indices[0].offset; // To avoid integer overflow with index value (32 bits)
 
@@ -363,15 +515,17 @@ function featureToPolygon(feature, options) {
         return "break";
       }
 
-      var style = feature.style.drawingStylefromContext({
+      var context = {
         globals: globals,
         properties: function properties() {
           return geometry.properties;
         }
-      });
+      };
+      var style = feature.style.drawingStylefromContext(context);
       var lastIndice = geometry.indices.slice(-1)[0];
       var end = lastIndice.offset + lastIndice.count;
-      fillColorArray(colors, end - start, toColor(style.fill.color), start);
+      var count = end - start;
+      fillColorArray(colors, count, toColor(style.fill.color), start);
       var geomVertices = vertices.slice(start * 3, end * 3);
       var holesOffsets = geometry.indices.map(function (i) {
         return i.offset - start;
@@ -411,15 +565,15 @@ function featureToPolygon(feature, options) {
   }
 
   geom.setIndex(new THREE.BufferAttribute(getIntArrayFromSize(indices, vertices.length / 3), 1));
-  return new THREE.Mesh(geom, material);
+  return new THREE.Mesh(geom, options.polygonMaterial);
 }
 
 function area(contour, offset, count) {
   offset *= 3;
-  var n = count * 3;
+  var n = offset + count * 3;
   var a = 0.0;
 
-  for (var p = n + offset - 3, q = offset; q < n; p = q, q += 3) {
+  for (var p = n - 3, q = offset; q < n; p = q, q += 3) {
     a += contour[p] * contour[q + 1] - contour[q] * contour[p + 1];
   }
 
@@ -430,9 +584,6 @@ var bottomColor = new THREE.Color();
 
 function featureToExtrudedPolygon(feature, options) {
   var ptsIn = feature.vertices;
-  var offset = feature.geometries[0].indices[0].offset;
-  var count = feature.geometries[0].indices[0].count;
-  var isClockWise = area(ptsIn, offset, count) < 0;
   var normals = feature.normals;
   var vertices = new Float32Array(ptsIn.length * 2);
   var colors = new Uint8Array(ptsIn.length * 2);
@@ -449,14 +600,17 @@ function featureToExtrudedPolygon(feature, options) {
       _step4;
 
   try {
-    var _loop4 = function () {
+    var _loop4 = function _loop4() {
+      var _geometry$indices$0$c;
+
       var geometry = _step4.value;
-      var style = feature.style.drawingStylefromContext({
+      var context = {
         globals: globals,
         properties: function properties() {
           return geometry.properties;
         }
-      }); // topColor is assigned to the top of extruded polygon
+      };
+      var style = feature.style.drawingStylefromContext(context); // topColor is assigned to the top of extruded polygon
 
       var topColor = toColor(style.fill.color); // bottomColor is assigned to the bottom of extruded polygon
 
@@ -466,6 +620,7 @@ function featureToExtrudedPolygon(feature, options) {
       var lastIndice = geometry.indices.slice(-1)[0];
       var end = lastIndice.offset + lastIndice.count;
       var count = end - start;
+      var isClockWise = (_geometry$indices$0$c = geometry.indices[0].ccw) !== null && _geometry$indices$0$c !== void 0 ? _geometry$indices$0$c : area(ptsIn, start, count) < 0;
       coordinatesToVertices(ptsIn, normals, vertices, z, start, count);
       fillColorArray(colors, count, bottomColor, start);
       var startTop = start + totalVertices;
@@ -482,20 +637,16 @@ function featureToExtrudedPolygon(feature, options) {
 
       for (var i = 0; i < triangles.length; i++) {
         indices[startIndice + i] = triangles[i] + startTop;
-      }
+      } // add extruded contour
 
-      var _iterator5 = _createForOfIteratorHelper(geometry.indices),
-          _step5;
 
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var indice = _step5.value;
-          addExtrudedPolygonSideFaces(indices, totalVertices, indice.offset, indice.count, isClockWise);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
+      addExtrudedPolygonSideFaces(indices, totalVertices, geometry.indices[0].offset, geometry.indices[0].count, isClockWise); // add extruded holes
+
+      for (var _i2 = 1; _i2 < geometry.indices.length; _i2++) {
+        var _indice$ccw;
+
+        var indice = geometry.indices[_i2];
+        addExtrudedPolygonSideFaces(indices, totalVertices, indice.offset, indice.count, !((_indice$ccw = indice.ccw) !== null && _indice$ccw !== void 0 ? _indice$ccw : isClockWise));
       }
 
       if (batchIds) {
@@ -524,8 +675,7 @@ function featureToExtrudedPolygon(feature, options) {
   }
 
   geom.setIndex(new THREE.BufferAttribute(getIntArrayFromSize(indices, vertices.length / 3), 1));
-  var mesh = new THREE.Mesh(geom, material);
-  return mesh;
+  return new THREE.Mesh(geom, options.polygonMaterial);
 }
 /**
  * Convert a [Feature]{@link Feature} to a Mesh
@@ -569,6 +719,12 @@ function featureToMesh(feature, options) {
   mesh.material.color = new THREE.Color(0xffffff);
   mesh.feature = feature;
   mesh.position.z = feature.altitude.min - options.GlobalZTrans;
+
+  if (options.layer) {
+    mesh.layer = options.layer;
+    mesh.layers.set(options.layer.threejsLayer);
+  }
+
   return mesh;
 }
 /**
@@ -582,7 +738,9 @@ var _default = {
    * a THREE.Group.
    *
    * @param {Object} options - options controlling the conversion
-   * @param {function} [options.batchId] - optional function to create batchId attribute. It is passed the feature property and the feature index. As the batchId is using an unsigned int structure on 32 bits, the batchId could be between 0 and 4,294,967,295.
+   * @param {function} [options.batchId] - optional function to create batchId attribute.
+   * It is passed the feature property and the feature index. As the batchId is using an unsigned int structure on 32 bits,
+   * the batchId could be between 0 and 4,294,967,295.
    * @return {function}
    * @example <caption>Example usage of batchId with featureId.</caption>
    * view.addLayer({
@@ -611,26 +769,32 @@ var _default = {
   convert: function convert() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     (0, _Undeprecator.deprecatedFeature2MeshOptions)(options);
-    return function (collection) {
+    return function _convert(collection) {
       if (!collection) {
         return;
       }
 
+      if (!options.pointMaterial) {
+        // Opacity and wireframe refered with layer properties
+        // TODO :next step is move these properties to Style
+        options.pointMaterial = (0, _ReferencingLayerProperties["default"])(new THREE.PointsMaterial(), this);
+        options.lineMaterial = (0, _ReferencingLayerProperties["default"])(new THREE.LineBasicMaterial(), this);
+        options.polygonMaterial = (0, _ReferencingLayerProperties["default"])(new THREE.MeshBasicMaterial(), this);
+        options.layer = this;
+      }
+
       var features = collection.features;
 
       if (!features || features.length == 0) {
         return;
       }
 
-      var group = new THREE.Group();
       options.GlobalZTrans = collection.center.z;
-      features.forEach(function (feature) {
-        return group.add(featureToMesh(feature, options));
+      var meshes = features.map(function (feature) {
+        return featureToMesh(feature, options);
       });
-      group.quaternion.copy(collection.quaternion);
-      group.position.copy(collection.position);
-      group.scale.copy(collection.scale);
-      return group;
+      var featureNode = new FeatureMesh(meshes, collection);
+      return featureNode;
     };
   }
 };

package/lib/Converter/Feature2Texture.js

@@ -186,16 +186,17 @@ function drawFeature(ctx, feature, extent, style, invCtxScale) {
       _step3;
 
   try {
-    var _loop = function () {
+    var _loop = function _loop() {
       var geometry = _step3.value;
 
       if (geometry.extent.intersectsExtent(extent)) {
-        var contextStyle = (geometry.properties.style || style).drawingStylefromContext({
+        var context = {
           globals: globals,
           properties: function properties() {
             return geometry.properties;
           }
-        });
+        };
+        var contextStyle = (geometry.properties.style || style).drawingStylefromContext(context);
 
         if (contextStyle) {
           if (feature.type === _Feature.FEATURE_TYPES.POINT) {

package/lib/Converter/convertToTile.js

@@ -17,6 +17,10 @@ var _LayeredMaterial = _interopRequireDefault(require("../Renderer/LayeredMateri
 
 var _TileBuilder = _interopRequireDefault(require("../Core/Prefab/TileBuilder"));
 
+var _ReferencingLayerProperties = _interopRequireDefault(require("../Layer/ReferencingLayerProperties"));
+
+var _GeoidLayer = require("../Layer/GeoidLayer");
+
 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; }
@@ -29,9 +33,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var dimensions = new THREE.Vector2();
 
 function setTileFromTiledLayer(tile, tileLayer) {
-  tile.material.transparent = tileLayer.opacity < 1.0;
-  tile.material.opacity = tileLayer.opacity;
-
   if (tileLayer.diffuse) {
     tile.material.diffuse = tileLayer.diffuse;
   }
@@ -66,6 +67,7 @@ var _default = {
       result.geometry._count++;
       var crsCount = layer.tileMatrixSets.length;
       var material = new _LayeredMaterial["default"](layer.materialOptions, crsCount);
+      (0, _ReferencingLayerProperties["default"])(material, layer);
       var tile = new _TileMesh["default"](result.geometry, material, layer, extent, level); // Commented because layer.threejsLayer is undefined;
       // Fix me: conflict with object3d added in view.scene;
       // tile.layers.set(layer.threejsLayer);
@@ -86,11 +88,14 @@ var _default = {
       setTileFromTiledLayer(tile, layer);
 
       if (parent) {
+        tile.geoidHeight = parent.geoidHeight;
+        var geoidHeight = (0, _GeoidLayer.geoidLayerIsVisible)(layer) ? tile.geoidHeight : 0;
         tile.setBBoxZ({
           min: parent.obb.z.min,
-          max: parent.obb.z.max
+          max: parent.obb.z.max,
+          geoidHeight: geoidHeight
         });
-        tile.geoidHeight = parent.geoidHeight;
+        tile.material.geoidHeight = geoidHeight;
       }
 
       return tile;