itowns 2.37.0 → 2.38.2

package/lib/Core/View.js

@@ -23,6 +23,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 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 _Camera = _interopRequireDefault(require("../Renderer/Camera"));
@@ -65,6 +69,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"); } }
+
 var VIEW_EVENTS = {
   /**
    * Fires when all the layers of the view are considered initialized.
@@ -192,6 +200,12 @@ var viewers = []; // Size of the camera frustrum, in meters
 
 var screenMeters;
 
+var _layers = /*#__PURE__*/new WeakMap();
+
+var _pixelDepthBuffer = /*#__PURE__*/new WeakMap();
+
+var _fullSizeDepthBuffer = /*#__PURE__*/new WeakMap();
+
 var View = /*#__PURE__*/function (_THREE$EventDispatche) {
   (0, _inherits2["default"])(View, _THREE$EventDispatche);
 
@@ -228,6 +242,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
    * @param {?Scene} [options.scene3D] - [THREE.Scene](https://threejs.org/docs/#api/en/scenes/Scene) instance to use, otherwise a default one will be constructed
    * @param {?Color} options.diffuse - [THREE.Color](https://threejs.org/docs/?q=color#api/en/math/Color) Diffuse color terrain material.
    * This color is applied to terrain if there isn't color layer on terrain extent (by example on pole).
+   * @param {boolean} [options.enableFocusOnStart=true] - enable focus on dom element on start.
    *
    * @constructor
    */
@@ -242,6 +257,22 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
     }
 
     _this = _super.call(this);
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _layers, {
+      writable: true,
+      value: []
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _pixelDepthBuffer, {
+      writable: true,
+      value: new Uint8Array(4)
+    });
+
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _fullSizeDepthBuffer, {
+      writable: true,
+      value: void 0
+    });
+
     _this.domElement = viewerDiv;
     _this.referenceCrs = crs;
     var engine; // options.renderer can be 2 separate things:
@@ -263,7 +294,6 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
 
     _this.camera = new _Camera["default"](_this.referenceCrs, _this.mainLoop.gfxEngine.getWindowSize().x, _this.mainLoop.gfxEngine.getWindowSize().y, options.camera);
     _this._frameRequesters = {};
-    _this._layers = [];
     window.addEventListener('resize', function () {
       return _this.resize();
     }, false);
@@ -297,13 +327,14 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
 
     _this.addEventListener(VIEW_EVENTS.LAYERS_INITIALIZED, fn);
 
-    _this._fullSizeDepthBuffer = new Uint8Array(4 * _this.camera.width * _this.camera.height);
-    _this._pixelDepthBuffer = new Uint8Array(4); // Indicates that view's domElement can be focused (the negative value indicates that domElement can't be
+    (0, _classPrivateFieldSet2["default"])((0, _assertThisInitialized2["default"])(_this), _fullSizeDepthBuffer, new Uint8Array(4 * _this.camera.width * _this.camera.height)); // Indicates that view's domElement can be focused (the negative value indicates that domElement can't be
     // focused sequentially using tab key). Focus is needed to capture some key events.
 
     _this.domElement.tabIndex = -1; // Set focus on view's domElement.
 
-    _this.domElement.focus(); // Create a custom `dblclick-right` event that is triggered when double right-clicking
+    if (!options.disableFocusOnStart) {
+      _this.domElement.focus();
+    } // Create a custom `dblclick-right` event that is triggered when double right-clicking
 
 
     var rightClickTimeStamp;
@@ -469,7 +500,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
           return layer._reject(new Error('Cant add GeometryLayer: missing a preUpdate function'));
         }
 
-        this._layers.push(layer);
+        (0, _classPrivateFieldGet2["default"])(this, _layers).push(layer);
       }
 
       if (layer.object3d && !layer.object3d.parent && layer.object3d !== this.scene) {
@@ -514,7 +545,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
           throw new Error("Error to detach ".concat(layerId, " from ").concat(parentLayer.id));
         } else if (parentLayer == undefined) {
           // Remove layer from viewer
-          this._layers.splice(this._layers.findIndex(function (l) {
+          (0, _classPrivateFieldGet2["default"])(this, _layers).splice((0, _classPrivateFieldGet2["default"])(this, _layers).findIndex(function (l) {
             return l.id == layerId;
           }), 1);
         }
@@ -596,7 +627,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
         this._changeSources.add(changeSource);
 
         if (changeSource.isTileMesh || changeSource.isCamera) {
-          this._fullSizeDepthBuffer.needsUpdate = true;
+          (0, _classPrivateFieldGet2["default"])(this, _fullSizeDepthBuffer).needsUpdate = true;
         }
       }
 
@@ -627,7 +658,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
     value: function getLayers(filter) {
       var result = [];
 
-      var _iterator6 = _createForOfIteratorHelper(this._layers),
+      var _iterator6 = _createForOfIteratorHelper((0, _classPrivateFieldGet2["default"])(this, _layers)),
           _step6;
 
       try {
@@ -1355,15 +1386,15 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
       var buffer;
 
       if (viewPaused) {
-        if (this._fullSizeDepthBuffer.needsUpdate) {
-          this.readDepthBuffer(0, 0, dim.x, dim.y, this._fullSizeDepthBuffer);
-          this._fullSizeDepthBuffer.needsUpdate = false;
+        if ((0, _classPrivateFieldGet2["default"])(this, _fullSizeDepthBuffer).needsUpdate) {
+          this.readDepthBuffer(0, 0, dim.x, dim.y, (0, _classPrivateFieldGet2["default"])(this, _fullSizeDepthBuffer));
+          (0, _classPrivateFieldGet2["default"])(this, _fullSizeDepthBuffer).needsUpdate = false;
         }
 
         var id = ((dim.y - mouse.y - 1) * dim.x + mouse.x) * 4;
-        buffer = this._fullSizeDepthBuffer.slice(id, id + 4);
+        buffer = (0, _classPrivateFieldGet2["default"])(this, _fullSizeDepthBuffer).slice(id, id + 4);
       } else {
-        buffer = this.readDepthBuffer(mouse.x, mouse.y, 1, 1, this._pixelDepthBuffer);
+        buffer = this.readDepthBuffer(mouse.x, mouse.y, 1, 1, (0, _classPrivateFieldGet2["default"])(this, _pixelDepthBuffer));
       }
 
       screen.x = mouse.x / dim.x * 2 - 1;
@@ -1420,7 +1451,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
 
       if (mouse instanceof Event) {
         this.eventToViewCoords(mouse);
-      } else if (mouse.x !== undefined && mouse.y !== undefined) {
+      } else if (mouse && mouse.x !== undefined && mouse.y !== undefined) {
         _eventCoords.copy(mouse);
       } else {
         _eventCoords.set(this.mainLoop.gfxEngine.width / 2, this.mainLoop.gfxEngine.height / 2);
@@ -1452,7 +1483,7 @@ var View = /*#__PURE__*/function (_THREE$EventDispatche) {
         height = this.domElement.clientHeight;
       }
 
-      this._fullSizeDepthBuffer = new Uint8Array(4 * width * height);
+      (0, _classPrivateFieldSet2["default"])(this, _fullSizeDepthBuffer, new Uint8Array(4 * width * height));
       this.mainLoop.gfxEngine.onWindowResize(width, height);
       this.camera.resize(width, height);
       this.notifyChange(this.camera.camera3D);

package/lib/Layer/FeatureGeometryLayer.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -51,29 +51,56 @@ var FeatureGeometryLayer = /*#__PURE__*/function (_GeometryLayer) {
    * @param {string} id - The id of the layer, that should be unique. It is
    * not mandatory, but an error will be emitted if this layer is added a
    * {@link View} that already has a layer going by that id.
-   * @param {Object} [config] - Optional configuration, all elements in it
+   * @param {Object} [options] - Optional configuration, all elements in it
    * will be merged as is in the layer.
    * @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 {THREE.Object3D} [config.object3d=new THREE.Group()] root object3d layer.
+   * @param {THREE.Object3D} [options.object3d=new THREE.Group()] root object3d layer.
+   * @param {function} [options.onMeshCreated] this callback is called when the mesh is created. The callback parameters are the
+   * `mesh` and the `context`.
+   * @param {boolean} [options.accurate=TRUE] If `accurate` is `true`, data are re-projected with maximum geographical accuracy.
+   * With `true`, `proj4` is used to transform data source.
    *
+   * If `accurate` is `false`, re-projecting is faster but less accurate.
+   * With `false`, an affine transformation is used to transform data source.
+   * This method is an approximation. The error increases with the extent
+   * dimension of the object or queries.
+   *
+   * For example :
+   * * for a **100** meter dimension, there's a difference of **0.001** meter with the accurate method
+   * * for a **500** meter dimension, there's a difference of **0.05** meter with the accurate method
+   * * for a **20000** meter dimension, there's a difference of **40** meter with the accurate method
+   *
+   * **WARNING** If the source is `VectorTilesSource` then `accurate` is always false.
    */
   function FeatureGeometryLayer(id) {
+    var _options$accurate;
+
     var _this;
 
-    var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2["default"])(this, FeatureGeometryLayer);
-    config.update = _FeatureProcessing["default"].update;
-    config.convert = _Feature2Mesh["default"].convert({
-      batchId: config.batchId
+    options.update = _FeatureProcessing["default"].update;
+    options.convert = _Feature2Mesh["default"].convert({
+      batchId: options.batchId
     });
-    _this = _super.call(this, id, config.object3d || new _three.Group(), config);
+    _this = _super.call(this, id, options.object3d || new _three.Group(), options);
     _this.isFeatureGeometryLayer = true;
+    _this.accurate = (_options$accurate = options.accurate) !== null && _options$accurate !== void 0 ? _options$accurate : true;
+    _this.buildExtent = !_this.accurate;
     return _this;
   }
 
-  return (0, _createClass2["default"])(FeatureGeometryLayer);
+  (0, _createClass2["default"])(FeatureGeometryLayer, [{
+    key: "preUpdate",
+    value: function preUpdate(context, sources) {
+      if (sources.has(this.parent)) {
+        this.object3d.clear();
+      }
+    }
+  }]);
+  return FeatureGeometryLayer;
 }(_GeometryLayer2["default"]);
 
 var _default = FeatureGeometryLayer;

package/lib/Layer/GeoidLayer.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+exports.geoidLayerIsVisible = geoidLayerIsVisible;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -25,6 +26,13 @@ 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 geoidLayerIsVisible(tilelayer) {
+  var _tilelayer$attachedLa;
+
+  return tilelayer === null || tilelayer === void 0 ? void 0 : (_tilelayer$attachedLa = tilelayer.attachedLayers.filter(function (l) {
+    return l.isGeoidLayer;
+  })[0]) === null || _tilelayer$attachedLa === void 0 ? void 0 : _tilelayer$attachedLa.visible;
+}
 /**
  * `GeoidLayer` is a specific `{@link Layer}` which supports geoid height data. When added to a `{@link View}`, it
  * vertically translates each of the view's tiles by a proper geoid height value. For a given tile, the geoid height
@@ -40,6 +48,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  *     }),
  * });
  */
+
+
 var GeoidLayer = /*#__PURE__*/function (_Layer) {
   (0, _inherits2["default"])(GeoidLayer, _Layer);
 
@@ -75,10 +85,11 @@ var GeoidLayer = /*#__PURE__*/function (_Layer) {
 
   (0, _createClass2["default"])(GeoidLayer, [{
     key: "updateNodeZ",
-    value: function updateNodeZ(node, parent) {
-      node.position.z += (this.visible ? 1 : -1) * (node.geoidHeight - parent.geoidHeight);
-      node.updateMatrix();
-      node.updateMatrixWorld(true);
+    value: function updateNodeZ(node) {
+      node.material.geoidHeight = this.visible ? node.geoidHeight : 0;
+      node.obb.updateZ({
+        geoidHeight: node.material.geoidHeight
+      });
     }
   }, {
     key: "update",
@@ -101,7 +112,7 @@ var GeoidLayer = /*#__PURE__*/function (_Layer) {
         node.layerUpdateState[layer.id] = new _LayerUpdateState["default"]();
 
         var updateNodeZ = function () {
-          return _this2.updateNodeZ(node, parent);
+          return _this2.updateNodeZ(node);
         };
 
         layer.addEventListener('visible-property-changed', updateNodeZ);
@@ -118,7 +129,7 @@ var GeoidLayer = /*#__PURE__*/function (_Layer) {
       return this.getData(node.extent, extentsDestination).then(function (result) {
         node.geoidHeight = result.getHeightAtCoordinates(node.extent.center());
 
-        _this2.updateNodeZ(node, parent);
+        _this2.updateNodeZ(node);
 
         node.layerUpdateState[layer.id].noMoreUpdatePossible();
       });

package/lib/Layer/GeometryLayer.js

@@ -140,11 +140,13 @@ var GeometryLayer = /*#__PURE__*/function (_Layer) {
    * view.addLayer(geometry);
    */
   function GeometryLayer(id, object3d) {
+    var _config$cacheLifeTime;
+
     var _this;
 
     var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     (0, _classCallCheck2["default"])(this, GeometryLayer);
-    config.cacheLifeTime = config.cacheLifeTime == undefined ? _Cache.CACHE_POLICIES.GEOMETRY : config.cacheLifeTime;
+    config.cacheLifeTime = (_config$cacheLifeTime = config.cacheLifeTime) !== null && _config$cacheLifeTime !== void 0 ? _config$cacheLifeTime : _Cache.CACHE_POLICIES.GEOMETRY;
     _this = _super.call(this, id, config);
     _this.isGeometryLayer = true;
 
@@ -161,33 +163,8 @@ var GeometryLayer = /*#__PURE__*/function (_Layer) {
       writable: false,
       configurable: true
     });
-
-    _this.defineLayerProperty('opacity', 1.0, function () {
-      var root = _this.parent ? _this.parent.object3d : _this.object3d;
-      root.traverse(function (object) {
-        if (object.layer == (0, _assertThisInitialized2["default"])(_this)) {
-          _this.changeOpacity(object);
-        } else if (object.content && object.content.layer == (0, _assertThisInitialized2["default"])(_this)) {
-          object.content.traverse(_this.changeOpacity);
-        }
-      });
-    });
-
-    _this.defineLayerProperty('wireframe', false, function () {
-      var root = _this.parent ? _this.parent.object3d : _this.object3d;
-      root.traverse(function (object) {
-        if (object.layer == (0, _assertThisInitialized2["default"])(_this) && object.material) {
-          object.material.wireframe = _this.wireframe;
-        } else if (object.content && object.content.layer == (0, _assertThisInitialized2["default"])(_this)) {
-          object.content.traverse(function (o) {
-            if (o.material && o.layer == (0, _assertThisInitialized2["default"])(_this)) {
-              o.material.wireframe = _this.wireframe;
-            }
-          });
-        }
-      });
-    });
-
+    _this.opacity = 1.0;
+    _this.wireframe = false;
     _this.attachedLayers = [];
     _this.visible = config.visible == undefined ? true : config.visible;
     Object.defineProperty(_this.zoom, 'max', {
@@ -311,32 +288,7 @@ var GeometryLayer = /*#__PURE__*/function (_Layer) {
     value: function pickObjectsAt(view, coordinates) {
       var radius = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.options.defaultPickingRadius;
       var target = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-      var object3d = this.parent ? this.parent.object3d : this.object3d;
-      return _Picking["default"].pickObjectsAt(view, coordinates, radius, object3d, target, this.threejsLayer);
-    }
-    /**
-     * Change the opacity of an object, according to the value of the `opacity`
-     * property of this layer.
-     *
-     * @param {Object} object - The object to change the opacity from. It is
-     * usually a `THREE.Object3d` or an implementation of it.
-     */
-
-  }, {
-    key: "changeOpacity",
-    value: function changeOpacity(object) {
-      if (object.material) {
-        // != undefined: we want the test to pass if opacity is 0
-        if (object.material.opacity != undefined) {
-          object.material.transparent = this.opacity < 1.0;
-          object.material.opacity = this.opacity;
-        }
-
-        if (object.material.uniforms && object.material.uniforms.opacity != undefined) {
-          object.material.transparent = this.opacity < 1.0;
-          object.material.uniforms.opacity.value = this.opacity;
-        }
-      }
+      return _Picking["default"].pickObjectsAt(view, coordinates, radius, this.object3d, target, this.threejsLayer);
     }
   }]);
   return GeometryLayer;

package/lib/Layer/OrientedImageLayer.js

@@ -188,6 +188,7 @@ var OrientedImageLayer = /*#__PURE__*/function (_GeometryLayer) {
 
     _this.mergeFeatures = false;
     _this.filteringExtent = false;
+    _this.accurate = true;
     var options = {
       out: (0, _assertThisInitialized2["default"])(_this)
     }; // panos is an array of feature point, representing many panoramics.

package/lib/Layer/RasterLayer.js

@@ -41,8 +41,10 @@ var RasterLayer = /*#__PURE__*/function (_Layer) {
   var _super = _createSuper(RasterLayer);
 
   function RasterLayer(id, config) {
+    var _config$cacheLifeTime;
+
     (0, _classCallCheck2["default"])(this, RasterLayer);
-    config.cacheLifeTime = config.cacheLifeTime == undefined ? _Cache.CACHE_POLICIES.TEXTURE : config.cacheLifeTime;
+    config.cacheLifeTime = (_config$cacheLifeTime = config.cacheLifeTime) !== null && _config$cacheLifeTime !== void 0 ? _config$cacheLifeTime : _Cache.CACHE_POLICIES.TEXTURE;
     return _super.call(this, id, config);
   }
 

package/lib/Layer/ReferencingLayerProperties.js

@@ -0,0 +1,50 @@
+"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
+function ReferLayerProperties(material, layer) {
+  if (layer && layer.isGeometryLayer) {
+    var transparent = material.transparent;
+    material.layer = layer;
+
+    if (material.uniforms && material.uniforms.opacity != undefined) {
+      Object.defineProperty(material.uniforms.opacity, 'value', {
+        get: function get() {
+          return material.layer.opacity;
+        }
+      });
+    } else if (material.opacity != undefined) {
+      Object.defineProperty(material, 'opacity', {
+        get: function get() {
+          return material.layer.opacity;
+        }
+      });
+    }
+
+    Object.defineProperty(material, 'wireframe', {
+      get: function get() {
+        return material.layer.wireframe;
+      }
+    });
+    Object.defineProperty(material, 'transparent', {
+      get: function get() {
+        if (transparent != material.layer.opacity < 1.0) {
+          material.needsUpdate = true;
+          transparent = material.layer.opacity < 1.0;
+        }
+
+        return transparent;
+      }
+    });
+  }
+
+  return material;
+}
+
+var _default = ReferLayerProperties;
+exports["default"] = _default;

package/lib/Main.js

@@ -730,7 +730,7 @@ 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; }
 
 var conf = {
-  version: '2.37.0'
+  version: '2.38.2'
 };
 var REVISION = conf.version; // Geographic tools
 

package/lib/Parser/B3dmParser.js

@@ -29,6 +29,8 @@ var _Utf8Decoder = _interopRequireDefault(require("../Utils/Utf8Decoder"));
 
 var _C3DTBatchTable = _interopRequireDefault(require("../Core/3DTiles/C3DTBatchTable"));
 
+var _ReferencingLayerProperties = _interopRequireDefault(require("../Layer/ReferencingLayerProperties"));
+
 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 || _typeof3(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; }
@@ -258,8 +260,7 @@ var _default = {
                 console.warn('b3dm shader has been patched to add log depth buffer support');
               }
 
-              mesh.material.transparent = options.opacity < 1.0;
-              mesh.material.opacity = options.opacity;
+              (0, _ReferencingLayerProperties["default"])(mesh.material, options.layer);
             }
           });
           resolve(gltf);

package/lib/Parser/GeoJsonParser.js

@@ -26,16 +26,17 @@ function readCRS(json) {
     if (json.crs.type.toLowerCase() == 'epsg') {
       return "EPSG:".concat(json.crs.properties.code);
     } else if (json.crs.type.toLowerCase() == 'name') {
-      var epsgIdx = json.crs.properties.name.toLowerCase().indexOf('epsg:');
-
-      if (epsgIdx >= 0) {
-        // authority:version:code => EPSG:[...]:code
-        var codeStart = json.crs.properties.name.indexOf(':', epsgIdx + 5);
+      if (json.crs.properties.name.toLowerCase().includes('epsg:')) {
+        // OGC CRS URN: urn:ogc:def:crs:authority:version:code => EPSG:[...]:code
+        // legacy identifier: authority:code => EPSG:code
+        var codeStart = json.crs.properties.name.lastIndexOf(':');
 
         if (codeStart > 0) {
           return "EPSG:".concat(json.crs.properties.name.substr(codeStart + 1));
         }
       }
+
+      throw new Error("Unsupported CRS authority '".concat(json.crs.properties.name, "'"));
     }
 
     throw new Error("Unsupported CRS type '".concat(json.crs, "'"));
@@ -45,7 +46,9 @@ function readCRS(json) {
   return 'EPSG:4326';
 }
 
-var coord = new _Coordinates["default"]('EPSG:4978', 0, 0, 0); // filter with the first point
+var coord = new _Coordinates["default"]('EPSG:4978', 0, 0, 0);
+var last = new _Coordinates["default"]('EPSG:4978', 0, 0, 0);
+var first = new _Coordinates["default"]('EPSG:4978', 0, 0, 0); // filter with the first point
 
 var firstPtIsOut = function (extent, aCoords, crs) {
   coord.crs = crs;
@@ -76,6 +79,25 @@ var toFeature = {
 
     geometry.updateExtent();
   },
+  // compute clockwise polygon
+  populateGeometryWithCCW: function populateGeometryWithCCW(crsIn, coordinates, geometry, feature) {
+    geometry.startSubGeometry(coordinates.length, feature);
+    coord.crs = crsIn;
+    var sum = 0;
+    first.setFromValues(coordinates[0][0], coordinates[0][1], coordinates[0][2]);
+    last.copy(first);
+
+    for (var i = 0; i < coordinates.length; i++) {
+      coord.setFromValues(coordinates[i][0], coordinates[i][1], coordinates[i][2]);
+      sum += (last.x - coord.x) * (last.y + coord.y);
+      last.copy(coord);
+      geometry.pushCoordinates(coord, feature);
+    }
+
+    sum += (last.x - first.x) * (last.y + first.y);
+    geometry.getLastSubGeometry().ccw = sum < 0;
+    geometry.updateExtent();
+  },
   point: function point(feature, crsIn, coordsIn, collection, properties) {
     this["default"](feature, crsIn, [coordsIn], collection, properties);
   },
@@ -101,7 +123,7 @@ var toFeature = {
     geometry.properties.style = new _Style["default"]({}, feature.style).setFromGeojsonProperties(properties, feature.type); // Then read contour and holes
 
     for (var i = 0; i < coordsIn.length; i++) {
-      this.populateGeometry(crsIn, coordsIn[i], geometry, feature);
+      this.populateGeometryWithCCW(crsIn, coordsIn[i], geometry, feature);
     }
 
     feature.updateExtent(geometry);

package/lib/Parser/VectorTileParser.js

@@ -38,7 +38,8 @@ var firstPoint = new _three.Vector2(); // Classify option, it allows to classify
 function vtFeatureToFeatureGeometry(vtFeature, feature) {
   var classify = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var geometry = feature.bindNewGeometry();
-  classify = classify && feature.type === _Feature.FEATURE_TYPES.POLYGON;
+  var isPolygon = feature.type === _Feature.FEATURE_TYPES.POLYGON;
+  classify = classify && isPolygon;
   geometry.properties = vtFeature.properties;
   var pbf = vtFeature._pbf;
   pbf.pos = vtFeature._geometry;
@@ -85,7 +86,7 @@ function vtFeatureToFeatureGeometry(vtFeature, feature) {
       if (count == 1) {
         firstPoint.set(x, y);
         lastPoint.set(x, y);
-      } else if (classify && count > 1) {
+      } else if (isPolygon && count > 1) {
         sum += (lastPoint.x - x) * (lastPoint.y + y);
         lastPoint.set(x, y);
       }
@@ -94,7 +95,7 @@ function vtFeatureToFeatureGeometry(vtFeature, feature) {
         count++;
         geometry.pushCoordinatesValues(feature, firstPoint.x, firstPoint.y);
 
-        if (classify) {
+        if (isPolygon) {
           sum += (lastPoint.x - firstPoint.x) * (lastPoint.y + firstPoint.y);
         }
       }
@@ -161,7 +162,7 @@ function readPBF(file, options) {
           _step;
 
       try {
-        var _loop2 = function () {
+        var _loop2 = function _loop2() {
           var layer = _step.value;
 
           if (!feature) {

package/lib/Parser/deprecated/LegacyGLTFLoader.js

@@ -385,7 +385,7 @@ threeExamples.LegacyGLTFLoader = function () {
     5121: THREE.UnsignedByteType,
     32819: THREE.UnsignedShort4444Type,
     32820: THREE.UnsignedShort5551Type,
-    33635: THREE.UnsignedShort565Type
+    33635: THREE.UnsignedShort5551Type
   };
   var WEBGL_SIDES = {
     1028: THREE.BackSide,
@@ -1434,7 +1434,7 @@ threeExamples.LegacyGLTFLoader = function () {
 
 
                 if (skinEntry) {
-                  var getJointNode = function (jointId) {
+                  var getJointNode = function getJointNode(jointId) {
                     var keys = Object.keys(__nodes);
 
                     for (var i = 0, il = keys.length; i < il; i++) {
@@ -1470,7 +1470,7 @@ threeExamples.LegacyGLTFLoader = function () {
 
                   child.bind(new THREE.Skeleton(bones, boneInverses), skinEntry.bindShapeMatrix);
 
-                  var buildBoneGraph = function (parentJson, parentObject, property) {
+                  var buildBoneGraph = function buildBoneGraph(parentJson, parentObject, property) {
                     var children = parentJson[property];
                     if (children === undefined) return;
 

package/lib/Process/3dTilesProcessing.js

@@ -94,7 +94,7 @@ function _subdivideNodeAdditive(context, layer, node, cullingTest) {
       _step;
 
   try {
-    var _loop = function () {
+    var _loop = function _loop() {
       var child = _step.value;
 
       // child being downloaded => skip
@@ -157,7 +157,7 @@ function _subdivideNodeSubstractive(context, layer, node) {
       node.pendingSubdivision = true;
       var promises = [];
 
-      var _loop2 = function (i) {
+      var _loop2 = function _loop2(i) {
         promises.push(requestNewTile(context.view, context.scheduler, layer, childrenTiles[i], node, false).then(function (tile) {
           childrenTiles[i].loaded = true;
           node.add(tile);
@@ -416,7 +416,7 @@ function markForDeletion(layer, elt) {
 function process3dTilesNode() {
   var cullingTest = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : $3dTilesCulling;
   var subdivisionTest = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $3dTilesSubdivisionControl;
-  return function (context, layer, node) {
+  return function _process3dTilesNodes(context, layer, node) {
     // early exit if parent's subdivision is in progress
     if (node.parent.pendingSubdivision && !node.parent.additiveRefinement) {
       node.visible = false;