itowns 2.43.2-next.18 → 2.43.2-next.19

package/lib/Core/Style.js

@@ -15,29 +15,30 @@ function baseAltitudeDefault(properties, ctx) {
   return ctx?.coordinates?.z || 0;
 }
 export function readExpression(property, ctx) {
-  if (property != undefined) {
-    if (property.expression) {
-      return property.expression.evaluate(ctx);
-    } else if (property.stops) {
-      for (let i = property.stops.length - 1; i >= 0; i--) {
-        const stop = property.stops[i];
-        if (ctx.zoom >= stop[0]) {
-          return stop[1];
-        }
+  if (property.expression) {
+    return property.expression.evaluate(ctx);
+  }
+  if (property.stops) {
+    const stops = property.stops;
+    property = property.stops[0][1];
+    for (let i = stops.length - 1; i >= 0; i--) {
+      const stop = stops[i];
+      if (ctx.zoom >= stop[0]) {
+        property = stop[1];
+        break;
       }
-      return property.stops[0][1];
-    }
-    if (typeof property === 'string' || property instanceof String) {
-      property = property.replace(/\{(.+?)\}/g, (a, b) => ctx.properties[b] || '').trim();
     }
-    if (property instanceof Function) {
-      // TOBREAK: Pass the current `context` as a unique parameter.
-      // In this proposal, metadata will be accessed in the callee by the
-      // `context.properties` property.
-      return property(ctx.properties, ctx);
-    }
-    return property;
   }
+  if (typeof property === 'string' || property instanceof String) {
+    return property.replace(/\{(.+?)\}/g, (a, b) => ctx.properties[b] || '').trim();
+  }
+  if (property instanceof Function) {
+    // TOBREAK: Pass the current `context` as a unique parameter.
+    // In this proposal, metadata will be accessed in the callee by the
+    // `context.properties` property.
+    return property(ctx.properties, ctx);
+  }
+  return property;
 }
 function rgba2rgb(orig) {
   if (!orig) {
@@ -48,7 +49,7 @@ function rgba2rgb(orig) {
     };
   } else if (typeof orig == 'string') {
     const result = orig.match(/(?:((hsl|rgb)a? *\(([\d.%]+(?:deg|g?rad|turn)?)[ ,]*([\d.%]+)[ ,]*([\d.%]+)[ ,/]*([\d.%]*)\))|(#((?:[\d\w]{3}){1,2})([\d\w]{1,2})?))/i);
-    if (!result) {
+    if (result === null) {
       return {
         color: orig,
         opacity: 1.0
@@ -62,10 +63,10 @@ function rgba2rgb(orig) {
         color: `#${result[8]}`,
         opacity
       };
-    } else if (result[0]) {
+    } else if (result[1]) {
       return {
         color: `${result[2]}(${result[3]},${result[4]},${result[5]})`,
-        opacity: Number(result[6]) || 1.0
+        opacity: result[6] ? Number(result[6]) : 1.0
       };
     }
   }
@@ -692,31 +693,6 @@ class Style {
     defineStyleProperty(this, 'icon', 'color', params.icon.color);
     defineStyleProperty(this, 'icon', 'opacity', params.icon.opacity, 1.0);
   }
-
-  /**
-   * Copies the content of the target style into this style.
-   * @param {Style} style - The style to copy.
-   *
-   * @return {Style} This style.
-   */
-  copy(style) {
-    Object.assign(this.fill, style.fill);
-    Object.assign(this.stroke, style.stroke);
-    Object.assign(this.point, style.point);
-    Object.assign(this.text, style.text);
-    Object.assign(this.icon, style.icon);
-    return this;
-  }
-
-  /**
-       * Clones this style.
-       *
-       * @return {Style} The new style, cloned from this one.
-       */
-  clone() {
-    const clone = new Style();
-    return clone.copy(this);
-  }
   setContext(ctx) {
     this.context = ctx;
   }
@@ -940,8 +916,35 @@ class Style {
       if (iconImg) {
         try {
           style.icon.id = iconImg;
+          if (iconImg.stops) {
+            const iconCropValue = {
+              ...(iconImg.base !== undefined && {
+                base: iconImg.base
+              }),
+              stops: iconImg.stops.map(stop => {
+                let cropValues = sprites[stop[1]];
+                if (stop[1].includes('{')) {
+                  cropValues = function (p) {
+                    const id = stop[1].replace(/\{(.+?)\}/g, (a, b) => p[b] || '').trim();
+                    cropValues = sprites[id];
+                    return sprites[id];
+                  };
+                }
+                return [stop[0], cropValues];
+              })
+            };
+            style.icon.cropValues = iconCropValue;
+          } else {
+            style.icon.cropValues = sprites[iconImg];
+            if (iconImg[0].includes('{')) {
+              style.icon.cropValues = function (p) {
+                const id = iconImg.replace(/\{(.+?)\}/g, (a, b) => p[b] || '').trim();
+                style.icon.cropValues = sprites[id];
+                return sprites[id];
+              };
+            }
+          }
           style.icon.source = sprites.source;
-          style.icon.cropValues = sprites[iconImg];
           style.icon.size = readVectorProperty(layer.layout['icon-size']) || 1;
           const {
             color,

package/lib/Provider/3dTilesProvider.js

@@ -38,7 +38,7 @@ function pntsParse(data, layer) {
       size: 1,
       mode: layer.pntsMode,
       shape: layer.pntsShape,
-      classification: layer.classification,
+      classificationScheme: layer.classification,
       sizeMode: layer.pntsSizeMode,
       minAttenuatedSize: layer.pntsMinAttenuatedSize,
       maxAttenuatedSize: layer.pntsMaxAttenuatedSize

package/lib/Renderer/PointsMaterial.js

@@ -266,7 +266,7 @@ 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      {Scheme}  [options.classification]  LUT for point classification colorization.
+   * @param      {Scheme}  [options.classificationScheme]  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.
    *                          (Default value will be the 'SPECTRAL' gradient from Utils/Gradients)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.43.2-next.18",
+  "version": "2.43.2-next.19",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",