Merge pull request #5754 from esraerik/czml-properties

Czml properties changed as fillcolor
CesiumGS · Oct 20, 2017 · b561e56 · b561e56
2 parents 5f63315 + 7518543
commit b561e56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/Apps/Sandcastle/gallery/CZML Reference Properties.html b/Apps/Sandcastle/gallery/CZML Reference Properties.html
@@ -10,10 +10,12 @@
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-    require.config({
-        baseUrl : '../../../Source',
-        waitSeconds : 60
-    });
+        if(typeof require === "function") {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
     </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
@@ -38,7 +40,7 @@
         "cartographicDegrees" : [-110.0, 50.0, 0]
     }
 }, {
-    "id" : "outlineColor-reference",
+    "id" : "fillColor-reference",
     "name" : "Referencing Position",
     "description" : "<p>For more examples of reference properties, see CZML Polygon - Interpolating References.</p>",
     "billboard" : {
@@ -62,11 +64,11 @@
         "text" : "referencing position"
     },
     "position" : {
-          "reference" : "position-reference#position"
+        "reference" : "position-reference#position"
     }
 }, {
     "id" : "polygon",
-    "name" : "Referencing Outline Color",
+    "name" : "Referencing Fill Color",
     "description" : "<p>For more examples of reference properties, see CZML Polygon - Interpolating References.</p>",
     "label" : {
         "fillColor" : {
@@ -78,7 +80,7 @@
             "cartesian2" : [20, 0]
         },
         "style" : "FILL_AND_OUTLINE",
-        "text" : "referencing outlineColor"
+        "text" : "referencing fillColor"
     },
     "position" : {
         "cartographicDegrees" : [-105, 35, 0]
@@ -94,17 +96,18 @@
             ]
         },
         "height" : 0,
-        "outline" : true,
-        "outlineColor" : {
-            "reference" : "outlineColor-reference#label.outlineColor"
-        },
-        "outlineWidth" : 5
+        "material" : {
+            "solidColor" : {
+               "color" : {
+                   "reference" : "fillColor-reference#label.outlineColor"
+                }
+            }
+        }
     }
 }];
 
 var viewer = new Cesium.Viewer('cesiumContainer');
 viewer.dataSources.add(Cesium.CzmlDataSource.load(czml));
-
   //Sandcastle_End
     Sandcastle.finishedLoading();
 }

diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,7 @@ Change Log
 * Fixed a bug that caused KML ground overlays to appear distorted when rotation was applied. [#5914](https://github.com/AnalyticalGraphicsInc/cesium/issues/5914)
 * Adds `invertClassification` and `invertClassificationColor` to `Scene`. When `invertClassification` is `true`, any 3D Tiles geometry that is not classified by a `ClassificationPrimitive` or `GroundPrimitive` will have its color multiplied by `invertClassificationColor`. [#5836](https://github.com/AnalyticalGraphicsInc/cesium/pull/5836)
 * Added `customTags` property to the UrlTemplateImageryProvider to allow custom keywords in the template URL. [#5696](https://github.com/AnalyticalGraphicsInc/cesium/pull/5696)
+* Improved CZML Reference Properties example [#5754](https://github.com/AnalyticalGraphicsInc/cesium/pull/5754)
 
 ### 1.38 - 2017-10-02