GeometryVisualizer subscribe once per entity, not once per geometry

Source/DataSources/GeometryUpdater.js

@@ -67,7 +67,6 @@ define([
 
         this._entity = entity;
         this._scene = options.scene;
-        this._entitySubscription = entity.definitionChanged.addEventListener(GeometryUpdater.prototype._onEntityPropertyChanged, this);
         this._fillEnabled = false;
         this._isClosed = false;
         this._onTerrain = false;
@@ -84,7 +83,6 @@ define([
         this._options = options.geometryOptions;
         this._geometryPropertyName = geometryPropertyName;
         this._id = geometryPropertyName + '-' + entity.id;
-
         this._observedPropertyNames = options.observedPropertyNames;
 
         this._onEntityPropertyChanged(entity, geometryPropertyName, entity[geometryPropertyName], undefined);
@@ -341,7 +339,6 @@ define([
      * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
      */
     GeometryUpdater.prototype.destroy = function() {
-        this._entitySubscription();
         destroyObject(this);
     };
     /**

Source/DataSources/GeometryVisualizer.js

@@ -80,8 +80,17 @@ define([
         this.updaters = updaters;
         this.geometryChanged = geometryChanged;
         this.eventHelper = eventHelper;
+
+        this._removeEntitySubscription = entity.definitionChanged.addEventListener(GeometryUpdaterSet.prototype._onEntityPropertyChanged, this);
     }
 
+    GeometryUpdaterSet.prototype._onEntityPropertyChanged = function(entity, propertyName, newValue, oldValue) {
+        var updaters = this.updaters;
+        for (var i = 0; i < updaters.length; i++) {
+            updaters[i]._onEntityPropertyChanged(entity, propertyName, newValue, oldValue);
+        }
+    };
+
     GeometryUpdaterSet.prototype.forEach = function (callback) {
         var updaters = this.updaters;
         for (var i = 0; i < updaters.length; i++) {
@@ -95,6 +104,7 @@ define([
         for (var i = 0; i < updaters.length; i++) {
             updaters[i].destroy();
         }
+        this._removeEntitySubscription();
         destroyObject(this);
     };
 

Specs/DataSources/BoxGeometryUpdaterSpec.js

@@ -96,6 +96,7 @@ defineSuite([
         var entity = createBasicBox();
         var updater = new BoxGeometryUpdater(entity, scene);
         entity.box = undefined;
+        updater._onEntityPropertyChanged(entity, 'box');
 
         expect(updater.fillEnabled).toBe(false);
         expect(updater.outlineEnabled).toBe(false);
@@ -107,6 +108,7 @@ defineSuite([
         var updater = new BoxGeometryUpdater(entity, scene);
         entity.box.fill = new ConstantProperty(false);
         entity.box.outline = new ConstantProperty(false);
+        updater._onEntityPropertyChanged(entity, 'box');
 
         expect(updater.fillEnabled).toBe(false);
         expect(updater.outlineEnabled).toBe(false);
@@ -134,20 +136,25 @@ defineSuite([
         var entity = createBasicBox();
         var updater = new BoxGeometryUpdater(entity, scene);
         entity.box.material = new GridMaterialProperty(Color.BLUE);
+        updater._onEntityPropertyChanged(entity, 'box');
+
         expect(updater.fillMaterialProperty).toBe(entity.box.material);
     });
 
     it('A time-varying outlineWidth causes geometry to be dynamic', function() {
         var entity = createBasicBox();
         var updater = new BoxGeometryUpdater(entity, scene);
         entity.box.outlineWidth = createDynamicProperty();
+        updater._onEntityPropertyChanged(entity, 'box');
+
         expect(updater.isDynamic).toBe(true);
     });
 
     it('A time-varying dimensions causes geometry to be dynamic', function() {
         var entity = createBasicBox();
         var updater = new BoxGeometryUpdater(entity, scene);
         entity.box.dimensions = createDynamicProperty();
+        updater._onEntityPropertyChanged(entity, 'box');
 
         expect(updater.isDynamic).toBe(true);
     });
@@ -346,21 +353,26 @@ defineSuite([
         expect(dynamicUpdater._options.dimensions).toEqual(box.dimensions.getValue());
 
         entity.show = false;
+        updater._onEntityPropertyChanged(entity, 'show');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(0);
         entity.show = true;
+updater._onEntityPropertyChanged(entity, 'show');
 
         box.show.setValue(false);
+        updater._onEntityPropertyChanged(entity, 'box');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(0);
 
         box.show.setValue(true);
         box.fill.setValue(false);
+        updater._onEntityPropertyChanged(entity, 'box');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(1);
 
         box.fill.setValue(true);
         box.outline.setValue(false);
+        updater._onEntityPropertyChanged(entity, 'box');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(1);
 
@@ -386,7 +398,8 @@ defineSuite([
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(0);
 
-        box.dimensions.setValue(new  Cartesian3(1, 2, 3));
+        box.dimensions.setValue(new Cartesian3(1, 2, 3));
+        updater._onEntityPropertyChanged(entity, 'box');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(2);
         updater.destroy();
@@ -399,19 +412,24 @@ defineSuite([
         updater.geometryChanged.addEventListener(listener);
 
         entity.box.dimensions = new ConstantProperty();
+        updater._onEntityPropertyChanged(entity, 'box');
         expect(listener.calls.count()).toEqual(1);
 
         entity.availability = new TimeIntervalCollection();
+        updater._onEntityPropertyChanged(entity, 'availability');
         expect(listener.calls.count()).toEqual(2);
 
         entity.box.dimensions = undefined;
+        updater._onEntityPropertyChanged(entity, 'box');
         expect(listener.calls.count()).toEqual(3);
 
         //Since there's no valid geometry, changing another property should not raise the event.
         entity.box.height = undefined;
+        updater._onEntityPropertyChanged(entity, 'box');
 
         //Modifying an unrelated property should not have any effect.
         entity.viewFrom = new ConstantProperty(Cartesian3.UNIT_X);
+        updater._onEntityPropertyChanged(entity, 'viewFrom');
         expect(listener.calls.count()).toEqual(3);
     });
 

Specs/DataSources/CorridorGeometryUpdaterSpec.js

@@ -126,6 +126,7 @@ defineSuite([
         var entity = createBasicCorridor();
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor = undefined;
+        updater._onEntityPropertyChanged(entity, 'corridor');
 
         expect(updater.fillEnabled).toBe(false);
         expect(updater.outlineEnabled).toBe(false);
@@ -137,6 +138,7 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.fill = new ConstantProperty(false);
         entity.corridor.outline = new ConstantProperty(false);
+        updater._onEntityPropertyChanged(entity, 'corridor');
 
         expect(updater.fillEnabled).toBe(false);
         expect(updater.outlineEnabled).toBe(false);
@@ -164,13 +166,17 @@ defineSuite([
         var entity = createBasicCorridor();
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.material = new GridMaterialProperty(Color.BLUE);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.fillMaterialProperty).toBe(entity.corridor.material);
     });
 
     it('Settings extrudedHeight causes geometry to be closed.', function() {
         var entity = createBasicCorridor();
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.extrudedHeight = new ConstantProperty(1000);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isClosed).toBe(true);
     });
 
@@ -179,6 +185,8 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.outlineWidth = new SampledProperty(Number);
         entity.corridor.outlineWidth.addSample(time, 1);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -194,6 +202,8 @@ defineSuite([
 
         entity.corridor.positions = new PropertyArray();
         entity.corridor.positions.setValue([point1, point2, point3]);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -202,6 +212,8 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.height = new SampledProperty(Number);
         entity.corridor.height.addSample(time, 1);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -210,6 +222,8 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.extrudedHeight = new SampledProperty(Number);
         entity.corridor.extrudedHeight.addSample(time, 1);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -218,6 +232,8 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.granularity = new SampledProperty(Number);
         entity.corridor.granularity.addSample(time, 1);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -226,6 +242,8 @@ defineSuite([
         var updater = new CorridorGeometryUpdater(entity, scene);
         entity.corridor.width = new SampledProperty(Number);
         entity.corridor.width.addSample(time, 1);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -238,6 +256,8 @@ defineSuite([
             stop : JulianDate.now(),
             data : CornerType.ROUNDED
         }));
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(true);
     });
 
@@ -247,6 +267,8 @@ defineSuite([
         var color = new SampledProperty(Color);
         color.addSample(time, Color.WHITE);
         entity.corridor.material = new ColorMaterialProperty(color);
+        updater._onEntityPropertyChanged(entity, 'corridor');
+
         expect(updater.isDynamic).toBe(groundPrimitiveSupported);
     });
 
@@ -529,24 +551,29 @@ defineSuite([
         expect(options.cornerType).toEqual(corridor.cornerType.getValue());
 
         entity.show = false;
+        updater._onEntityPropertyChanged(entity, 'show');
         dynamicUpdater.update(JulianDate.now());
         expect(primitives.length).toBe(0);
         expect(groundPrimitives.length).toBe(0);
         entity.show = true;
+        updater._onEntityPropertyChanged(entity, 'show');
 
         //If a dynamic show returns false, the primitive should go away.
         corridor.show.setValue(false);
+        updater._onEntityPropertyChanged(entity, 'corridor');
         dynamicUpdater.update(time);
         expect(primitives.length).toBe(0);
         expect(groundPrimitives.length).toBe(0);
 
         corridor.show.setValue(true);
+        updater._onEntityPropertyChanged(entity, 'corridor');
         dynamicUpdater.update(time);
         expect(primitives.length).toBe(2);
         expect(groundPrimitives.length).toBe(0);
 
         //If a dynamic position returns undefined, the primitive should go away.
         corridor.positions.setValue(undefined);
+        updater._onEntityPropertyChanged(entity, 'corridor');
         dynamicUpdater.update(time);
         expect(primitives.length).toBe(0);
         expect(groundPrimitives.length).toBe(0);
@@ -602,22 +629,28 @@ defineSuite([
         updater.geometryChanged.addEventListener(listener);
 
         entity.corridor.positions = new ConstantProperty([]);
+        updater._onEntityPropertyChanged(entity, 'corridor');
         expect(listener.calls.count()).toEqual(1);
 
         entity.corridor.height = new ConstantProperty(82);
+        updater._onEntityPropertyChanged(entity, 'corridor');
         expect(listener.calls.count()).toEqual(2);
 
         entity.availability = new TimeIntervalCollection();
+        updater._onEntityPropertyChanged(entity, 'availability');
         expect(listener.calls.count()).toEqual(3);
 
         entity.corridor.positions = undefined;
+        updater._onEntityPropertyChanged(entity, 'corridor');
         expect(listener.calls.count()).toEqual(4);
 
         //Since there's no valid geometry, changing another property should not raise the event.
         entity.corridor.height = undefined;
+        updater._onEntityPropertyChanged(entity, 'corridor');
 
         //Modifying an unrelated property should not have any effect.
         entity.viewFrom = new ConstantProperty(Cartesian3.UNIT_X);
+        updater._onEntityPropertyChanged(entity, 'viewFrom');
         expect(listener.calls.count()).toEqual(4);
     });