itowns 2.43.2-next.1 → 2.43.2-next.11

package/lib/Layer/Layer.js

@@ -66,6 +66,7 @@ class Layer extends THREE.EventDispatcher {
    * @param {boolean} [config.addLabelLayer.performance=false] - In case label layer adding, so remove labels that have no chance of being visible.
    * Indeed, even in the best case, labels will never be displayed. By example, if there's many labels.
    * @param {boolean} [config.addLabelLayer.forceClampToTerrain=false] - use elevation layer to clamp label on terrain.
+   * @param {number} [config.subdivisionThreshold=256] - set the texture size and, if applied to the globe, affects the tile subdivision.
    *
    * @example
    * // Add and create a new Layer
@@ -100,8 +101,7 @@ class Layer extends THREE.EventDispatcher {
     super();
     this.isLayer = true;
     if (config.style && !(config.style instanceof Style)) {
-      var _config$style$fill;
-      if (typeof ((_config$style$fill = config.style.fill) === null || _config$style$fill === void 0 ? void 0 : _config$style$fill.pattern) === 'string') {
+      if (typeof config.style.fill?.pattern === 'string') {
         console.warn('Using style.fill.pattern = { source: Img|url } is adviced');
         config.style.fill.pattern = {
           source: config.style.fill.pattern
@@ -110,6 +110,8 @@ class Layer extends THREE.EventDispatcher {
       config.style = new Style(config.style);
     }
     this.style = config.style || new Style();
+    this.subdivisionThreshold = config.subdivisionThreshold || 256;
+    this.sizeDiagonalTexture = (2 * (this.subdivisionThreshold * this.subdivisionThreshold)) ** 0.5;
     Object.assign(this, config);
     Object.defineProperty(this, 'id', {
       value: id,

package/lib/Layer/PointCloudLayer.js

@@ -73,16 +73,13 @@ function markForDeletion(elt) {
   }
 }
 function changeIntensityRange(layer) {
-  var _layer$material$inten;
-  (_layer$material$inten = layer.material.intensityRange) === null || _layer$material$inten === void 0 ? void 0 : _layer$material$inten.set(layer.minIntensityRange, layer.maxIntensityRange);
+  layer.material.intensityRange?.set(layer.minIntensityRange, layer.maxIntensityRange);
 }
 function changeElevationRange(layer) {
-  var _layer$material$eleva;
-  (_layer$material$eleva = layer.material.elevationRange) === null || _layer$material$eleva === void 0 ? void 0 : _layer$material$eleva.set(layer.minElevationRange, layer.maxElevationRange);
+  layer.material.elevationRange?.set(layer.minElevationRange, layer.maxElevationRange);
 }
 function changeAngleRange(layer) {
-  var _layer$material$angle;
-  (_layer$material$angle = layer.material.angleRange) === null || _layer$material$angle === void 0 ? void 0 : _layer$material$angle.set(layer.minAngleRange, layer.maxAngleRange);
+  layer.material.angleRange?.set(layer.minAngleRange, layer.maxAngleRange);
 }
 
 /**
@@ -176,7 +173,7 @@ class PointCloudLayer extends GeometryLayer {
     if (this.material) {
       this.material.visible = this.visible;
       this.material.opacity = this.opacity;
-      this.material.transparent = this.opacity < 1;
+      this.material.transparent = this.opacity < 1 || this.material.userData.needTransparency[this.material.mode];
       this.material.size = this.pointSize;
       this.material.scale = context.camera.preSSE;
       if (this.material.updateUniforms) {

package/lib/Layer/ReferencingLayerProperties.js

@@ -1,6 +1,5 @@
 // next step is move these properties to Style class
 // and hide transparent mechanism
-
 function ReferLayerProperties(material, layer) {
   if (layer && layer.isGeometryLayer) {
     let transparent = material.transparent;
@@ -44,9 +43,10 @@ function ReferLayerProperties(material, layer) {
     });
     Object.defineProperty(material, 'transparent', {
       get: () => {
-        if (transparent != material.layer.opacity < 1.0) {
+        const needTransparency = material.userData.needTransparency?.[material.mode] || material.layer.opacity < 1.0;
+        if (transparent != needTransparency) {
           material.needsUpdate = true;
-          transparent = material.layer.opacity < 1.0;
+          transparent = needTransparency;
         }
         return transparent;
       }

package/lib/Layer/TiledGeometryLayer.js

@@ -4,7 +4,6 @@ import { InfoTiledGeometryLayer } from "./InfoLayer.js";
 import Picking from "../Core/Picking.js";
 import convertToTile from "../Converter/convertToTile.js";
 import ObjectRemovalHelper from "../Process/ObjectRemovalHelper.js";
-import { SIZE_DIAGONAL_TEXTURE } from "../Process/LayeredMaterialNodeProcessing.js";
 import { ImageryLayers } from "./Layer.js";
 import { CACHE_POLICIES } from "../Core/Scheduler/Cache.js";
 const subdivisionVector = new THREE.Vector3();
@@ -89,7 +88,7 @@ class TiledGeometryLayer extends GeometryLayer {
       this.object3d.add(...level0s);
       this.object3d.updateMatrixWorld();
     }));
-    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (SIZE_DIAGONAL_TEXTURE * 2);
+    this.maxScreenSizeNode = this.sseSubdivisionThreshold * (this.sizeDiagonalTexture * 2);
   }
   get hideSkirt() {
     return this._hideSkirt;
@@ -408,7 +407,7 @@ class TiledGeometryLayer extends GeometryLayer {
 
     // The screen space error is calculated to have a correct texture display.
     // For the projection of a texture's texel to be less than or equal to one pixel
-    const sse = node.screenSize / (SIZE_DIAGONAL_TEXTURE * 2);
+    const sse = node.screenSize / (this.sizeDiagonalTexture * 2);
     return this.sseSubdivisionThreshold < sse;
   }
 }

package/lib/Parser/GeoJsonParser.js

@@ -132,8 +132,7 @@ function toFeatureType(jsonType) {
 const keyProperties = ['type', 'geometry', 'properties'];
 const firstCoordinates = a => a === undefined || Array.isArray(a) && !isNaN(a[0]) ? a : firstCoordinates(a[0]);
 function jsonFeatureToFeature(crsIn, json, collection) {
-  var _json$geometry, _firstCoordinates;
-  if (!((_json$geometry = json.geometry) !== null && _json$geometry !== void 0 && _json$geometry.type)) {
+  if (!json.geometry?.type) {
     console.warn('No geometry provided');
     return null;
   }
@@ -142,7 +141,7 @@ function jsonFeatureToFeature(crsIn, json, collection) {
   const feature = collection.requestFeatureByType(featureType);
   const coordinates = jsonType != 'point' ? json.geometry.coordinates : [json.geometry.coordinates];
   const properties = json.properties || {};
-  feature.hasRawElevationData = ((_firstCoordinates = firstCoordinates(coordinates)) === null || _firstCoordinates === void 0 ? void 0 : _firstCoordinates.length) === 3;
+  feature.hasRawElevationData = firstCoordinates(coordinates)?.length === 3;
 
   // copy other properties
   for (const key of Object.keys(json)) {

package/lib/Parser/LASParser.js

@@ -89,13 +89,12 @@ export default {
    * header of the file is contained in `userData`.
    */
   parse(data) {
-    var _options$out, _options$in;
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if ((_options$out = options.out) !== null && _options$out !== void 0 && _options$out.skip) {
+    if (options.out?.skip) {
       console.warn("Warning: options 'skip' not supported anymore");
     }
     return lasLoader.parseFile(data, {
-      colorDepth: (_options$in = options.in) === null || _options$in === void 0 ? void 0 : _options$in.colorDepth
+      colorDepth: options.in?.colorDepth
     }).then(parsedData => {
       const geometry = buildBufferGeometry(parsedData.attributes);
       geometry.userData.header = parsedData.header;

package/lib/Parser/deprecated/LegacyGLTFLoader.js

@@ -321,7 +321,6 @@ threeExamples.LegacyGLTFLoader = function () {
     1029: THREE.FrontSide // Culling back
     //1032: THREE.NoSide   // Culling front and back, what to do?
   };
-
   var WEBGL_DEPTH_FUNCS = {
     512: THREE.NeverDepth,
     513: THREE.LessDepth,
@@ -355,7 +354,6 @@ threeExamples.LegacyGLTFLoader = function () {
     //32771: CONSTANT_ALPHA,
     //32772: ONE_MINUS_CONSTANT_COLOR
   };
-
   var WEBGL_TYPE_SIZES = {
     'SCALAR': 1,
     'VEC2': 2,
@@ -1116,6 +1114,7 @@ threeExamples.LegacyGLTFLoader = function () {
 
         // According to COLLADA spec...
         // aspectRatio = xfov / yfov
+
         var _camera = new THREE.PerspectiveCamera(THREE.MathUtils.radToDeg(yfov * aspectRatio), aspectRatio, camera.perspective.znear || 1, camera.perspective.zfar || 2e6);
         if (camera.name !== undefined) _camera.name = camera.name;
         if (camera.extras) _camera.userData = camera.extras;

package/lib/Process/FeatureProcessing.js

@@ -17,9 +17,8 @@ export default {
     if (node.layerUpdateState[layer.id] === undefined) {
       node.layerUpdateState[layer.id] = new LayerUpdateState();
     } else if (!node.layerUpdateState[layer.id].canTryUpdate()) {
-      var _node$link$layer$id;
       // toggle visibility features
-      (_node$link$layer$id = node.link[layer.id]) === null || _node$link$layer$id === void 0 ? void 0 : _node$link$layer$id.forEach(f => {
+      node.link[layer.id]?.forEach(f => {
         f.layer.object3d.add(f);
         f.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
         f.meshes.updateMatrixWorld();

package/lib/Process/LayeredMaterialNodeProcessing.js

@@ -1,8 +1,6 @@
 import { chooseNextLevelToFetch } from "../Layer/LayerUpdateStrategy.js";
 import LayerUpdateState from "../Layer/LayerUpdateState.js";
 import handlingError from "./handlerNodeError.js";
-export const SIZE_TEXTURE_TILE = 256;
-export const SIZE_DIAGONAL_TEXTURE = (2 * (SIZE_TEXTURE_TILE * SIZE_TEXTURE_TILE)) ** 0.5;
 function materialCommandQueuePriorityFunction(material) {
   // We know that 'node' is visible because commands can only be
   // issued for visible nodes.
@@ -62,14 +60,12 @@ export function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
         return;
       } // ok, we're going to inherit our parent's texture
     }
-
     if (!nodeLayer) {
-      var _parent$material;
       // Create new raster node
       nodeLayer = layer.setupRasterNode(node);
 
       // Init the node by parent
-      const parentLayer = (_parent$material = parent.material) === null || _parent$material === void 0 ? void 0 : _parent$material.getLayer(layer.id);
+      const parentLayer = parent.material?.getLayer(layer.id);
       nodeLayer.initFromParent(parentLayer, extentsDestination);
     }
 
@@ -158,9 +154,8 @@ export function updateLayeredMaterialNodeElevation(context, layer, node, parent)
     nodeLayer = layer.setupRasterNode(node);
   }
   if (node.layerUpdateState[layer.id] === undefined) {
-    var _parent$material2;
     node.layerUpdateState[layer.id] = new LayerUpdateState();
-    const parentLayer = (_parent$material2 = parent.material) === null || _parent$material2 === void 0 ? void 0 : _parent$material2.getLayer(layer.id);
+    const parentLayer = parent.material?.getLayer(layer.id);
     nodeLayer.initFromParent(parentLayer, extentsDestination);
     if (nodeLayer.level >= layer.source.zoom.min) {
       context.view.notifyChange(node, false);
@@ -210,8 +205,7 @@ export function removeLayeredMaterialNodeLayer(layerId) {
    * @param {TileMesh} node - The node to udpate.
    */
   return function (node) {
-    var _node$material;
-    if ((_node$material = node.material) !== null && _node$material !== void 0 && _node$material.removeLayer) {
+    if (node.material?.removeLayer) {
       if (node.material.elevationLayerIds.indexOf(layerId) > -1) {
         node.setBBoxZ({
           min: 0,

package/lib/Process/ObjectRemovalHelper.js

@@ -28,7 +28,6 @@ export default {
         // see https://github.com/iTowns/itowns/issues/869
         // obj.geometry = null;
       }
-
       if (obj.material) {
         if (Array.isArray(obj.material)) {
           for (const material of obj.material) {
@@ -82,7 +81,7 @@ export default {
     // of the objects which have their own removal logic
     let toRemove = obj.children.filter(c => c.layer && c.layer.id === layer.id);
     const linked = obj.link && obj.link[layer.id];
-    if (linked !== null && linked !== void 0 && linked.children.length) {
+    if (linked?.children.length) {
       toRemove = toRemove.concat(linked.children);
       delete obj.link[layer.id];
     }

package/lib/Provider/3dTilesProvider.js

@@ -114,6 +114,7 @@ function executeCommand(command) {
         } else if (magic == 'b3dm') {
           func = supportedFormats.b3dm;
         } else if (magic == 'pnts') {
+          layer.hasPnts = true;
           func = supportedFormats.pnts;
         } else if (magic == 'glTF') {
           func = supportedFormats.gltf;

package/lib/Renderer/ColorLayersOrdering.js

@@ -2,8 +2,7 @@ import { ImageryLayers } from "../Layer/Layer.js";
 function updateLayersOrdering(geometryLayer, imageryLayers) {
   const sequence = ImageryLayers.getColorLayersIdOrderedBySequence(imageryLayers);
   const cO = function (object) {
-    var _object$material;
-    if ((_object$material = object.material) !== null && _object$material !== void 0 && _object$material.setSequence) {
+    if (object.material?.setSequence) {
       object.material.setSequence(sequence);
     }
   };

package/lib/Renderer/Label2DRenderer.js

@@ -157,10 +157,7 @@ class Label2DRenderer {
       }
     });
     labelLayers.forEach(labelLayer => {
-      labelLayer.toHide.children.forEach(labelsNode => {
-        var _labelsNode$domElemen;
-        return (_labelsNode$domElemen = labelsNode.domElements) === null || _labelsNode$domElemen === void 0 ? void 0 : _labelsNode$domElemen.labels.hide();
-      });
+      labelLayer.toHide.children.forEach(labelsNode => labelsNode.domElements?.labels.hide());
       labelLayer.toHide.clear();
     });
   }

package/lib/Renderer/PointsMaterial.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 /* babel-plugin-inline-import './Shader/PointsVS.glsl' */
-const PointsVS = "#include <itowns/precision_qualifier>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_vertex>\n#endif\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\n#define NB_CLASS 8.\n\nuniform float size;\nuniform float scale;\n\nuniform bool picking;\nuniform int mode;\nuniform float opacity;\nuniform vec4 overlayColor;\n\nuniform vec2 elevationRange;\nuniform vec2 intensityRange;\nuniform vec2 angleRange;\n\nuniform bool applyOpacityClassication;\n\nuniform sampler2D classificationTexture;\nuniform sampler2D discreteTexture;\nuniform sampler2D gradientTexture;\nuniform int sizeMode;\nuniform float minAttenuatedSize;\nuniform float maxAttenuatedSize;\n\nattribute vec3 color;\nattribute vec2 range;\nattribute vec4 unique_id;\nattribute float intensity;\nattribute float classification;\nattribute float pointSourceID;\n\nattribute float returnNumber;\nattribute float numberOfReturns;\nattribute float scanAngle;\n\n#if defined(NORMAL_OCT16)\nattribute vec2 oct16Normal;\n#elif defined(NORMAL_SPHEREMAPPED)\nattribute vec2 sphereMappedNormal;\n#endif\n\nvarying vec4 vColor;\n\n// see https://web.archive.org/web/20150303053317/http://lgdv.cs.fau.de/get/1602\n// and implementation in PotreeConverter (BINPointReader.cpp) and potree (BinaryDecoderWorker.js)\n#if defined(NORMAL_OCT16)\nvec3 decodeOct16Normal(vec2 encodedNormal) {\n    vec2 nNorm = 2. * (encodedNormal / 255.) - 1.;\n    vec3 n;\n    n.z = 1. - abs(nNorm.x) - abs(nNorm.y);\n    if (n.z >= 0.) {\n        n.x = nNorm.x;\n        n.y = nNorm.y;\n    } else {\n        n.x = sign(nNorm.x) - sign(nNorm.x) * sign(nNorm.y) * nNorm.y;\n        n.y = sign(nNorm.y) - sign(nNorm.y) * sign(nNorm.x) * nNorm.x;\n    }\n    return normalize(n);\n}\n#elif defined(NORMAL_SPHEREMAPPED)\n// see http://aras-p.info/texts/CompactNormalStorage.html method #4\n// or see potree's implementation in BINPointReader.cpp\nvec3 decodeSphereMappedNormal(vec2 encodedNormal) {\n    vec2 fenc = 2. * encodedNormal / 255. - 1.;\n    float f = dot(fenc,fenc);\n    float g = 2. * sqrt(1. - f);\n    vec3 n;\n    n.xy = fenc * g;\n    n.z = 1. - 2. * f;\n    return n;\n}\n#endif\n\nvoid main() {\n\n#if defined(NORMAL_OCT16)\n    vec3  normal = decodeOct16Normal(oct16Normal);\n#elif defined(NORMAL_SPHEREMAPPED)\n    vec3 normal = decodeSphereMappedNormal(sphereMappedNormal);\n#elif defined(NORMAL)\n    // nothing to do\n#else\n    // default to color\n    vec3 normal = color;\n#endif\n\n    if (picking) {\n        vColor = unique_id;\n    } else {\n        vColor.a = opacity;\n        if (applyOpacityClassication || mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n            vColor.a *= opacity;\n        }\n\n        if (mode == PNTS_MODE_NORMAL) {\n            vColor.rgb = abs(normal);\n        } else if (mode == PNTS_MODE_COLOR) {\n            // default to color mode\n            vColor.rgb = mix(color, overlayColor.rgb, overlayColor.a);\n        } else if (mode == PNTS_MODE_RETURN_NUMBER) {\n            vec2 uv = vec2(returnNumber/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_TYPE) {\n            float returnType;\n            if (returnNumber > numberOfReturns) {\n                returnType = 4.;\n            } else if (returnNumber == 1.) {\n                if (numberOfReturns == 1.) {\n                    // single\n                    returnType = 0.;\n                } else {\n                    // first\n                    returnType = 1.;\n                }\n            } else {\n                if (returnNumber == numberOfReturns) {\n                    // last\n                    returnType = 3.;\n                } else {\n                    // intermediate\n                    returnType = 2.;\n                }\n            }\n            vec2 uv = vec2(returnType/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_COUNT) {\n            vec2 uv = vec2(numberOfReturns/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_POINT_SOURCE_ID) {\n            vec2 uv = vec2(mod(pointSourceID, NB_CLASS)/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_SCAN_ANGLE) {\n            float i = (scanAngle - angleRange.x) / (angleRange.y - angleRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_INTENSITY) {\n            float i = (intensity - intensityRange.x) / (intensityRange.y - intensityRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_ELEVATION) {\n            float i = (position.z - elevationRange.x) / (elevationRange.y - elevationRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        }\n    }\n\n    #include <begin_vertex>\n    #include <project_vertex>\n\n    gl_PointSize = size;\n\n    if (sizeMode == PNTS_SIZE_MODE_ATTENUATED) {\n        bool isPerspective = isPerspectiveMatrix(projectionMatrix);\n\n        if (isPerspective) {\n            gl_PointSize *= scale / -mvPosition.z;\n            gl_PointSize = clamp(gl_PointSize, minAttenuatedSize, maxAttenuatedSize);\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    #include <itowns/projective_texturing_vertex>\n#endif\n    #include <logdepthbuf_vertex>\n}\n";
+const PointsVS = "#include <itowns/precision_qualifier>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_vertex>\n#endif\n#include <common>\n#include <logdepthbuf_pars_vertex>\n\n#define NB_CLASS 8.\n\nuniform float size;\nuniform float scale;\n\nuniform bool picking;\nuniform int mode;\nuniform float opacity;\nuniform vec4 overlayColor;\n\nuniform vec2 elevationRange;\nuniform vec2 intensityRange;\nuniform vec2 angleRange;\n\nuniform sampler2D classificationTexture;\nuniform sampler2D discreteTexture;\nuniform sampler2D gradientTexture;\nuniform int sizeMode;\nuniform float minAttenuatedSize;\nuniform float maxAttenuatedSize;\n\nattribute vec3 color;\nattribute vec2 range;\nattribute vec4 unique_id;\nattribute float intensity;\nattribute float classification;\nattribute float pointSourceID;\n\nattribute float returnNumber;\nattribute float numberOfReturns;\nattribute float scanAngle;\n\n#if defined(NORMAL_OCT16)\nattribute vec2 oct16Normal;\n#elif defined(NORMAL_SPHEREMAPPED)\nattribute vec2 sphereMappedNormal;\n#endif\n\nvarying vec4 vColor;\n\n// see https://web.archive.org/web/20150303053317/http://lgdv.cs.fau.de/get/1602\n// and implementation in PotreeConverter (BINPointReader.cpp) and potree (BinaryDecoderWorker.js)\n#if defined(NORMAL_OCT16)\nvec3 decodeOct16Normal(vec2 encodedNormal) {\n    vec2 nNorm = 2. * (encodedNormal / 255.) - 1.;\n    vec3 n;\n    n.z = 1. - abs(nNorm.x) - abs(nNorm.y);\n    if (n.z >= 0.) {\n        n.x = nNorm.x;\n        n.y = nNorm.y;\n    } else {\n        n.x = sign(nNorm.x) - sign(nNorm.x) * sign(nNorm.y) * nNorm.y;\n        n.y = sign(nNorm.y) - sign(nNorm.y) * sign(nNorm.x) * nNorm.x;\n    }\n    return normalize(n);\n}\n#elif defined(NORMAL_SPHEREMAPPED)\n// see http://aras-p.info/texts/CompactNormalStorage.html method #4\n// or see potree's implementation in BINPointReader.cpp\nvec3 decodeSphereMappedNormal(vec2 encodedNormal) {\n    vec2 fenc = 2. * encodedNormal / 255. - 1.;\n    float f = dot(fenc,fenc);\n    float g = 2. * sqrt(1. - f);\n    vec3 n;\n    n.xy = fenc * g;\n    n.z = 1. - 2. * f;\n    return n;\n}\n#endif\n\nvoid main() {\n\n#if defined(NORMAL_OCT16)\n    vec3  normal = decodeOct16Normal(oct16Normal);\n#elif defined(NORMAL_SPHEREMAPPED)\n    vec3 normal = decodeSphereMappedNormal(sphereMappedNormal);\n#elif defined(NORMAL)\n    // nothing to do\n#else\n    // default to color\n    vec3 normal = color;\n#endif\n\n    if (picking) {\n        vColor = unique_id;\n    } else {\n        vColor.a = 1.0;\n        if (mode == PNTS_MODE_CLASSIFICATION) {\n            vec2 uv = vec2(classification/255., 0.5);\n            vColor = texture2D(classificationTexture, uv);\n        } else if (mode == PNTS_MODE_NORMAL) {\n            vColor.rgb = abs(normal);\n        } else if (mode == PNTS_MODE_COLOR) {\n            // default to color mode\n            vColor.rgb = mix(color, overlayColor.rgb, overlayColor.a);\n        } else if (mode == PNTS_MODE_RETURN_NUMBER) {\n            vec2 uv = vec2(returnNumber/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_TYPE) {\n            float returnType;\n            if (returnNumber > numberOfReturns) {\n                returnType = 4.;\n            } else if (returnNumber == 1.) {\n                if (numberOfReturns == 1.) {\n                    // single\n                    returnType = 0.;\n                } else {\n                    // first\n                    returnType = 1.;\n                }\n            } else {\n                if (returnNumber == numberOfReturns) {\n                    // last\n                    returnType = 3.;\n                } else {\n                    // intermediate\n                    returnType = 2.;\n                }\n            }\n            vec2 uv = vec2(returnType/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_RETURN_COUNT) {\n            vec2 uv = vec2(numberOfReturns/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_POINT_SOURCE_ID) {\n            vec2 uv = vec2(mod(pointSourceID, NB_CLASS)/255., 0.5);\n            vColor = texture2D(discreteTexture, uv);\n        } else if (mode == PNTS_MODE_SCAN_ANGLE) {\n            float i = (scanAngle - angleRange.x) / (angleRange.y - angleRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_INTENSITY) {\n            float i = (intensity - intensityRange.x) / (intensityRange.y - intensityRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        } else if (mode == PNTS_MODE_ELEVATION) {\n            float z = (modelMatrix * vec4(position, 1.0)).z;\n            float i = (z - elevationRange.x) / (elevationRange.y - elevationRange.x);\n            vec2 uv = vec2(i, (1. - i));\n            vColor = texture2D(gradientTexture, uv);\n        }\n\n        vColor.a *= opacity;\n    }\n\n    #include <begin_vertex>\n    #include <project_vertex>\n\n    gl_PointSize = size;\n\n    if (sizeMode == PNTS_SIZE_MODE_ATTENUATED) {\n        bool isPerspective = isPerspectiveMatrix(projectionMatrix);\n\n        if (isPerspective) {\n            gl_PointSize *= scale / -mvPosition.z;\n            gl_PointSize = clamp(gl_PointSize, minAttenuatedSize, maxAttenuatedSize);\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    #include <itowns/projective_texturing_vertex>\n#endif\n    #include <logdepthbuf_vertex>\n}\n";
 /* babel-plugin-inline-import './Shader/PointsFS.glsl' */
 const PointsFS = "#include <itowns/precision_qualifier>\n#include <logdepthbuf_pars_fragment>\n#if defined(USE_TEXTURES_PROJECTIVE)\n#include <itowns/projective_texturing_pars_fragment>\n#endif\n\nvarying vec4 vColor;\nuniform bool picking;\nuniform int shape;\n\nvoid main() {\n    #include <logdepthbuf_fragment>\n    //square shape does not require any change.\n    if (shape == PNTS_SHAPE_CIRCLE) {\n        //circular rendering in glsl\n        if ((length(gl_PointCoord - 0.5) > 0.5) || (vColor.a == 0.0)) {\n            discard;\n        }\n    }\n\n#if defined(USE_TEXTURES_PROJECTIVE)\n    vec4 color = vColor;\n    if (!picking) {\n        #pragma unroll_loop\n        for (int i = 0; i < ORIENTED_IMAGES_COUNT; i++) {\n            color = projectiveTextureColor(projectiveTextureCoords[ ORIENTED_IMAGES_COUNT - 1 - i ], projectiveTextureDistortion[ ORIENTED_IMAGES_COUNT - 1 - i ], projectiveTexture[ ORIENTED_IMAGES_COUNT - 1 - i ], mask[ORIENTED_IMAGES_COUNT - 1 - i], color);\n        }\n        gl_FragColor = vec4(color.rgb, color.a * opacity);\n    } else {\n        gl_FragColor = color;\n    }\n#else\n    gl_FragColor = vColor;\n#endif\n}\n";
 import ShaderUtils from "./Shader/ShaderUtils.js";
@@ -127,7 +127,7 @@ export const ClassificationScheme = {
       visible: true,
       name: 'default',
       color: new THREE.Color(0.3, 0.6, 0.6),
-      opacity: 0.5
+      opacity: 1.0
     }
   }
 };
@@ -185,7 +185,7 @@ const DiscreteScheme = {
       visible: true,
       name: 'default',
       color: white,
-      opacity: 0.5
+      opacity: 1.0
     }
   }
 };
@@ -220,6 +220,7 @@ function generateGradientTexture(gradient) {
   return texture;
 }
 function recomputeTexture(scheme, texture, nbClass) {
+  let needTransparency;
   const data = texture.image.data;
   const width = texture.image.width;
   if (!nbClass) {
@@ -250,8 +251,10 @@ function recomputeTexture(scheme, texture, nbClass) {
     data[j + 1] = parseInt(255 * color.g, 10);
     data[j + 2] = parseInt(255 * color.b, 10);
     data[j + 3] = visible ? parseInt(255 * opacity, 10) : 0;
+    needTransparency = needTransparency || opacity < 1;
   }
   texture.needsUpdate = true;
+  return needTransparency;
 }
 class PointsMaterial extends THREE.ShaderMaterial {
   /**
@@ -264,7 +267,6 @@ class PointsMaterial extends THREE.ShaderMaterial {
    * @param      {THREE.Vector2}  [options.intensityRange=new THREE.Vector2(1, 65536)]  intensity range.
    * @param      {THREE.Vector2}  [options.elevationRange=new THREE.Vector2(0, 1000)]  elevation range.
    * @param      {THREE.Vector2}  [options.angleRange=new THREE.Vector2(-90, 90)]  scan angle range.
-   * @param      {boolean}  [options.applyOpacityClassication=false]  apply opacity classification on all display mode.
    * @param      {Scheme}  [options.classification]  LUT for point classification colorization.
    * @param      {Scheme}  [options.discreteScheme]  LUT for other discret point values colorization.
    * @param      {string}  [options.gradient]  Descrition of the gradient to use for continuous point values.
@@ -293,7 +295,6 @@ class PointsMaterial extends THREE.ShaderMaterial {
     const oiMaterial = options.orientedImageMaterial;
     const classificationScheme = options.classification || ClassificationScheme.DEFAULT;
     const discreteScheme = options.discreteScheme || DiscreteScheme.DEFAULT;
-    const applyOpacityClassication = options.applyOpacityClassication == undefined ? false : options.applyOpacityClassication;
     const size = options.size || 0;
     const mode = options.mode || PNTS_MODE.COLOR;
     const shape = options.shape || PNTS_SHAPE.CIRCLE;
@@ -313,7 +314,6 @@ class PointsMaterial extends THREE.ShaderMaterial {
     delete options.orientedImageMaterial;
     delete options.classification;
     delete options.discreteScheme;
-    delete options.applyOpacityClassication;
     delete options.size;
     delete options.mode;
     delete options.shape;
@@ -322,6 +322,7 @@ class PointsMaterial extends THREE.ShaderMaterial {
     delete options.maxAttenuatedSize;
     delete options.gradient;
     super(options);
+    this.userData.needTransparency = {};
     this.gradients = gradients;
     this.gradientTexture = new THREE.CanvasTexture();
     this.vertexShader = PointsVS;
@@ -339,7 +340,6 @@ class PointsMaterial extends THREE.ShaderMaterial {
     CommonMaterial.setUniformProperty(this, 'intensityRange', intensityRange);
     CommonMaterial.setUniformProperty(this, 'elevationRange', elevationRange);
     CommonMaterial.setUniformProperty(this, 'angleRange', angleRange);
-    CommonMaterial.setUniformProperty(this, 'applyOpacityClassication', applyOpacityClassication);
     CommonMaterial.setUniformProperty(this, 'sizeMode', sizeMode);
     CommonMaterial.setUniformProperty(this, 'scale', scale);
     CommonMaterial.setUniformProperty(this, 'minAttenuatedSize', minAttenuatedSize);
@@ -390,14 +390,19 @@ class PointsMaterial extends THREE.ShaderMaterial {
     }
   }
   recomputeClassification() {
-    recomputeTexture(this.classificationScheme, this.classificationTexture, 32);
+    const needTransparency = recomputeTexture(this.classificationScheme, this.classificationTexture, 256);
+    this.userData.needTransparency[PNTS_MODE.CLASSIFICATION] = needTransparency;
     this.dispatchEvent({
       type: 'material_property_changed',
       target: this.uniforms
     });
   }
   recomputeDiscreteTexture() {
-    recomputeTexture(this.discreteScheme, this.discreteTexture);
+    const needTransparency = recomputeTexture(this.discreteScheme, this.discreteTexture);
+    this.userData.needTransparency[PNTS_MODE.RETURN_NUMBER] = needTransparency;
+    this.userData.needTransparency[PNTS_MODE.RETURN_TYPE] = needTransparency;
+    this.userData.needTransparency[PNTS_MODE.RETURN_COUNT] = needTransparency;
+    this.userData.needTransparency[PNTS_MODE.POINT_SOURCE_ID] = needTransparency;
     this.dispatchEvent({
       type: 'material_property_changed',
       target: this.uniforms

package/lib/Renderer/RenderMode.js

@@ -5,7 +5,6 @@ const MODES = {
   // depth buffer
   ID: 2 // id object
 };
-
 function push(object3d, mode) {
   const _mode = object3d.mode ?? MODES.FINAL;
   if (_mode == mode) {

package/lib/ThreeExtended/loaders/DDSLoader.js

@@ -17,23 +17,29 @@ class DDSLoader extends CompressedTextureLoader {
 
     // All values and structures referenced from:
     // http://msdn.microsoft.com/en-us/library/bb943991.aspx/
+
     // const DDSD_CAPS = 0x1;
     // const DDSD_HEIGHT = 0x2;
     // const DDSD_WIDTH = 0x4;
     // const DDSD_PITCH = 0x8;
     // const DDSD_PIXELFORMAT = 0x1000;
+
     // const DDSD_LINEARSIZE = 0x80000;
     // const DDSD_DEPTH = 0x800000;
+
     // const DDSCAPS_COMPLEX = 0x8;
     // const DDSCAPS_MIPMAP = 0x400000;
     // const DDSCAPS_TEXTURE = 0x1000;
+
     // const DDSCAPS2_VOLUME = 0x200000;
+
     // const DDPF_ALPHAPIXELS = 0x1;
     // const DDPF_ALPHA = 0x2;
     // const DDPF_FOURCC = 0x4;
     // const DDPF_RGB = 0x40;
     // const DDPF_YUV = 0x200;
     // const DDPF_LUMINANCE = 0x20000;
+
     function fourCCToInt32(value) {
       return value.charCodeAt(0) + (value.charCodeAt(1) << 8) + (value.charCodeAt(2) << 16) + (value.charCodeAt(3) << 24);
     }
@@ -66,7 +72,6 @@ class DDSLoader extends CompressedTextureLoader {
           dst++; //a
         }
       }
-
       return byteArray;
     }
     const FOURCC_DXT1 = fourCCToInt32('DXT1');
@@ -78,11 +83,16 @@ class DDSLoader extends CompressedTextureLoader {
     const extendedHeaderLengthInt = 5; // The extended header length in 32 bit ints
 
     // Offsets into the header array
+
     // const off_pfFlags = 20;
+
     // const off_caps = 27;
+
     // const off_caps3 = 29;
     // const off_caps4 = 30;
+
     // If fourCC = DX10, the extended header starts after 32
+
     // Parse header
 
     const header = new Int32Array(buffer, 0, headerLengthInt);

package/lib/ThreeExtended/loaders/DRACOLoader.js

@@ -261,7 +261,6 @@ function DRACOWorker() {
           };
           DracoDecoderModule(decoderConfig); // eslint-disable-line no-undef
         });
-
         break;
       case 'decode':
         const buffer = message.buffer;

package/lib/ThreeExtended/loaders/GLTFLoader.js

@@ -2627,6 +2627,7 @@ class GLTFParser {
 
       // Removes dangling associations, associations that reference a node that
       // didn't make it into the scene.
+
       parser.associations = (node => {
         const reducedAssociations = new Map();
         for (const [key, value] of parser.associations) {

package/lib/Utils/DEMUtils.js

@@ -255,6 +255,7 @@ function _readZCorrect(layer, texture, uv, tileDimensions, tileOwnerDimensions)
 
   // Determine if we're going to read the vertices from the top-left or lower-right triangle
   // (low-right = on the line 21-22 or under the diagonal lu = 1 - lv)
+
   const tri = new THREE.Triangle(new THREE.Vector3(u1, v2), new THREE.Vector3(u2, v1), lv == 1 || lu / (1 - lv) >= 1 ? new THREE.Vector3(u2, v2) : new THREE.Vector3(u1, v1));
 
   // bary holds the respective weight of each vertices of the triangles
@@ -287,11 +288,10 @@ function offsetInExtent(point, extent) {
   return target.set(originX, originY);
 }
 function _readZ(layer, method, coord, nodes, cache) {
-  var _cache$tile;
   const pt = coord.as(layer.extent.crs, temp.coord1);
   let tileWithValidElevationTexture = null;
   // first check in cache
-  if (cache !== null && cache !== void 0 && (_cache$tile = cache.tile) !== null && _cache$tile !== void 0 && _cache$tile.material) {
+  if (cache?.tile?.material) {
     tileWithValidElevationTexture = tileAt(pt, cache.tile);
   }
   for (let i = 0; !tileWithValidElevationTexture && i < nodes.length; i++) {

package/lib/Utils/OrientationUtils.js

@@ -71,7 +71,6 @@ export default {
     // return this.setFromEuler(euler.set(pitch, roll, heading , 'ZXY')).conjugate();
     return target.setFromEuler(euler.set(-pitch, -roll, -heading, 'YXZ')); // optimized version of above
   },
-
   /**
    * From
    * [DocMicMac](https://github.com/micmacIGN/Documentation/raw/master/DocMicMac.pdf),

package/lib/Utils/gui/Searchbar.js

@@ -9,7 +9,6 @@ const DEFAULT_OPTIONS = {
   placeholder: 'Search location'
 };
 function addActive(htmlElements, index) {
-  var _htmlElements$index;
   if (!htmlElements) {
     return index;
   }
@@ -19,7 +18,7 @@ function addActive(htmlElements, index) {
   } else if (index < 0) {
     index = htmlElements.length - 1;
   }
-  (_htmlElements$index = htmlElements[index]) === null || _htmlElements$index === void 0 ? void 0 : _htmlElements$index.classList.add('active');
+  htmlElements[index]?.classList.add('active');
   return index;
 }
 function removeAllActives(htmlElements) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.43.2-next.1",
+  "version": "2.43.2-next.11",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -72,10 +72,11 @@
     "three": "^0.159.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.5",
-    "@babel/plugin-transform-runtime": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "@babel/register": "^7.22.5",
+    "@babel/cli": "^7.24.6",
+    "@babel/core": "^7.24.6",
+    "@babel/plugin-transform-runtime": "^7.24.6",
+    "@babel/preset-env": "^7.24.6",
+    "@babel/register": "^7.24.6",
     "@types/three": "^0.159.0",
     "@xmldom/xmldom": "^0.8.10",
     "babel-inline-import-loader": "^1.0.1",
@@ -96,7 +97,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-import-resolver-webpack": "^0.13.8",
+    "eslint-import-resolver-babel-module": "^5.3.2",
     "eslint-plugin-import": "^2.29.0",
     "eslint-webpack-plugin": "^4.0.1",
     "github-url-from-git": "^1.5.0",
@@ -108,7 +109,7 @@
     "mocha": "^10.2.0",
     "node-fetch": "^2.7.0",
     "proj4": "^2.9.2",
-    "puppeteer": "^21.6.0",
+    "puppeteer": "^22.11.2",
     "q": "^1.5.1",
     "replace-in-file": "^7.0.2",
     "sinon": "^17.0.1",