Merge pull request #8249 from AnalyticalGraphicsInc/updateValidationD…

…ocument Update CZML validation document.
CesiumGS · Oct 3, 2019 · 7269eb7 · 7269eb7
2 parents d26ccfe + 2120290
commit 7269eb7
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 0 deletions.
diff --git a/Specs/Data/CZML/ValidationDocument.czml b/Specs/Data/CZML/ValidationDocument.czml
@@ -237,6 +237,15 @@
           15638,24381,37983
         ]
       },
+      "innerRadii":{
+        "cartesian":[
+          21988,44373,36013
+        ]
+      },
+      "minimumClock":57589,
+      "maximumClock":24940,
+      "minimumCone":54533,
+      "maximumCone":64532,
       "heightReference":"CLAMP_TO_GROUND",
       "fill":true,
       "material":{
@@ -7567,6 +7576,21 @@
       "radii":{
         "reference":"Constant#ellipsoid.radii"
       },
+      "innerRadii":{
+        "reference":"Constant#ellipsoid.innerRadii"
+      },
+      "minimumClock":{
+        "reference":"Constant#ellipsoid.minimumClock"
+      },
+      "maximumClock":{
+        "reference":"Constant#ellipsoid.maximumClock"
+      },
+      "minimumCone":{
+        "reference":"Constant#ellipsoid.minimumCone"
+      },
+      "maximumCone":{
+        "reference":"Constant#ellipsoid.maximumCone"
+      },
       "heightReference":{
         "reference":"Constant#ellipsoid.heightReference"
       },
@@ -11331,6 +11355,41 @@
           3600,39497,12186,45103
         ]
       },
+      "innerRadii":{
+        "epoch":"2016-06-17T12:00:00Z",
+        "cartesian":[
+          0,40318,27037,59497,
+          3600,57650,53729,12241
+        ]
+      },
+      "minimumClock":{
+        "epoch":"2016-06-17T12:00:00Z",
+        "number":[
+          0,13484,
+          3600,2170
+        ]
+      },
+      "maximumClock":{
+        "epoch":"2016-06-17T12:00:00Z",
+        "number":[
+          0,10874,
+          3600,2968
+        ]
+      },
+      "minimumCone":{
+        "epoch":"2016-06-17T12:00:00Z",
+        "number":[
+          0,54230,
+          3600,59454
+        ]
+      },
+      "maximumCone":{
+        "epoch":"2016-06-17T12:00:00Z",
+        "number":[
+          0,49077,
+          3600,26303
+        ]
+      },
       "material":{
         "solidColor":{
           "color":{

diff --git a/Specs/DataSources/CzmlDataSourceSpec.js b/Specs/DataSources/CzmlDataSourceSpec.js
@@ -5179,6 +5179,11 @@ describe('DataSources/CzmlDataSource', function() {
             expect(e.ellipse.zIndex.getValue(date)).toEqual(3341);
             expect(e.ellipsoid.show.getValue(date)).toEqual(true);
             expect(e.ellipsoid.radii.getValue(date)).toEqual(new Cartesian3(15638, 24381, 37983));
+            expect(e.ellipsoid.innerRadii.getValue(date)).toEqual(new Cartesian3(21988, 44373, 36013));
+            expect(e.ellipsoid.minimumClock.getValue(date)).toEqual(57589.0);
+            expect(e.ellipsoid.maximumClock.getValue(date)).toEqual(24940.0);
+            expect(e.ellipsoid.minimumCone.getValue(date)).toEqual(54533.0);
+            expect(e.ellipsoid.maximumCone.getValue(date)).toEqual(64532.0);
             expect(e.ellipsoid.heightReference.getValue(date)).toEqual(HeightReference.CLAMP_TO_GROUND);
             expect(e.ellipsoid.fill.getValue(date)).toEqual(true);
             expect(e.ellipsoid.material.color.getValue(date)).toEqual(Color.fromBytes(202, 67, 110, 69));
@@ -6160,6 +6165,11 @@ describe('DataSources/CzmlDataSource', function() {
             expect(e.ellipse.zIndex.getValue(date)).toEqual(constant.ellipse.zIndex.getValue(date));
             expect(e.ellipsoid.show.getValue(date)).toEqual(constant.ellipsoid.show.getValue(date));
             expect(e.ellipsoid.radii.getValue(date)).toEqual(constant.ellipsoid.radii.getValue(date));
+            expect(e.ellipsoid.innerRadii.getValue(date)).toEqual(constant.ellipsoid.innerRadii.getValue(date));
+            expect(e.ellipsoid.minimumClock.getValue(date)).toEqual(constant.ellipsoid.minimumClock.getValue(date));
+            expect(e.ellipsoid.maximumClock.getValue(date)).toEqual(constant.ellipsoid.maximumClock.getValue(date));
+            expect(e.ellipsoid.minimumCone.getValue(date)).toEqual(constant.ellipsoid.minimumCone.getValue(date));
+            expect(e.ellipsoid.maximumCone.getValue(date)).toEqual(constant.ellipsoid.maximumCone.getValue(date));
             expect(e.ellipsoid.heightReference.getValue(date)).toEqual(constant.ellipsoid.heightReference.getValue(date));
             expect(e.ellipsoid.fill.getValue(date)).toEqual(constant.ellipsoid.fill.getValue(date));
             expect(e.ellipsoid.material.color.getValue(date)).toEqual(constant.ellipsoid.material.color.getValue(date));
@@ -6746,6 +6756,16 @@ describe('DataSources/CzmlDataSource', function() {
             expect(e.ellipse.zIndex.getValue(documentStopDate)).toEqual(52730);
             expect(e.ellipsoid.radii.getValue(documentStartDate)).toEqual(new Cartesian3(5183, 10004, 13863));
             expect(e.ellipsoid.radii.getValue(documentStopDate)).toEqual(new Cartesian3(39497, 12186, 45103));
+            expect(e.ellipsoid.innerRadii.getValue(documentStartDate)).toEqual(new Cartesian3(40318, 27037, 59497));
+            expect(e.ellipsoid.innerRadii.getValue(documentStopDate)).toEqual(new Cartesian3(57650, 53729, 12241));
+            expect(e.ellipsoid.minimumClock.getValue(documentStartDate)).toEqual(13484.0);
+            expect(e.ellipsoid.minimumClock.getValue(documentStopDate)).toEqual(2170.0);
+            expect(e.ellipsoid.maximumClock.getValue(documentStartDate)).toEqual(10874.0);
+            expect(e.ellipsoid.maximumClock.getValue(documentStopDate)).toEqual(2968.0);
+            expect(e.ellipsoid.minimumCone.getValue(documentStartDate)).toEqual(54230.0);
+            expect(e.ellipsoid.minimumCone.getValue(documentStopDate)).toEqual(59454.0);
+            expect(e.ellipsoid.maximumCone.getValue(documentStartDate)).toEqual(49077.0);
+            expect(e.ellipsoid.maximumCone.getValue(documentStopDate)).toEqual(26303.0);
             expect(e.ellipsoid.material.color.getValue(documentStartDate)).toEqual(Color.fromBytes(137, 128, 194, 84));
             expect(e.ellipsoid.material.color.getValue(documentStopDate)).toEqual(Color.fromBytes(50, 122, 190, 247));
             expect(e.ellipsoid.outlineColor.getValue(documentStartDate)).toEqual(Color.fromBytes(247, 210, 180, 171));