fix(ElevationLayer): scale elevation isn't updated

Author: gchoqueux

src/Core/TileMesh.js

@@ -57,8 +57,9 @@ class TileMesh extends THREE.Mesh {
         if (min == null && max == null) {
             return;
         }
-        // FIXME: Why the floors ? This is not conservative : the obb may be too short by almost 1m !
-        if (Math.floor(min) !== Math.floor(this.obb.z.min) || Math.floor(max) !== Math.floor(this.obb.z.max)) {
+        // update bbox if min or max have changed by at least one decimal
+        // or if scale changed
+        if (min.toFixed(1) !== this.obb.z.min.toFixed(1) || max.toFixed(1) !== this.obb.z.max.toFixed(1) || scale != this.obb.z.scale) {
             this.obb.updateZ(min, max, scale);
             if (this.horizonCullingPointElevationScaled) {
                 this.horizonCullingPointElevationScaled.setLength(this.obb.z.delta + this.horizonCullingPoint.length());

src/Layer/ElevationLayer.js

@@ -55,21 +55,7 @@ class ElevationLayer extends RasterLayer {
     constructor(id, config = {}) {
         super(id, config);
         this.isElevationLayer = true;
-
-        // This is used to add a factor needed to color texture
-        let baseScale = 1.0;
-        if (this.useColorTextureElevation) {
-            baseScale = this.colorTextureElevationMaxZ - this.colorTextureElevationMinZ;
-        }
-
-        this.defineLayerProperty('scale', this.scale || 1.0, (self) => {
-            self.parent.object3d.traverse((obj) => {
-                if (obj.layer == self.parent && obj.material) {
-                    obj.material.setElevationScale(self.scale * baseScale);
-                    obj.obb.updateScaleZ(self.scale);
-                }
-            });
-        });
+        this.defineLayerProperty('scale', this.scale || 1.0);
     }
 
     /**
@@ -91,6 +77,13 @@ class ElevationLayer extends RasterLayer {
         // listen elevation updating
         rasterElevationNode.addEventListener('updatedElevation', updateBBox);
 
+        // listen scaling elevation updating
+        this.addEventListener('scale-property-changed', updateBBox);
+        // remove scaling elevation updating if node is removed
+        node.addEventListener('dispose', () => {
+            this.removeEventListener('scale-property-changed', updateBBox);
+        });
+
         return rasterElevationNode;
     }
 

src/Process/ObjectRemovalHelper.js

@@ -25,8 +25,8 @@ export default {
                 } else {
                     obj.material.dispose();
                 }
-                // obj.material = null;
             }
+            obj.dispatchEvent({ type: 'dispose' });
         }
     },
 

src/Renderer/RasterTile.js

@@ -118,21 +118,20 @@ export class RasterElevationTile extends RasterTile {
         super(material, layer);
         const defaultEle = {
             bias: 0,
-            scale: 1,
             mode: ELEVATION_MODES.DATA,
             zmin: 0,
             zmax: Infinity,
         };
 
-        let scaleFactor = 1.0;
+        this.scaleFactor = 1.0;
 
         // Define elevation properties
         if (layer.useRgbaTextureElevation) {
             defaultEle.mode = ELEVATION_MODES.RGBA;
             defaultEle.zmax = 5000;
             throw new Error('Restore this feature');
         } else if (layer.useColorTextureElevation) {
-            scaleFactor = layer.colorTextureElevationMaxZ - layer.colorTextureElevationMinZ;
+            this.scaleFactor = layer.colorTextureElevationMaxZ - layer.colorTextureElevationMinZ;
             defaultEle.mode = ELEVATION_MODES.COLOR;
             defaultEle.bias = layer.colorTextureElevationMinZ;
             this.min = this.layer.colorTextureElevationMinZ;
@@ -143,10 +142,22 @@ export class RasterElevationTile extends RasterTile {
         }
 
         this.bias = layer.bias || defaultEle.bias;
-        this.scale = (layer.scale || defaultEle.scale) * scaleFactor;
         this.mode = layer.mode || defaultEle.mode;
         this.zmin = layer.zmin || defaultEle.zmin;
         this.zmax = layer.zmax || defaultEle.zmax;
+
+        layer.addEventListener('scale-property-changed', this._handlerCBEvent);
+    }
+
+    get scale() {
+        return this.layer.scale * this.scaleFactor;
+    }
+
+    dispose(removeEvent) {
+        super.dispose(removeEvent);
+        if (removeEvent) {
+            this.layer.removeEventListener('scale-property-changed', this._handlerCBEvent);
+        }
     }
 
     initFromParent(parent, extents) {

test/unit/dataSourceProvider.js

@@ -63,7 +63,7 @@ describe('Provide in Sources', function () {
     planarlayer.attach(colorlayer);
     planarlayer.attach(elevationlayer);
 
-    const fakeNode = { material,  setBBoxZ: () => {} };
+    const fakeNode = { material,  setBBoxZ: () => {},  addEventListener: () => {} };
     colorlayer.setupRasterNode(fakeNode);
     elevationlayer.setupRasterNode(fakeNode);