Skip to content

Commit

Permalink
Merge pull request #8625 from CesiumGS/updateValidationDocument
Browse files Browse the repository at this point in the history
Update CZML validation document.
  • Loading branch information
emackey authored Feb 22, 2020
2 parents 6c930df + e022e59 commit d75254a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
25 changes: 25 additions & 0 deletions Specs/Data/CZML/ValidationDocument.czml
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,11 @@
"classificationType":"TERRAIN",
"zIndex":445
},
"tileset":{
"show":true,
"uri":"http://example.com/6864",
"maximumScreenSpaceError":51767
},
"wall":{
"show":true,
"positions":{
Expand Down Expand Up @@ -8011,6 +8016,17 @@
"reference":"Constant#rectangle.zIndex"
}
},
"tileset":{
"show":{
"reference":"Constant#tileset.show"
},
"uri":{
"reference":"Constant#tileset.uri"
},
"maximumScreenSpaceError":{
"reference":"Constant#tileset.maximumScreenSpaceError"
}
},
"wall":{
"show":{
"reference":"Constant#wall.show"
Expand Down Expand Up @@ -11917,6 +11933,15 @@
]
}
},
"tileset":{
"maximumScreenSpaceError":{
"epoch":"2016-06-17T12:00:00Z",
"number":[
0,17401,
3600,7930
]
}
},
"wall":{
"granularity":{
"epoch":"2016-06-17T12:00:00Z",
Expand Down
8 changes: 8 additions & 0 deletions Specs/DataSources/CzmlDataSourceSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5304,6 +5304,9 @@ describe('DataSources/CzmlDataSource', function() {
expect(e.rectangle.distanceDisplayCondition.getValue(date)).toEqual(new DistanceDisplayCondition(21388, 23379));
expect(e.rectangle.classificationType.getValue(date)).toEqual(ClassificationType.TERRAIN);
expect(e.rectangle.zIndex.getValue(date)).toEqual(445);
expect(e.tileset.show.getValue(date)).toEqual(true);
expect(e.tileset.uri.getValue(date).url).toEqual('http://example.com/6864');
expect(e.tileset.maximumScreenSpaceError.getValue(date)).toEqual(51767.0);
expect(e.wall.show.getValue(date)).toEqual(true);
expect(e.wall.positions.getValue(date)).toEqual([ new Cartesian3(21681, 40276, 30621), new Cartesian3(3959, 61967, 19442) ]);
expect(e.wall.minimumHeights.getValue(date)).toEqual([ 49466, 44737 ]);
Expand Down Expand Up @@ -6290,6 +6293,9 @@ describe('DataSources/CzmlDataSource', function() {
expect(e.rectangle.distanceDisplayCondition.getValue(date)).toEqual(constant.rectangle.distanceDisplayCondition.getValue(date));
expect(e.rectangle.classificationType.getValue(date)).toEqual(constant.rectangle.classificationType.getValue(date));
expect(e.rectangle.zIndex.getValue(date)).toEqual(constant.rectangle.zIndex.getValue(date));
expect(e.tileset.show.getValue(date)).toEqual(constant.tileset.show.getValue(date));
expect(e.tileset.uri.getValue(date)).toEqual(constant.tileset.uri.getValue(date));
expect(e.tileset.maximumScreenSpaceError.getValue(date)).toEqual(constant.tileset.maximumScreenSpaceError.getValue(date));
expect(e.wall.show.getValue(date)).toEqual(constant.wall.show.getValue(date));
expect(e.wall.positions.getValue(date)).toEqual([dataSource.entities.getById('ConstantPosition1').position.getValue(date), dataSource.entities.getById('ConstantPosition2').position.getValue(date)]);
expect(e.wall.minimumHeights.getValue(date)).toEqual([dataSource.entities.getById('ConstantDouble1').billboard.scale.getValue(date), dataSource.entities.getById('ConstantDouble2').billboard.scale.getValue(date)]);
Expand Down Expand Up @@ -6902,6 +6908,8 @@ describe('DataSources/CzmlDataSource', function() {
expect(e.rectangle.distanceDisplayCondition.getValue(documentStopDate)).toEqual(new DistanceDisplayCondition(34617, 40071));
expect(e.rectangle.zIndex.getValue(documentStartDate)).toEqual(27256);
expect(e.rectangle.zIndex.getValue(documentStopDate)).toEqual(53581);
expect(e.tileset.maximumScreenSpaceError.getValue(documentStartDate)).toEqual(17401.0);
expect(e.tileset.maximumScreenSpaceError.getValue(documentStopDate)).toEqual(7930.0);
expect(e.wall.granularity.getValue(documentStartDate)).toEqual(64428.0);
expect(e.wall.granularity.getValue(documentStopDate)).toEqual(25333.0);
expect(e.wall.material.color.getValue(documentStartDate)).toEqual(Color.fromBytes(31, 188, 250, 46));
Expand Down

0 comments on commit d75254a

Please sign in to comment.