CesiumGS · mramato · May 22, 2018 · Mar 22, 2018 · Mar 22, 2018 · Mar 22, 2018
diff --git a/Apps/Sandcastle/gallery/Ordering Geometry.html b/Apps/Sandcastle/gallery/Ordering Geometry.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Draw a rectangle or extruded rectangle that conforms to the surface of the globe.">
+    <meta name="cesium-sandcastle-labels" content="Geometries">
+    <title>Cesium Demo</title>
+    <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">
+        if(typeof require === "function") {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
+    </script>
+</head>
+<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin
+var viewer = new Cesium.Viewer('cesiumContainer');
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-110.0, 20.0, -100.5, 30.0),
+        material : Cesium.Color.RED,
+        zIndex: 1
+    }
+});
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-112.0, 25.0, -102.5, 35.0),
+        material : Cesium.Color.GREEN,
+        zIndex: 2
+    }
+});
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-110.0, 31.0, -100.5, 41.0),
+        material : Cesium.Color.BLUE,
+        zIndex: 3
+    }
+});
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-99.5, 20.0, -90.0, 30.0),
+        material : Cesium.Color.RED,
+        zIndex: 3
+    }
+});
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-97.5, 25.0, -88.0, 35.0),
+        material : Cesium.Color.GREEN,
+        zIndex: 2
+    }
+});
+
+viewer.entities.add({
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-99.5, 31.0, -90.0, 41.0),
+        material : Cesium.Color.BLUE,
+        zIndex: 1
+    }
+});
+
+viewer.zoomTo(viewer.entities);
+//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Source/Core/oneTimeWarning.js b/Source/Core/oneTimeWarning.js
@@ -47,5 +47,7 @@ define([
 
     oneTimeWarning.geometryOutlines = 'Entity geometry outlines are unsupported on terrain. Outlines will be disabled. To enable outlines, disable geometry terrain clamping by explicitly setting height to 0.';
 
+    oneTimeWarning.geometryZIndex = 'Entity geometry with zIndex are unsupported when the entity is dynamic, or height or extrudedHeight are defined.  zIndex will be ignored';
+
     return oneTimeWarning;
 });
diff --git a/Source/DataSources/BoxGeometryUpdater.js b/Source/DataSources/BoxGeometryUpdater.js
@@ -64,6 +64,8 @@ define([
             geometryPropertyName : 'box',
             observedPropertyNames : ['availability', 'position', 'orientation', 'box']
         });
+
+        this._onEntityPropertyChanged(entity, 'box', entity.box, undefined);
     }
 
     if (defined(Object.create)) {

diff --git a/Source/DataSources/CorridorGeometryUpdater.js b/Source/DataSources/CorridorGeometryUpdater.js
@@ -16,6 +16,7 @@ define([
         './ColorMaterialProperty',
         './DynamicGeometryUpdater',
         './GeometryUpdater',
+        './GroundGeometryUpdater',
         './Property'
     ], function(
         Check,
@@ -35,6 +36,7 @@ define([
         ColorMaterialProperty,
         DynamicGeometryUpdater,
         GeometryUpdater,
+        GroundGeometryUpdater,
         Property) {
     'use strict';
 
@@ -61,17 +63,19 @@ define([
      * @param {Scene} scene The scene where visualization is taking place.
      */
     function CorridorGeometryUpdater(entity, scene) {
-        GeometryUpdater.call(this, {
+        GroundGeometryUpdater.call(this, {
             entity : entity,
             scene : scene,
             geometryOptions : new CorridorGeometryOptions(entity),
             geometryPropertyName : 'corridor',
             observedPropertyNames : ['availability', 'corridor']
         });
+
+        this._onEntityPropertyChanged(entity, 'corridor', entity.corridor, undefined);
     }
 
     if (defined(Object.create)) {
-        CorridorGeometryUpdater.prototype = Object.create(GeometryUpdater.prototype);
+        CorridorGeometryUpdater.prototype = Object.create(GroundGeometryUpdater.prototype);
         CorridorGeometryUpdater.prototype.constructor = CorridorGeometryUpdater;
     }
 

diff --git a/Source/DataSources/CorridorGraphics.js b/Source/DataSources/CorridorGraphics.js
@@ -39,6 +39,7 @@ define([
      * @param {Property} [options.granularity=Cesium.Math.RADIANS_PER_DEGREE] A numeric Property specifying the distance between each latitude and longitude.
      * @param {Property} [options.shadows=ShadowMode.DISABLED] An enum Property specifying whether the corridor casts or receives shadows from each light source.
      * @param {Property} [options.distanceDisplayCondition] A Property specifying at what distance from the camera that this corridor will be displayed.
+     * @param {ConstantProperty} [options.zIndex] A Property specifying the zIndex of the corridor, used for ordering.  Only has an effect if height and extrudedHeight are undefined, and if the corridor is static.
      *
      * @see Entity
      * @demo {@link https://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=Corridor.html|Cesium Sandcastle Corridor Demo}
@@ -74,6 +75,8 @@ define([
         this._distanceDisplayConditionSubscription = undefined;
         this._classificationType = undefined;
         this._classificationTypeSubscription = undefined;
+        this._zIndex = undefined;
+        this._zIndexSubscription = undefined;
         this._definitionChanged = new Event();
 
         this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
@@ -209,7 +212,15 @@ define([
          * @type {Property}
          * @default ClassificationType.BOTH
          */
-        classificationType : createPropertyDescriptor('classificationType')
+        classificationType : createPropertyDescriptor('classificationType'),
+
+        /**
+         * Gets or sets the zIndex Property specifying the ordering of the corridor.  Only has an effect if the coridor is static and neither height or exturdedHeight are specified.
+         * @memberof CorridorGraphics.prototype
+         * @type {ConstantProperty}
+         * @default 0
+         */
+        zIndex: createPropertyDescriptor('zIndex')
     });
 
     /**
@@ -237,6 +248,7 @@ define([
         result.shadows = this.shadows;
         result.distanceDisplayCondition = this.distanceDisplayCondition;
         result.classificationType = this.classificationType;
+        result.zIndex = this.zIndex;
         return result;
     };
 
@@ -268,6 +280,7 @@ define([
         this.shadows = defaultValue(this.shadows, source.shadows);
         this.distanceDisplayCondition = defaultValue(this.distanceDisplayCondition, source.distanceDisplayCondition);
         this.classificationType = defaultValue(this.classificationType, source.classificationType);
+        this.zIndex = defaultValue(this.zIndex, source.zIndex);
     };
 
     return CorridorGraphics;

diff --git a/Source/DataSources/CylinderGeometryUpdater.js b/Source/DataSources/CylinderGeometryUpdater.js
@@ -68,6 +68,8 @@ define([
             geometryPropertyName: 'cylinder',
             observedPropertyNames: ['availability', 'position', 'orientation', 'cylinder']
         });
+
+        this._onEntityPropertyChanged(entity, 'cylinder', entity.cylinder, undefined);
     }
 
     if (defined(Object.create)) {

diff --git a/Source/DataSources/EllipseGeometryUpdater.js b/Source/DataSources/EllipseGeometryUpdater.js
@@ -16,6 +16,7 @@ define([
         './ColorMaterialProperty',
         './DynamicGeometryUpdater',
         './GeometryUpdater',
+        './GroundGeometryUpdater',
         './Property'
     ], function(
         Check,
@@ -35,6 +36,7 @@ define([
         ColorMaterialProperty,
         DynamicGeometryUpdater,
         GeometryUpdater,
+        GroundGeometryUpdater,
         Property) {
     'use strict';
 
@@ -64,17 +66,19 @@ define([
      * @param {Scene} scene The scene where visualization is taking place.
      */
     function EllipseGeometryUpdater(entity, scene) {
-        GeometryUpdater.call(this, {
+        GroundGeometryUpdater.call(this, {
             entity : entity,
             scene : scene,
             geometryOptions : new EllipseGeometryOptions(entity),
             geometryPropertyName : 'ellipse',
             observedPropertyNames : ['availability', 'position', 'ellipse']
         });
+
+        this._onEntityPropertyChanged(entity, 'ellipse', entity.ellipse, undefined);
     }
 
     if (defined(Object.create)) {
-        EllipseGeometryUpdater.prototype = Object.create(GeometryUpdater.prototype);
+        EllipseGeometryUpdater.prototype = Object.create(GroundGeometryUpdater.prototype);
         EllipseGeometryUpdater.prototype.constructor = EllipseGeometryUpdater;
     }
 

diff --git a/Source/DataSources/EllipseGraphics.js b/Source/DataSources/EllipseGraphics.js
@@ -42,6 +42,7 @@ define([
      * @param {Property} [options.granularity=Cesium.Math.RADIANS_PER_DEGREE] A numeric Property specifying the angular distance between points on the ellipse.
      * @param {Property} [options.shadows=ShadowMode.DISABLED] An enum Property specifying whether the ellipse casts or receives shadows from each light source.
      * @param {Property} [options.distanceDisplayCondition] A Property specifying at what distance from the camera that this ellipse will be displayed.
+     * @param {ConstantProperty} [options.zIndex=0] A property specifying the zIndex of the Ellipse.  Used for ordering ground geometry.  Only has an effect if the ellipse is constant and neither height or exturdedHeight are specified.
      *
      * @demo {@link https://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=Circles and Ellipses.html|Cesium Sandcastle Circles and Ellipses Demo}
      */
@@ -80,6 +81,8 @@ define([
         this._distanceDisplayConditionSubscription = undefined;
         this._classificationType = undefined;
         this._classificationTypeSubscription = undefined;
+        this._zIndex = undefined;
+        this._zIndexSubscription = undefined;
         this._definitionChanged = new Event();
 
         this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
@@ -231,7 +234,15 @@ define([
          * @type {Property}
          * @default ClassificationType.BOTH
          */
-        classificationType : createPropertyDescriptor('classificationType')
+        classificationType : createPropertyDescriptor('classificationType'),
+
+        /**
+         * Gets or sets the zIndex Property specifying the ellipse ordering.  Only has an effect if the ellipse is constant and neither height or extrudedHeight are specified
+         * @memberof EllipseGraphics.prototype
+         * @type {ConstantProperty}
+         * @default 0
+         */
+        zIndex : createPropertyDescriptor('zIndex')
     });
 
     /**
@@ -261,6 +272,7 @@ define([
         result.shadows = this.shadows;
         result.distanceDisplayCondition = this.distanceDisplayCondition;
         result.classificationType = this.classificationType;
+        result.zIndex = this.zIndex;
         return result;
     };
 
@@ -294,6 +306,7 @@ define([
         this.shadows = defaultValue(this.shadows, source.shadows);
         this.distanceDisplayCondition = defaultValue(this.distanceDisplayCondition, source.distanceDisplayCondition);
         this.classificationType = defaultValue(this.classificationType, source.classificationType);
+        this.zIndex = defaultValue(this.zIndex, source.zIndex);
     };
 
     return EllipseGraphics;

diff --git a/Source/DataSources/EllipsoidGeometryUpdater.js b/Source/DataSources/EllipsoidGeometryUpdater.js
@@ -81,7 +81,7 @@ define([
             observedPropertyNames : ['availability', 'position', 'orientation', 'ellipsoid']
         });
 
-        this._isClosed = true;
+        this._onEntityPropertyChanged(entity, 'ellipsoid', entity.ellipsoid, undefined);
     }
 
     if (defined(Object.create)) {

diff --git a/Source/DataSources/GeometryUpdater.js b/Source/DataSources/GeometryUpdater.js
@@ -44,8 +44,7 @@ define([
     var defaultClassificationType = new ConstantProperty(ClassificationType.BOTH);
 
     /**
-     * A {@link GeometryUpdater} for boxes.
-     * Clients do not normally create this class directly, but instead rely on {@link DataSourceDisplay}.
+     * An abstract class for updating geometry entites.
      * @alias GeometryUpdater
      * @constructor
      *
@@ -88,8 +87,6 @@ define([
         this._geometryPropertyName = geometryPropertyName;
         this._id = geometryPropertyName + '-' + entity.id;
         this._observedPropertyNames = options.observedPropertyNames;
-
-        this._onEntityPropertyChanged(entity, geometryPropertyName, entity[geometryPropertyName], undefined);
     }
 
     defineProperties(GeometryUpdater.prototype, {