itowns 2.42.1-next.2 → 2.42.1-next.21

package/lib/Controls/StreetControls.js

@@ -1,16 +1,7 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _tween = _interopRequireDefault(require("@tweenjs/tween.js"));
-var THREE = _interopRequireWildcard(require("three"));
-var _MainLoop = require("../Core/MainLoop");
-var _FirstPersonControls = _interopRequireDefault(require("./FirstPersonControls"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+import TWEEN from '@tweenjs/tween.js';
+import * as THREE from 'three';
+import { MAIN_LOOP_EVENTS } from "../Core/MainLoop.js";
+import FirstPersonControls from "./FirstPersonControls.js";
 const material = new THREE.MeshBasicMaterial({
   color: 0xffffff,
   depthTest: false,
@@ -119,7 +110,7 @@ function computeTime(distance) {
  * @property {number} keySetCameraToCurrentPositionAndLookAtPrevious key code set camera to current position, default to 81 for key  Q
  * @extends FirstPersonControls
  */
-class StreetControls extends _FirstPersonControls.default {
+class StreetControls extends FirstPersonControls {
   /**
    * @constructor
    * @param { View } view - View where this control will be used
@@ -149,7 +140,7 @@ class StreetControls extends _FirstPersonControls.default {
     this.keySetCameraToCurrentPositionAndLookAtPrevious = 81;
 
     // Tween is used to make smooth animations
-    this.tweenGroup = new _tween.default.Group();
+    this.tweenGroup = new TWEEN.Group();
 
     // init surfaces used as helper for end user
     this.surfaceGround = options.surfaceGround || createCircle();
@@ -298,11 +289,11 @@ class StreetControls extends _FirstPersonControls.default {
     startQuaternion.copy(this.camera.quaternion);
     this.end.copy(this.camera);
     this.end.lookAt(position);
-    this.tween = new _tween.default.Tween({
+    this.tween = new TWEEN.Tween({
       t: 0
     }, this.tweenGroup).to({
       t: 1
-    }, time).easing(_tween.default.Easing.Quadratic.Out).onComplete(() => {
+    }, time).easing(TWEEN.Easing.Quadratic.Out).onComplete(() => {
       this.stopAnimations();
     }).onUpdate(d => {
       // 'manually' slerp the Quaternion to avoid rotation issues
@@ -314,7 +305,7 @@ class StreetControls extends _FirstPersonControls.default {
       this.reset();
       this.view.notifyChange(this.camera);
     };
-    this.view.addFrameRequester(_MainLoop.MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
+    this.view.addFrameRequester(MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
     this.view.notifyChange(this.camera);
   }
 
@@ -335,8 +326,8 @@ class StreetControls extends _FirstPersonControls.default {
       resolve = r;
     });
     this.stopAnimations();
-    this.tween = new _tween.default.Tween(this.camera.position, this.tweenGroup) // Create a new tween that modifies camera position
-    .to(position.clone(), time).easing(_tween.default.Easing.Quadratic.Out) // Use an easing function to make the animation smooth.
+    this.tween = new TWEEN.Tween(this.camera.position, this.tweenGroup) // Create a new tween that modifies camera position
+    .to(position.clone(), time).easing(TWEEN.Easing.Quadratic.Out) // Use an easing function to make the animation smooth.
     .onComplete(() => {
       this.stopAnimations();
       resolve();
@@ -345,7 +336,7 @@ class StreetControls extends _FirstPersonControls.default {
       this.tweenGroup.update();
       this.view.notifyChange(this.camera);
     };
-    this.view.addFrameRequester(_MainLoop.MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
+    this.view.addFrameRequester(MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
     this.view.notifyChange(this.camera);
     return promise;
   }
@@ -355,7 +346,7 @@ class StreetControls extends _FirstPersonControls.default {
       this.tween = undefined;
     }
     if (this.animationFrameRequester) {
-      this.view.removeFrameRequester(_MainLoop.MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
+      this.view.removeFrameRequester(MAIN_LOOP_EVENTS.BEFORE_RENDER, this.animationFrameRequester);
       this.animationFrameRequester = null;
     }
   }
@@ -396,5 +387,4 @@ class StreetControls extends _FirstPersonControls.default {
     super.dispose();
   }
 }
-var _default = StreetControls;
-exports.default = _default;
+export default StreetControls;

package/lib/Converter/Feature2Mesh.js

@@ -1,33 +1,24 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _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"));
-var _Style = _interopRequireWildcard(require("../Core/Style"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const coord = new _Coordinates.default('EPSG:4326', 0, 0, 0);
-const context = new _Style.StyleContext();
-const defaultStyle = new _Style.default();
+import * as THREE from 'three';
+import Earcut from 'earcut';
+import { FEATURE_TYPES } from "../Core/Feature.js";
+import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
+import { deprecatedFeature2MeshOptions } from "../Core/Deprecated/Undeprecator.js";
+import Extent from "../Core/Geographic/Extent.js";
+import Crs from "../Core/Geographic/Crs.js";
+import OrientationUtils from "../Utils/OrientationUtils.js";
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import Style, { StyleContext } from "../Core/Style.js";
+const coord = new Coordinates('EPSG:4326', 0, 0, 0);
+const context = new StyleContext();
+const defaultStyle = new Style();
 let style;
 const dim_ref = new THREE.Vector2();
 const dim = new THREE.Vector2();
 const normal = new THREE.Vector3();
-const base = new THREE.Vector3();
-const extrusion = new THREE.Vector3();
+const baseCoord = new THREE.Vector3();
+const topCoord = new THREE.Vector3();
 const inverseScale = new THREE.Vector3();
-const extent = new _Extent.default('EPSG:4326', 0, 0, 0, 0);
+const extent = new Extent('EPSG:4326', 0, 0, 0, 0);
 const _color = new THREE.Color();
 const maxValueUint8 = 2 ** 8 - 1;
 const maxValueUint16 = 2 ** 16 - 1;
@@ -44,13 +35,6 @@ class FeatureMesh extends THREE.Group {
     this.#collection = new THREE.Group().add(this.meshes);
     this.#collection.quaternion.copy(collection.quaternion);
     this.#collection.position.copy(collection.position);
-    if (collection.crs == 'EPSG:4978') {
-      normal.copy(collection.center.geodesicNormal);
-    } else {
-      normal.set(0, 0, 1);
-    }
-    normal.multiplyScalar(collection.center.z);
-    this.#collection.position.sub(normal);
     this.#collection.scale.copy(collection.scale);
     this.#collection.updateMatrix();
     this.#originalCrs = collection.crs;
@@ -70,7 +54,7 @@ class FeatureMesh extends THREE.Group {
       } else {
         // calculate the scale transformation to transform the feature.extent
         // to feature.extent.as(crs)
-        coord.crs = _Crs.default.formatToEPSG(this.#originalCrs);
+        coord.crs = Crs.formatToEPSG(this.#originalCrs);
         extent.copy(this.extent).applyMatrix4(this.#collection.matrix);
         extent.as(coord.crs, extent);
         extent.spatialEuclideanDimensions(dim_ref);
@@ -88,7 +72,7 @@ class FeatureMesh extends THREE.Group {
 
         // get method to calculate orientation
         const crsInput = this.#originalCrs == 'EPSG:3857' ? crsWGS84 : this.#originalCrs;
-        const crs2crs = _OrientationUtils.default.quaternionFromCRSToCRS(crsInput, crs);
+        const crs2crs = OrientationUtils.quaternionFromCRSToCRS(crsInput, crs);
         // calculate orientation to crs
         crs2crs(coord.as(crsWGS84), this.quaternion);
 
@@ -194,21 +178,27 @@ function featureToPoint(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, v).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, v));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, v);
       style.setContext(context);
       const {
         base_altitude,
         color,
         radius
       } = style.point;
-      coord.z = 0;
-      if (!pointMaterialSize.includes(radius)) {
-        pointMaterialSize.push(radius);
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
       }
 
-      // populate vertices
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, v);
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, v);
       toColor(color).multiplyScalar(255).toArray(colors, v);
+      if (!pointMaterialSize.includes(radius)) {
+        pointMaterialSize.push(radius);
+      }
       batchIds[j] = id;
     }
     featureId++;
@@ -233,7 +223,6 @@ function featureToLine(feature, options) {
   let featureId = 0;
   const vertices = new Float32Array(ptsIn.length);
   const geom = new THREE.BufferGeometry();
-  geom.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
   const lineMaterialWidth = [];
   context.setFeature(feature);
   const countIndices = (count - feature.geometries.length) * 2;
@@ -265,21 +254,27 @@ function featureToLine(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, v).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, v));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, v);
       style.setContext(context);
       const {
         base_altitude,
         color,
         width
       } = style.stroke;
-      coord.z = 0;
-      if (!lineMaterialWidth.includes(width)) {
-        lineMaterialWidth.push(width);
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
       }
 
-      // populate geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, v);
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, v);
       toColor(color).multiplyScalar(255).toArray(colors, v);
+      if (!lineMaterialWidth.includes(width)) {
+        lineMaterialWidth.push(width);
+      }
       batchIds[j] = id;
     }
     featureId++;
@@ -289,6 +284,7 @@ function featureToLine(feature, options) {
     // TODO CREATE material for each feature
     console.warn('Too many differents stroke.width, only the first one will be used');
   }
+  geom.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
   geom.setAttribute('color', new THREE.BufferAttribute(colors, 3, true));
   geom.setAttribute('batchId', new THREE.BufferAttribute(batchIds, 1));
   geom.setIndex(new THREE.BufferAttribute(indices, 1));
@@ -320,23 +316,29 @@ function featureToPolygon(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, i).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(feature.vertices, i));
+      const localCoord = context.setLocalCoordinatesFromArray(feature.vertices, i);
       style.setContext(context);
       const {
         base_altitude,
         color
       } = style.fill;
-      coord.z = 0;
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
+      }
 
-      // populate geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, i);
-      batchIds[b] = id;
+      // Calculate the new coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, i);
       toColor(color).multiplyScalar(255).toArray(colors, i);
+      batchIds[b] = id;
     }
     featureId++;
     const geomVertices = vertices.slice(start * 3, end * 3);
     const holesOffsets = geometry.indices.map(i => i.offset - start).slice(1);
-    const triangles = (0, _earcut.default)(geomVertices, holesOffsets, 3);
+    const triangles = Earcut(geomVertices, holesOffsets, 3);
     const startIndice = indices.length;
     indices.length += triangles.length;
     for (let i = 0; i < triangles.length; i++) {
@@ -386,21 +388,27 @@ function featureToExtrudedPolygon(feature, options) {
       if (feature.normals) {
         normal.fromArray(feature.normals, i).multiply(inverseScale);
       }
-      coord.copy(context.setLocalCoordinatesFromArray(ptsIn, i));
+      const localCoord = context.setLocalCoordinatesFromArray(ptsIn, i);
       style.setContext(context);
       const {
         base_altitude,
         extrusion_height,
         color
       } = style.fill;
-      coord.z = 0;
+      coord.copy(localCoord).applyMatrix4(context.collection.matrixWorld);
+      if (coord.crs == 'EPSG:4978') {
+        // altitude convertion from geocentered to elevation (from ground)
+        coord.as('EPSG:4326', coord);
+      }
 
-      // populate base geometry buffers
-      base.copy(normal).multiplyScalar(base_altitude).add(coord).toArray(vertices, i);
+      // Calculate the new base coordinates using the elevation shift (baseCoord)
+      baseCoord.copy(normal).multiplyScalar(base_altitude - coord.z).add(localCoord)
+      // and update the geometry buffer (vertices).
+      .toArray(vertices, i);
       batchIds[b] = id;
 
       // populate top geometry buffers
-      extrusion.copy(normal).multiplyScalar(extrusion_height).add(base).toArray(vertices, t);
+      topCoord.copy(normal).multiplyScalar(extrusion_height).add(baseCoord).toArray(vertices, t);
       batchIds[b + totalVertices] = id;
 
       // coloring base and top mesh
@@ -412,7 +420,7 @@ function featureToExtrudedPolygon(feature, options) {
     featureId++;
     const geomVertices = vertices.slice(startTop * 3, (end + totalVertices) * 3);
     const holesOffsets = geometry.indices.map(i => i.offset - start).slice(1);
-    const triangles = (0, _earcut.default)(geomVertices, holesOffsets, 3);
+    const triangles = Earcut(geomVertices, holesOffsets, 3);
     const startIndice = indices.length;
     indices.length += triangles.length;
     for (let i = 0; i < triangles.length; i++) {
@@ -494,7 +502,7 @@ function featureToMesh(feature, options) {
   }
   let mesh;
   switch (feature.type) {
-    case _Feature.FEATURE_TYPES.POINT:
+    case FEATURE_TYPES.POINT:
       if ((_style$point = style.point) !== null && _style$point !== void 0 && (_style$point$model = _style$point.model) !== null && _style$point$model !== void 0 && _style$point$model.object) {
         try {
           mesh = pointsToInstancedMeshes(feature);
@@ -506,10 +514,10 @@ function featureToMesh(feature, options) {
         mesh = featureToPoint(feature, options);
       }
       break;
-    case _Feature.FEATURE_TYPES.LINE:
+    case FEATURE_TYPES.LINE:
       mesh = featureToLine(feature, options);
       break;
-    case _Feature.FEATURE_TYPES.POLYGON:
+    case FEATURE_TYPES.POLYGON:
       if (style.fill && Object.keys(style.fill).includes('extrusion_height')) {
         mesh = featureToExtrudedPolygon(feature, options);
       } else {
@@ -529,7 +537,7 @@ function featureToMesh(feature, options) {
 /**
  * @module Feature2Mesh
  */
-var _default = {
+export default {
   /**
    * Return a function that converts [Features]{@link module:GeoJsonParser} to Meshes. Feature collection will be converted to a
    * a THREE.Group.
@@ -567,7 +575,7 @@ var _default = {
    */
   convert() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    (0, _Undeprecator.deprecatedFeature2MeshOptions)(options);
+    deprecatedFeature2MeshOptions(options);
     return function (collection) {
       if (!collection) {
         return;
@@ -575,16 +583,16 @@ var _default = {
       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.pointMaterial = ReferLayerProperties(new THREE.PointsMaterial(), this);
+        options.lineMaterial = ReferLayerProperties(new THREE.LineBasicMaterial(), this);
+        options.polygonMaterial = ReferLayerProperties(new THREE.MeshBasicMaterial(), this);
       }
 
       // In the case we didn't instanciate the layer (this) before the convert, we can pass
       // style properties (@link StyleOptions) using options.style.
       // This is usually done in some tests and if you want to use Feature2Mesh.convert()
       // as in examples/source_file_gpx_3d.html.
-      style = (this === null || this === void 0 ? void 0 : this.style) || (options.style ? new _Style.default(options.style) : defaultStyle);
+      style = (this === null || this === void 0 ? void 0 : this.style) || (options.style ? new Style(options.style) : defaultStyle);
       context.setCollection(collection);
       const features = collection.features;
       if (!features || features.length == 0) {
@@ -599,5 +607,4 @@ var _default = {
       return featureNode;
     };
   }
-};
-exports.default = _default;
+};

package/lib/Converter/Feature2Texture.js

@@ -1,19 +1,10 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Feature = require("../Core/Feature");
-var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
-var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
-var _Style = _interopRequireWildcard(require("../Core/Style"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const defaultStyle = new _Style.default();
-const context = new _Style.StyleContext();
+import * as THREE from 'three';
+import { FEATURE_TYPES } from "../Core/Feature.js";
+import Extent from "../Core/Geographic/Extent.js";
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import Style, { StyleContext } from "../Core/Style.js";
+const defaultStyle = new Style();
+const context = new StyleContext();
 let style;
 
 /**
@@ -45,7 +36,7 @@ function drawPolygon(ctx, vertices) {
   // build contour
   const path = new Path2D();
   for (const indice of indices) {
-    if (indice.extent && _Extent.default.intersectsExtent(indice.extent, extent)) {
+    if (indice.extent && Extent.intersectsExtent(indice.extent, extent)) {
       const offset = indice.offset * size;
       const count = offset + indice.count * size;
       path.moveTo(vertices[offset], vertices[offset + 1]);
@@ -73,14 +64,14 @@ function drawPoint(ctx, x, y, invCtxScale) {
     ctx.stroke();
   }
 }
-const coord = new _Coordinates.default('EPSG:4326', 0, 0, 0);
+const coord = new Coordinates('EPSG:4326', 0, 0, 0);
 function drawFeature(ctx, feature, extent, invCtxScale) {
   const extentDim = extent.planarDimensions();
   const scaleRadius = extentDim.x / ctx.canvas.width;
   for (const geometry of feature.geometries) {
-    if (_Extent.default.intersectsExtent(geometry.extent, extent)) {
+    if (Extent.intersectsExtent(geometry.extent, extent)) {
       context.setGeometry(geometry);
-      if (feature.type === _Feature.FEATURE_TYPES.POINT && style.point) {
+      if (feature.type === FEATURE_TYPES.POINT && style.point) {
         // cross multiplication to know in the extent system the real size of
         // the point
         const px = (Math.round(style.point.radius * invCtxScale) || 3 * invCtxScale) * scaleRadius;
@@ -95,7 +86,7 @@ function drawFeature(ctx, feature, extent, invCtxScale) {
           }
         }
       } else {
-        drawPolygon(ctx, feature.vertices, geometry.indices, feature.size, extent, invCtxScale, feature.type == _Feature.FEATURE_TYPES.POLYGON);
+        drawPolygon(ctx, feature.vertices, geometry.indices, feature.size, extent, invCtxScale, feature.type == FEATURE_TYPES.POLYGON);
       }
     }
   }
@@ -107,8 +98,8 @@ const quaternion = new THREE.Quaternion();
 const world2texture = new THREE.Matrix4();
 const feature2texture = new THREE.Matrix4();
 const worldTextureOrigin = new THREE.Vector3();
-const featureExtent = new _Extent.default('EPSG:4326', 0, 0, 0, 0);
-var _default = {
+const featureExtent = new Extent('EPSG:4326', 0, 0, 0, 0);
+export default {
   // backgroundColor is a THREE.Color to specify a color to fill the texture
   // with, given there is no feature passed in parameter
   createTextureFromFeature(collection, extent, sizeTexture, layerStyle, backgroundColor) {
@@ -176,5 +167,4 @@ var _default = {
     }
     return texture;
   }
-};
-exports.default = _default;
+};

package/lib/Converter/convertToTile.js

@@ -1,24 +1,14 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _TileMesh = _interopRequireDefault(require("../Core/TileMesh"));
-var _LayeredMaterial = _interopRequireDefault(require("../Renderer/LayeredMaterial"));
-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 (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; }
 /*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-
+import * as THREE from 'three';
+import TileMesh from "../Core/TileMesh.js";
+import LayeredMaterial from "../Renderer/LayeredMaterial.js";
+import newTileGeometry from "../Core/Prefab/TileBuilder.js";
+import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
+import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
 const dimensions = new THREE.Vector2();
 function setTileFromTiledLayer(tile, tileLayer) {
   if (tileLayer.diffuse) {
@@ -38,7 +28,7 @@ function setTileFromTiledLayer(tile, tileLayer) {
     tile.horizonCullingPointElevationScaled = tile.horizonCullingPoint.clone();
   }
 }
-var _default = {
+export default {
   convert(requester, extent, layer) {
     const builder = layer.builder;
     const parent = requester;
@@ -46,16 +36,17 @@ var _default = {
     const paramsGeometry = {
       extent,
       level,
-      segment: layer.segments || 16,
-      disableSkirt: layer.disableSkirt
+      segments: layer.segments || 16,
+      disableSkirt: layer.disableSkirt,
+      hideSkirt: layer.hideSkirt
     };
-    return (0, _TileBuilder.default)(builder, paramsGeometry).then(result => {
+    return newTileGeometry(builder, paramsGeometry).then(result => {
       // build tile mesh
       result.geometry._count++;
       const crsCount = layer.tileMatrixSets.length;
-      const material = new _LayeredMaterial.default(layer.materialOptions, crsCount);
-      (0, _ReferencingLayerProperties.default)(material, layer);
-      const tile = new _TileMesh.default(result.geometry, material, layer, extent, level);
+      const material = new LayeredMaterial(layer.materialOptions, crsCount);
+      ReferLayerProperties(material, layer);
+      const tile = new TileMesh(result.geometry, material, layer, extent, level);
       if (parent && parent.isTileMesh) {
         // get parent extent transformation
         const pTrans = builder.computeSharableExtent(parent.extent);
@@ -70,7 +61,7 @@ var _default = {
       setTileFromTiledLayer(tile, layer);
       if (parent) {
         tile.geoidHeight = parent.geoidHeight;
-        const geoidHeight = (0, _GeoidLayer.geoidLayerIsVisible)(layer) ? tile.geoidHeight : 0;
+        const geoidHeight = geoidLayerIsVisible(layer) ? tile.geoidHeight : 0;
         tile.setBBoxZ({
           min: parent.obb.z.min,
           max: parent.obb.z.max,
@@ -81,5 +72,4 @@ var _default = {
       return tile;
     });
   }
-};
-exports.default = _default;
+};

package/lib/Converter/textureConverter.js

@@ -1,17 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _Feature2Texture = _interopRequireDefault(require("./Feature2Texture"));
-var _Extent = _interopRequireDefault(require("../Core/Geographic/Extent"));
-var _Crs = _interopRequireDefault(require("../Core/Geographic/Crs"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const extentTexture = new _Extent.default('EPSG:4326', [0, 0, 0, 0]);
+import * as THREE from 'three';
+import Feature2Texture from "./Feature2Texture.js";
+import Extent from "../Core/Geographic/Extent.js";
+import CRS from "../Core/Geographic/Crs.js";
+const extentTexture = new Extent('EPSG:4326', [0, 0, 0, 0]);
 const textureLayer = (texture, layer) => {
   texture.generateMipmaps = false;
   texture.magFilter = layer.magFilter || THREE.LinearFilter;
@@ -23,14 +14,14 @@ function textureColorLayer(texture, layer) {
   texture.premultiplyAlpha = layer.transparent;
   return textureLayer(texture, layer);
 }
-var _default = {
+export default {
   convert(data, extentDestination, layer) {
     let texture;
     if (data.isFeatureCollection) {
       const backgroundLayer = layer.source.backgroundLayer;
       const backgroundColor = backgroundLayer && backgroundLayer.paint ? new THREE.Color(backgroundLayer.paint['background-color']) : undefined;
-      extentDestination.as(_Crs.default.formatToEPSG(layer.crs), extentTexture);
-      texture = _Feature2Texture.default.createTextureFromFeature(data, extentTexture, 256, layer.style, backgroundColor);
+      extentDestination.as(CRS.formatToEPSG(layer.crs), extentTexture);
+      texture = Feature2Texture.createTextureFromFeature(data, extentTexture, 256, layer.style, backgroundColor);
       texture.features = data;
       texture.extent = extentDestination;
     } else if (data.isTexture) {
@@ -50,5 +41,4 @@ var _default = {
       return textureLayer(texture, layer);
     }
   }
-};
-exports.default = _default;
+};