From f6b7a785496471456b504e9a63a9540b0d715bec Mon Sep 17 00:00:00 2001 From: Kangning Li Date: Tue, 22 May 2018 16:25:05 -0400 Subject: [PATCH] PR feedback --- Specs/DataSources/CorridorGeometryUpdaterSpec.js | 3 --- Specs/DataSources/EllipseGeometryUpdaterSpec.js | 3 --- Specs/DataSources/PolygonGeometryUpdaterSpec.js | 3 --- Specs/DataSources/RectangleGeometryUpdaterSpec.js | 3 --- Specs/createGeometryUpdaterGroundGeometrySpecs.js | 1 + 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Specs/DataSources/CorridorGeometryUpdaterSpec.js b/Specs/DataSources/CorridorGeometryUpdaterSpec.js index 06d5136b8c90..940a2718d92b 100644 --- a/Specs/DataSources/CorridorGeometryUpdaterSpec.js +++ b/Specs/DataSources/CorridorGeometryUpdaterSpec.js @@ -12,7 +12,6 @@ defineSuite([ 'DataSources/SampledPositionProperty', 'DataSources/SampledProperty', 'DataSources/TimeIntervalCollectionProperty', - 'Scene/ClassificationType', 'Scene/PrimitiveCollection', 'Specs/createDynamicGeometryUpdaterSpecs', 'Specs/createDynamicProperty', @@ -33,7 +32,6 @@ defineSuite([ SampledPositionProperty, SampledProperty, TimeIntervalCollectionProperty, - ClassificationType, PrimitiveCollection, createDynamicGeometryUpdaterSpecs, createDynamicProperty, @@ -84,7 +82,6 @@ defineSuite([ 0, 1 ])); corridor.width = new ConstantProperty(1); - corridor.classificationType = ClassificationType.BOTH; // default TERRAIN var entity = new Entity(); entity.corridor = corridor; return entity; diff --git a/Specs/DataSources/EllipseGeometryUpdaterSpec.js b/Specs/DataSources/EllipseGeometryUpdaterSpec.js index a67c570d41c8..a429a8dd859a 100644 --- a/Specs/DataSources/EllipseGeometryUpdaterSpec.js +++ b/Specs/DataSources/EllipseGeometryUpdaterSpec.js @@ -9,7 +9,6 @@ defineSuite([ 'DataSources/Entity', 'DataSources/SampledPositionProperty', 'DataSources/SampledProperty', - 'Scene/ClassificationType', 'Scene/PrimitiveCollection', 'Specs/createDynamicGeometryUpdaterSpecs', 'Specs/createDynamicProperty', @@ -27,7 +26,6 @@ defineSuite([ Entity, SampledPositionProperty, SampledProperty, - ClassificationType, PrimitiveCollection, createDynamicGeometryUpdaterSpecs, createDynamicProperty, @@ -70,7 +68,6 @@ defineSuite([ var ellipse = new EllipseGraphics(); ellipse.semiMajorAxis = new ConstantProperty(2); ellipse.semiMinorAxis = new ConstantProperty(1); - ellipse.classificationType = ClassificationType.BOTH; // default TERRAIN var entity = new Entity(); entity.position = new ConstantPositionProperty(Cartesian3.fromDegrees(0, 0, 0)); diff --git a/Specs/DataSources/PolygonGeometryUpdaterSpec.js b/Specs/DataSources/PolygonGeometryUpdaterSpec.js index 9599b61228d7..1e87f87d4d5a 100644 --- a/Specs/DataSources/PolygonGeometryUpdaterSpec.js +++ b/Specs/DataSources/PolygonGeometryUpdaterSpec.js @@ -10,7 +10,6 @@ defineSuite([ 'DataSources/PropertyArray', 'DataSources/SampledPositionProperty', 'DataSources/SampledProperty', - 'Scene/ClassificationType', 'Scene/GroundPrimitive', 'Scene/PrimitiveCollection', 'Specs/createDynamicGeometryUpdaterSpecs', @@ -30,7 +29,6 @@ defineSuite([ PropertyArray, SampledPositionProperty, SampledProperty, - ClassificationType, GroundPrimitive, PrimitiveCollection, createDynamicGeometryUpdaterSpecs, @@ -82,7 +80,6 @@ defineSuite([ 1, 1, 0, 1 ]))); - polygon.classificationType = ClassificationType.BOTH; // default TERRAIN var entity = new Entity(); entity.polygon = polygon; return entity; diff --git a/Specs/DataSources/RectangleGeometryUpdaterSpec.js b/Specs/DataSources/RectangleGeometryUpdaterSpec.js index 5f8c6039185b..2608b931511f 100644 --- a/Specs/DataSources/RectangleGeometryUpdaterSpec.js +++ b/Specs/DataSources/RectangleGeometryUpdaterSpec.js @@ -8,7 +8,6 @@ defineSuite([ 'DataSources/Entity', 'DataSources/RectangleGraphics', 'DataSources/SampledProperty', - 'Scene/ClassificationType', 'Scene/PrimitiveCollection', 'Specs/createDynamicGeometryUpdaterSpecs', 'Specs/createDynamicProperty', @@ -25,7 +24,6 @@ defineSuite([ Entity, RectangleGraphics, SampledProperty, - ClassificationType, PrimitiveCollection, createDynamicGeometryUpdaterSpecs, createDynamicProperty, @@ -63,7 +61,6 @@ defineSuite([ function createBasicRectangleWithoutHeight() { var rectangle = new RectangleGraphics(); - rectangle.classificationType = ClassificationType.BOTH; // default TERRAIN var entity = new Entity(); entity.rectangle = rectangle; entity.rectangle.coordinates = new ConstantProperty(new Rectangle(0, 0, 1, 1)); diff --git a/Specs/createGeometryUpdaterGroundGeometrySpecs.js b/Specs/createGeometryUpdaterGroundGeometrySpecs.js index c2e15b26c139..b0ed38ab479c 100644 --- a/Specs/createGeometryUpdaterGroundGeometrySpecs.js +++ b/Specs/createGeometryUpdaterGroundGeometrySpecs.js @@ -159,6 +159,7 @@ define([ it('dynamic updater on terrain propagates classification type', function() { var entity = createDynamicEntity(); + entity[geometryPropertyName].classificationType = ClassificationType.BOTH; var updater = new Updater(entity, getScene()); var primitives = new PrimitiveCollection();