itowns 2.44.3-next.3 → 2.44.3-next.31

package/lib/Controls/GlobeControls.js

@@ -149,7 +149,7 @@ let previous;
  * @param      {object}  [options] An object with one or more configuration properties. Any property of GlobeControls
  * can be passed in this object.
  * @property      {number}  zoomFactor The factor the scale is multiplied by when dollying (zooming) in or
- * divided by when dollying out. Default is 2.
+ * divided by when dollying out. Default is 1.1.
  * @property      {number}  rotateSpeed Speed camera rotation in orbit and panoramic mode. Default is 0.25.
  * @property      {number}  minDistance Minimum distance between ground and camera in meters (Perspective Camera only).
  * Default is 250.
@@ -199,7 +199,7 @@ class GlobeControls extends THREE.EventDispatcher {
       console.warn('Controls zoomSpeed parameter is deprecated. Use zoomFactor instead.');
       options.zoomFactor = options.zoomFactor || options.zoomSpeed;
     }
-    this.zoomFactor = options.zoomFactor || 1.25;
+    this.zoomFactor = options.zoomFactor || 1.1;
 
     // Limits to how far you can dolly in and out ( PerspectiveCamera only )
     this.minDistance = options.minDistance || 250;
@@ -293,10 +293,10 @@ class GlobeControls extends THREE.EventDispatcher {
     this.lookAtCoordinate(placement, false);
     coordCameraTarget.crs = this.view.referenceCrs;
   }
-  get dollyInScale() {
+  get zoomInScale() {
     return this.zoomFactor;
   }
-  get dollyOutScale() {
+  get zoomOutScale() {
     return 1 / this.zoomFactor;
   }
   get isPaused() {
@@ -355,11 +355,13 @@ class GlobeControls extends THREE.EventDispatcher {
       this.panUp(deltaY * (this.camera.top - this.camera.bottom) / gfx.height);
     }
   }
+
+  // For Mobile
   dolly(delta) {
     if (delta === 0) {
       return;
     }
-    dollyScale = delta > 0 ? this.dollyInScale : this.dollyOutScale;
+    dollyScale = delta > 0 ? this.zoomInScale : this.zoomOutScale;
     if (this.camera.isPerspectiveCamera) {
       orbitScale /= dollyScale;
     } else if (this.camera.isOrthographicCamera) {
@@ -556,6 +558,7 @@ class GlobeControls extends THREE.EventDispatcher {
 
     // Initialize dolly movement.
     dollyStart.copy(event.viewCoords);
+    this.view.getPickingPositionFromDepth(event.viewCoords, pickedPosition); // mouse position
 
     // Initialize pan movement.
     panStart.copy(event.viewCoords);
@@ -587,9 +590,11 @@ class GlobeControls extends THREE.EventDispatcher {
   handleDolly(event) {
     dollyEnd.copy(event.viewCoords);
     dollyDelta.subVectors(dollyEnd, dollyStart);
-    this.dolly(-dollyDelta.y);
     dollyStart.copy(dollyEnd);
-    this.update();
+    event.delta = dollyDelta.y;
+    if (event.delta != 0) {
+      this.handleZoom(event);
+    }
   }
   handlePan(event) {
     if (event.viewCoords) {
@@ -705,7 +710,7 @@ class GlobeControls extends THREE.EventDispatcher {
     const range = this.getRange(point);
     if (point && range > this.minDistance) {
       return this.lookAtCoordinate({
-        coord: new Coordinates('EPSG:4978', point),
+        coord: new Coordinates('EPSG:4978').setFromVector3(point),
         range: range * (event.direction === 'out' ? 1 / 0.6 : 0.6),
         time: 1500
       });
@@ -714,21 +719,33 @@ class GlobeControls extends THREE.EventDispatcher {
   handleZoom(event) {
     this.player.stop();
     CameraUtils.stop(this.view, this.camera);
-    this.updateTarget();
-    const delta = -event.delta;
-    this.dolly(delta);
-    const previousRange = this.getRange(pickedPosition);
-    this.update();
-    const newRange = this.getRange(pickedPosition);
-    if (Math.abs(newRange - previousRange) / previousRange > 0.001) {
-      this.dispatchEvent({
-        type: CONTROL_EVENTS.RANGE_CHANGED,
-        previous: previousRange,
-        new: newRange
-      });
+    const zoomScale = event.delta > 0 ? this.zoomInScale : this.zoomOutScale;
+    let point = event.type === 'dolly' ? pickedPosition : this.view.getPickingPositionFromDepth(event.viewCoords); // get cursor position
+    let range = this.getRange();
+    range *= zoomScale;
+    if (point && range > this.minDistance && range < this.maxDistance) {
+      // check if the zoom is in the allowed interval
+      const camPos = xyz.setFromVector3(cameraTarget.position).as('EPSG:4326', c).toVector3();
+      point = xyz.setFromVector3(point).as('EPSG:4326', c).toVector3();
+      if (camPos.x * point.x < 0) {
+        // Correct rotation at 180th meridian by using 0 <= longitude <=360 for interpolation purpose
+        if (camPos.x - point.x > 180) {
+          point.x += 360;
+        } else if (point.x - camPos.x > 180) {
+          camPos.x += 360;
+        }
+      }
+      point.lerp(
+      // point interpol between mouse cursor and cam pos
+      camPos, zoomScale // interpol factor
+      );
+      point = c.setFromVector3(point).as('EPSG:4978', xyz);
+      return this.lookAtCoordinate({
+        // update view to the interpolate point
+        coord: point,
+        range
+      }, false);
     }
-    this.dispatchEvent(this.startEvent);
-    this.dispatchEvent(this.endEvent);
   }
   onTouchStart(event) {
     // CameraUtils.stop(view);
@@ -961,7 +978,7 @@ class GlobeControls extends THREE.EventDispatcher {
    */
 
   getCameraCoordinate() {
-    return new Coordinates('EPSG:4978', this.camera.position).as('EPSG:4326');
+    return new Coordinates('EPSG:4978').setFromVector3(this.camera.position).as('EPSG:4326');
   }
 
   /**
@@ -1018,7 +1035,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use View#getScale instead.
    */
-  getScale(pitch) /* istanbul ignore next */{
+  getScale(pitch) {
     console.warn('Deprecated, use View#getScale instead.');
     return this.view.getScale(pitch);
   }
@@ -1031,7 +1048,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use `View#getPixelsToMeters` instead.
    */
-  pixelsToMeters(pixels) /* istanbul ignore next */{
+  pixelsToMeters(pixels) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated use View#getPixelsToMeters instead.');
     const scaled = this.getScale(pixelPitch);
@@ -1047,7 +1064,7 @@ class GlobeControls extends THREE.EventDispatcher {
    * @deprecated Use `View#getPixelsToMeters` and `GlobeControls#metersToDegrees`
    * instead.
    */
-  pixelsToDegrees(pixels) /* istanbul ignore next */{
+  pixelsToDegrees(pixels) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated, use View#getPixelsToMeters and GlobeControls#getMetersToDegrees instead.');
     const chord = this.pixelsToMeters(pixels, pixelPitch);
@@ -1062,7 +1079,7 @@ class GlobeControls extends THREE.EventDispatcher {
    *
    * @deprecated Use `View#getMetersToPixels` instead.
    */
-  metersToPixels(value) /* istanbul ignore next */{
+  metersToPixels(value) {
     let pixelPitch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.28;
     console.warn('Deprecated, use View#getMetersToPixels instead.');
     const scaled = this.getScale(pixelPitch);
@@ -1156,7 +1173,7 @@ class GlobeControls extends THREE.EventDispatcher {
     if (!pickedPosition) {
       return;
     }
-    return new Coordinates('EPSG:4978', pickedPosition).as('EPSG:4326');
+    return new Coordinates('EPSG:4978').setFromVector3(pickedPosition).as('EPSG:4326');
   }
 }
 export default GlobeControls;

package/lib/Controls/StateControl.js

@@ -257,7 +257,7 @@ class StateControl extends THREE.EventDispatcher {
   touchToState(finger) {
     for (const key of Object.keys(DEFAULT_STATES)) {
       const state = this[key];
-      if (state.enable && finger == state.finger) {
+      if (state.enable && finger === state.finger) {
         return state;
       }
     }
@@ -376,9 +376,12 @@ class StateControl extends THREE.EventDispatcher {
   onMouseWheel(event) {
     event.preventDefault();
     if (this.enabled && this.ZOOM.enable) {
+      viewCoords.copy(this._view.eventToViewCoords(event));
+      this.currentState = this.ZOOM;
       this.dispatchEvent({
         type: this.ZOOM._event,
-        delta: event.deltaY
+        delta: event.deltaY,
+        viewCoords
       });
     }
   }

package/lib/Converter/Feature2Mesh.js

@@ -4,7 +4,6 @@ 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";
@@ -54,9 +53,16 @@ class FeatureMesh extends THREE.Group {
       } else {
         // calculate the scale transformation to transform the feature.extent
         // to feature.extent.as(crs)
-        coord.crs = Crs.formatToEPSG(this.#originalCrs);
-        extent.copy(this.extent).applyMatrix4(this.#collection.matrix);
-        extent.as(coord.crs, extent);
+        coord.crs = this.#originalCrs;
+        // TODO: An extent here could be either a geographic extent (for
+        // features from WFS) or a tiled extent (for features from MVT).
+        // Unify both behavior.
+        if (this.extent.isExtent) {
+          extent.copy(this.extent).applyMatrix4(this.#collection.matrix);
+          extent.as(coord.crs, extent);
+        } else {
+          this.extent.toExtent(coord.crs, extent);
+        }
         extent.spatialEuclideanDimensions(dim_ref);
         extent.planarDimensions(dim);
         if (dim.x && dim.y) {

package/lib/Converter/Feature2Texture.js

@@ -71,6 +71,9 @@ function drawFeature(ctx, feature, extent, invCtxScale) {
   for (const geometry of feature.geometries) {
     if (Extent.intersectsExtent(geometry.extent, extent)) {
       context.setGeometry(geometry);
+      if (style.zoom.min > style.context.zoom || style.zoom.max <= style.context.zoom) {
+        return;
+      }
       if (feature.type === FEATURE_TYPES.POINT && style.point) {
         // cross multiplication to know in the extent system the real size of
         // the point
@@ -114,7 +117,9 @@ export default {
       coord.crs = extent.crs;
       c.width = sizeTexture;
       c.height = sizeTexture;
-      const ctx = c.getContext('2d');
+      const ctx = c.getContext('2d', {
+        willReadFrequently: true
+      });
       if (backgroundColor) {
         ctx.fillStyle = backgroundColor.getStyle();
         ctx.fillRect(0, 0, sizeTexture, sizeTexture);

package/lib/Converter/convertToTile.js

@@ -1,12 +1,7 @@
-/*
- * 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 { newTileGeometry } from "../Core/Prefab/TileBuilder.js";
 import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
 import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
 const dimensions = new THREE.Vector2();
@@ -42,14 +37,14 @@ export default {
     };
     return newTileGeometry(builder, paramsGeometry).then(result => {
       // build tile mesh
-      result.geometry._count++;
+      result.geometry.increaseRefCount();
       const crsCount = layer.tileMatrixSets.length;
       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);
+        const pTrans = builder.computeShareableExtent(parent.extent);
         // place relative to his parent
         result.position.sub(pTrans.position).applyQuaternion(pTrans.quaternion.invert());
         result.quaternion.premultiply(pTrans.quaternion);

package/lib/Converter/textureConverter.js

@@ -1,7 +1,6 @@
 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;
@@ -15,15 +14,15 @@ function textureColorLayer(texture, layer) {
   return textureLayer(texture, layer);
 }
 export default {
-  convert(data, extentDestination, layer) {
+  convert(data, destinationTile, 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.formatToEPSG(layer.crs), extentTexture);
+      destinationTile.toExtent(layer.crs, extentTexture);
       texture = Feature2Texture.createTextureFromFeature(data, extentTexture, layer.subdivisionThreshold, layer.style, backgroundColor);
       texture.features = data;
-      texture.extent = extentDestination;
+      texture.extent = destinationTile;
     } else if (data.isTexture) {
       texture = data;
     } else {

package/lib/Core/Deprecated/Undeprecator.js

@@ -13,7 +13,6 @@ export const deprecatedColorLayerOptions = options => {
   return options;
 };
 export const deprecatedParsingOptionsToNewOne = options => {
-  /* istanbul ignore next */
   if (options.crsOut || options.crsIn) {
     console.warn('Parsing options with crsIn and crsOut are deprecated, use { in, out } structure.');
     const newOptions = {

package/lib/Core/Feature.js

@@ -1,7 +1,6 @@
 import * as THREE from 'three';
 import Extent from "./Geographic/Extent.js";
 import Coordinates from "./Geographic/Coordinates.js";
-import CRS from "./Geographic/Crs.js";
 import Style from "./Style.js";
 function defaultExtent(crs) {
   return new Extent(crs, Infinity, -Infinity, Infinity, -Infinity);
@@ -340,7 +339,7 @@ export class FeatureCollection extends THREE.Object3D {
   constructor(options) {
     super();
     this.isFeatureCollection = true;
-    this.crs = CRS.formatToEPSG(options.accurate || !options.source?.crs ? options.crs : options.source.crs);
+    this.crs = options.accurate || !options.source?.crs ? options.crs : options.source.crs;
     this.features = [];
     this.mergeFeatures = options.mergeFeatures === undefined ? true : options.mergeFeatures;
     this.size = options.structure == '3d' ? 3 : 2;