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

package/lib/Utils/gui/Scale.js

@@ -1,15 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _GlobeControls = require("../../Controls/GlobeControls");
-var _GlobeView = require("../../Core/Prefab/GlobeView");
-var _PlanarControls = require("../../Controls/PlanarControls");
-var _View = require("../../Core/View");
-var _Widget = _interopRequireDefault(require("./Widget"));
+import { CONTROL_EVENTS } from "../../Controls/GlobeControls.js";
+import { GLOBE_VIEW_EVENTS } from "../../Core/Prefab/GlobeView.js";
+import { PLANAR_CONTROL_EVENT } from "../../Controls/PlanarControls.js";
+import { VIEW_EVENTS } from "../../Core/View.js";
+import Widget from "./Widget.js";
 const DEFAULT_OPTIONS = {
   width: 200,
   height: 30,
@@ -30,7 +23,7 @@ const DEFAULT_OPTIONS = {
  * @property    {HTMLElement}   domElement      An html div containing the scale.
  * @property    {HTMLElement}   parentElement   The parent HTML container of `this.domElement`.
  */
-class Scale extends _Widget.default {
+class Scale extends Widget {
   /**
    * @param   {View}                  view                                    The iTowns view the scale should be
                                                                               * linked to. If it is a
@@ -74,17 +67,17 @@ class Scale extends _Widget.default {
     this.domElement.innerHTML = 'Scale';
     this.width = options.width || DEFAULT_OPTIONS.width;
     if (this.view.isGlobeView) {
-      this.view.addEventListener(_GlobeView.GLOBE_VIEW_EVENTS.GLOBE_INITIALIZED, () => {
+      this.view.addEventListener(GLOBE_VIEW_EVENTS.GLOBE_INITIALIZED, () => {
         this.update();
       });
-      this.view.controls.addEventListener(_GlobeControls.CONTROL_EVENTS.RANGE_CHANGED, () => {
+      this.view.controls.addEventListener(CONTROL_EVENTS.RANGE_CHANGED, () => {
         this.update();
       });
     } else if (this.view.isPlanarView) {
-      this.view.addEventListener(_View.VIEW_EVENTS.INITIALIZED, () => {
+      this.view.addEventListener(VIEW_EVENTS.INITIALIZED, () => {
         this.update();
       });
-      this.view.addEventListener(_PlanarControls.PLANAR_CONTROL_EVENT.MOVED, () => {
+      this.view.addEventListener(PLANAR_CONTROL_EVENT.MOVED, () => {
         this.update();
       });
     } else {
@@ -111,5 +104,4 @@ class Scale extends _Widget.default {
     this.domElement.style.width = `${pixelDistance}px`;
   }
 }
-var _default = Scale;
-exports.default = _default;
+export default Scale;

package/lib/Utils/gui/Searchbar.js

@@ -1,12 +1,5 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _Fetcher = _interopRequireDefault(require("../../Provider/Fetcher"));
-var _Widget = _interopRequireDefault(require("./Widget"));
+import Fetcher from "../../Provider/Fetcher.js";
+import Widget from "./Widget.js";
 const DEFAULT_OPTIONS = {
   width: 300,
   height: 38,
@@ -54,7 +47,7 @@ function eraseSuggestionList(form) {
  * @property    {HTMLElement}   domElement      An html div containing the searchbar.
  * @property    {HTMLElement}   parentElement   The parent HTML container of `this.domElement`.
  */
-class Searchbar extends _Widget.default {
+class Searchbar extends Widget {
   #_onSelected;
 
   /**
@@ -146,7 +139,7 @@ class Searchbar extends _Widget.default {
         return false;
       }
       geocodingOptions.url.searchParams.set('text', value);
-      _Fetcher.default.json(geocodingOptions.url).then(geocodingResult => {
+      Fetcher.json(geocodingOptions.url).then(geocodingResult => {
         const result = geocodingOptions.parser(geocodingResult);
         let i = 0;
         result.forEach((info, location) => {
@@ -239,5 +232,4 @@ class Searchbar extends _Widget.default {
     });
   }
 }
-var _default = Searchbar;
-exports.default = _default;
+export default Searchbar;

package/lib/Utils/gui/Widget.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 /**
  * An interface that stores common methods for all specific widgets.
  *
@@ -83,5 +77,4 @@ class Widget {
     this.domElement.style.display = 'none';
   }
 }
-var _default = Widget;
-exports.default = _default;
+export default Widget;

package/lib/Utils/placeObjectOnGround.js

@@ -1,32 +1,23 @@
-"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 _DEMUtils = _interopRequireDefault(require("./DEMUtils"));
-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 (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+import * as THREE from 'three';
+import DEMUtils from "./DEMUtils.js";
+import Coordinates from "../Core/Geographic/Coordinates.js";
 const temp = {
   v: new THREE.Vector3(),
-  coord1: new _Coordinates.default('EPSG:4978'),
-  coord2: new _Coordinates.default('EPSG:4978'),
+  coord1: new Coordinates('EPSG:4978'),
+  coord2: new Coordinates('EPSG:4978'),
   offset: new THREE.Vector2()
 };
 function _updateVector3(layer, method, nodes, vecCRS, vec, offset) {
   let matrices = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
   let coords = arguments.length > 7 ? arguments[7] : undefined;
   let cache = arguments.length > 8 ? arguments[8] : undefined;
-  const coord = coords || new _Coordinates.default(vecCRS);
+  const coord = coords || new Coordinates(vecCRS);
   if (matrices.worldFromLocal) {
     coord.setFromVector3(temp.v.copy(vec).applyMatrix4(matrices.worldFromLocal));
   } else {
     coord.setFromVector3(vec);
   }
-  const result = _DEMUtils.default.getTerrainObjectAt(layer, coord, method, nodes, cache);
+  const result = DEMUtils.getTerrainObjectAt(layer, coord, method, nodes, cache);
   if (result) {
     result.coord.z += offset;
     result.coord.as(vecCRS, temp.coord2).toVector3(vec);
@@ -83,7 +74,7 @@ function placeObjectOnGround(layer, crs, obj) {
       worldFromLocal: obj.parent ? obj.parent.matrixWorld : undefined,
       localFromWorld: obj.parent ? new THREE.Matrix4().copy(obj.parent.matrixWorld).invert() : undefined
     };
-    const result = _updateVector3(layer, options.method || _DEMUtils.default.FAST_READ_Z, tiles, crs, obj.position, options.offset || 0, matrices, undefined, options.cache ? options.cache[0] : undefined);
+    const result = _updateVector3(layer, options.method || DEMUtils.FAST_READ_Z, tiles, crs, obj.position, options.offset || 0, matrices, undefined, options.cache ? options.cache[0] : undefined);
     if (result) {
       if (options.cache) {
         options.cache[0] = result;
@@ -103,10 +94,10 @@ function placeObjectOnGround(layer, crs, obj) {
         options.cache.length = geometry.vertices.length;
       }
       let success = true;
-      const coord = new _Coordinates.default(crs);
+      const coord = new Coordinates(crs);
       for (let i = 0; i < geometry.vertices.length; i++) {
         const cached = options.cache ? options.cache[i] : undefined;
-        const result = _updateVector3(layer, options.method || _DEMUtils.default.FAST_READ_Z, tiles, crs, geometry.vertices[i], options.offset || 0, matrices, coord, cached);
+        const result = _updateVector3(layer, options.method || DEMUtils.FAST_READ_Z, tiles, crs, geometry.vertices[i], options.offset || 0, matrices, coord, cached);
         if (options.cache) {
           options.cache[i] = result;
         }
@@ -122,12 +113,12 @@ function placeObjectOnGround(layer, crs, obj) {
       }
       let success = true;
       const tmp = new THREE.Vector3();
-      const coord = new _Coordinates.default(crs);
+      const coord = new Coordinates(crs);
       for (let i = 0; i < geometry.attributes.position.count; i++) {
         const cached = options.cache ? options.cache[i] : undefined;
         tmp.fromBufferAttribute(geometry.attributes.position, i);
         const prev = tmp.z;
-        const result = _updateVector3(layer, options.method || _DEMUtils.default.FAST_READ_Z, tiles, crs, tmp, options.offset || 0, matrices, coord, cached);
+        const result = _updateVector3(layer, options.method || DEMUtils.FAST_READ_Z, tiles, crs, tmp, options.offset || 0, matrices, coord, cached);
         if (options.cache) {
           options.cache[i] = result;
         }
@@ -143,5 +134,4 @@ function placeObjectOnGround(layer, crs, obj) {
     }
   }
 }
-var _default = placeObjectOnGround;
-exports.default = _default;
+export default placeObjectOnGround;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "itowns",
-  "version": "2.42.1-next.2",
+  "version": "2.42.1-next.21",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
+  "type": "module",
   "main": "lib/Main.js",
   "exports": {
     ".": "./lib/Main.js",
@@ -15,9 +16,9 @@
     "test-dev": "npm run lint -- --max-warnings=0 && npm run build-dev && npm run test-with-coverage && npm run test-functional",
     "test-unit": "npm run base-test-unit test/unit",
     "test-functional": "mocha -t 100000 --require test/hooks_functional.js --recursive test/functional",
-    "test-with-coverage": "nyc -n src -r html cross-env npm run test-unit",
-    "test-with-coverage_lcov": "nyc -n src --reporter=lcov cross-env npm run test-unit",
-    "base-test-unit": "cross-env BABEL_DISABLE_CACHE=1 mocha --require @babel/register --file test/unit/bootstrap.js",
+    "test-with-coverage": "c8 -n src -r html cross-env npm run test-unit",
+    "test-with-coverage_lcov": "c8 -n src --reporter=lcov cross-env npm run test-unit",
+    "base-test-unit": "cross-env BABEL_DISABLE_CACHE=1 mocha --file test/unit/bootstrap.js --loader=babel-register-esm",
     "build": "cross-env NODE_ENV=production webpack",
     "build-dev": "cross-env NODE_ENV=development webpack",
     "transpile": "cross-env BABEL_DISABLE_CACHE=1 babel src --out-dir lib",
@@ -27,12 +28,12 @@
     "prepublishOnly": "npm run build && npm run transpile",
     "prepare": "cross-env NO_UPDATE_NOTIFIER=true node ./config/prepare.mjs && node ./config/replace.config.mjs",
     "watch": "cross-env BABEL_DISABLE_CACHE=1 babel --watch src --out-dir lib",
-    "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.js -i changelog.md -s",
+    "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.cjs -i changelog.md -s",
     "bump": "if [ -z $npm_config_level ]; then grunt bump:minor;  else grunt bump:$npm_config_level; fi && npm run changelog && npm install && git add -A && git commit --amend --no-edit",
     "publish-next": "npm version prerelease --preid next && npm publish --access public --tag=next --provenance",
     "publish-latest": "npm publish --access public --tag=latest --provenance"
   },
-  "nyc": {
+  "c8": {
     "exclude": [
       "**/*ThreeExtended",
       "**/*src/Utils/placeObjectOnGround.js",
@@ -60,7 +61,7 @@
     "@mapbox/vector-tile": "^1.3.1",
     "@tmcw/togeojson": "^5.8.1",
     "@tweenjs/tween.js": "^18.6.4",
-    "copc": "^0.0.5",
+    "copc": "^0.0.6",
     "earcut": "^2.2.4",
     "js-priority-queue": "^0.1.5",
     "pbf": "^3.2.1",
@@ -76,12 +77,16 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/register": "^7.22.5",
     "@types/three": "^0.159.0",
+    "@xmldom/xmldom": "^0.8.10",
     "babel-inline-import-loader": "^1.0.1",
     "babel-loader": "^9.1.3",
     "babel-plugin-inline-import": "^3.0.0",
     "babel-plugin-minify-dead-code-elimination": "^0.5.2",
     "babel-plugin-minify-replace": "^0.5.0",
+    "babel-plugin-module-extension-resolver": "^1.0.0",
     "babel-plugin-module-resolver": "^5.0.0",
+    "babel-register-esm": "^1.2.5",
+    "c8": "^9.1.0",
     "chalk": "^5.3.0",
     "chart.js": "^4.4.1",
     "compare-func": "^2.0.0",
@@ -102,11 +107,11 @@
     "marked": "^11.0.1",
     "mocha": "^10.2.0",
     "node-fetch": "^2.7.0",
-    "nyc": "^15.1.0",
     "proj4": "^2.9.2",
     "puppeteer": "^21.6.0",
     "q": "^1.5.1",
     "replace-in-file": "^7.0.2",
+    "sinon": "^17.0.1",
     "three": "^0.159.0",
     "typescript": "^5.3.3",
     "webpack": "^5.89.0",