cesium 1.23.0 → 1.24.0

data/app/assets/javascripts/Cesium/Core/RectangleGeometry.js

@@ -630,6 +630,8 @@ define([
      * @param {RectangleGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     RectangleGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -664,6 +666,8 @@ define([
         array[startingIndex++] = value._extrude ? 1.0 : 0.0;
         array[startingIndex++] = value._closeTop ? 1.0 : 0.0;
         array[startingIndex]   = value._closeBottom ? 1.0 : 0.0;
+
+        return array;
     };
 
     var scratchRectangle = new Rectangle();

data/app/assets/javascripts/Cesium/Core/RectangleOutlineGeometry.js

@@ -230,6 +230,8 @@ define([
      * @param {RectangleOutlineGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     RectangleOutlineGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -255,6 +257,8 @@ define([
         array[startingIndex++] = value._rotation;
         array[startingIndex++] = defined(value._extrudedHeight) ? 1.0 : 0.0;
         array[startingIndex] = defaultValue(value._extrudedHeight, 0.0);
+
+        return array;
     };
 
     var scratchRectangle = new Rectangle();

data/app/assets/javascripts/Cesium/Core/SimplePolylineGeometry.js

@@ -143,6 +143,8 @@ define([
      * @param {SimplePolylineGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     SimplePolylineGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -180,6 +182,8 @@ define([
         array[startingIndex++] = value._colorsPerVertex ? 1.0 : 0.0;
         array[startingIndex++] = value._followSurface ? 1.0 : 0.0;
         array[startingIndex]   = value._granularity;
+
+        return array;
     };
 
     /**

data/app/assets/javascripts/Cesium/Core/SphereGeometry.js

@@ -65,6 +65,8 @@ define([
      * @param {SphereGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     SphereGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -73,7 +75,7 @@ define([
         }
         //>>includeEnd('debug');
 
-        EllipsoidGeometry.pack(value._ellipsoidGeometry, array, startingIndex);
+        return EllipsoidGeometry.pack(value._ellipsoidGeometry, array, startingIndex);
     };
 
     var scratchEllipsoidGeometry = new EllipsoidGeometry();

data/app/assets/javascripts/Cesium/Core/SphereOutlineGeometry.js

@@ -63,6 +63,8 @@ define([
      * @param {SphereOutlineGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     SphereOutlineGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -71,7 +73,7 @@ define([
         }
         //>>includeEnd('debug');
 
-        EllipsoidOutlineGeometry.pack(value._ellipsoidGeometry, array, startingIndex);
+        return EllipsoidOutlineGeometry.pack(value._ellipsoidGeometry, array, startingIndex);
     };
 
     var scratchEllipsoidGeometry = new EllipsoidOutlineGeometry();

data/app/assets/javascripts/Cesium/Core/VertexFormat.js

@@ -227,6 +227,8 @@ define([
      * @param {VertexFormat} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     VertexFormat.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -246,6 +248,8 @@ define([
         array[startingIndex++] = value.binormal ? 1.0 : 0.0;
         array[startingIndex++] = value.tangent ? 1.0 : 0.0;
         array[startingIndex++] = value.color ? 1.0 : 0.0;
+
+        return array;
     };
 
     /**

data/app/assets/javascripts/Cesium/Core/WallGeometry.js

@@ -133,6 +133,8 @@ define([
      * @param {WallGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     WallGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -183,6 +185,8 @@ define([
         startingIndex += VertexFormat.packedLength;
 
         array[startingIndex] = value._granularity;
+
+        return array;
     };
 
     var scratchEllipsoid = Ellipsoid.clone(Ellipsoid.UNIT_SPHERE);

data/app/assets/javascripts/Cesium/Core/WallOutlineGeometry.js

@@ -120,6 +120,8 @@ define([
      * @param {WallOutlineGeometry} value The value to pack.
      * @param {Number[]} array The array to pack into.
      * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+     *
+     * @returns {Number[]} The array that was packed into
      */
     WallOutlineGeometry.pack = function(value, array, startingIndex) {
         //>>includeStart('debug', pragmas.debug);
@@ -167,6 +169,8 @@ define([
         startingIndex += Ellipsoid.packedLength;
 
         array[startingIndex]   = value._granularity;
+
+        return array;
     };
 
     var scratchEllipsoid = Ellipsoid.clone(Ellipsoid.UNIT_SPHERE);

data/app/assets/javascripts/Cesium/DataSources/BillboardGraphics.js

@@ -36,7 +36,7 @@ define([
      * @param {Property} [options.eyeOffset=Cartesian3.ZERO] A {@link Cartesian3} Property specifying the eye offset.
      * @param {Property} [options.pixelOffset=Cartesian2.ZERO] A {@link Cartesian2} Property specifying the pixel offset.
      * @param {Property} [options.rotation=0] A numeric Property specifying the rotation about the alignedAxis.
-     * @param {Property} [options.alignedAxis=Cartesian3.ZERO] A {@link Cartesian3} Property specifying the axis of rotation.
+     * @param {Property} [options.alignedAxis=Cartesian3.ZERO] A {@link Cartesian3} Property specifying the unit vector axis of rotation.
      * @param {Property} [options.width] A numeric Property specifying the width of the billboard in pixels, overriding the native size.
      * @param {Property} [options.height] A numeric Property specifying the height of the billboard in pixels, overriding the native size.
      * @param {Property} [options.color=Color.WHITE] A Property specifying the tint {@link Color} of the image.
@@ -146,7 +146,7 @@ define([
         rotation : createPropertyDescriptor('rotation'),
 
         /**
-         * Gets or sets the {@link Cartesian3} Property specifying the axis of rotation
+         * Gets or sets the {@link Cartesian3} Property specifying the unit vector axis of rotation
          * in the fixed frame. When set to Cartesian3.ZERO the rotation is from the top of the screen.
          * @memberof BillboardGraphics.prototype
          * @type {Property}

data/app/assets/javascripts/Cesium/DataSources/CzmlDataSource.js

@@ -79,6 +79,7 @@ define([
         './StripeOrientation',
         './TimeIntervalCollectionPositionProperty',
         './TimeIntervalCollectionProperty',
+        './VelocityVectorProperty',
         './WallGraphics'
     ], function(
         BoundingRectangle,
@@ -160,6 +161,7 @@ define([
         StripeOrientation,
         TimeIntervalCollectionPositionProperty,
         TimeIntervalCollectionProperty,
+        VelocityVectorProperty,
         WallGraphics) {
     'use strict';
 
@@ -1089,6 +1091,18 @@ define([
         iso8601 : undefined
     };
 
+    function processAlignedAxis(billboard, packetData, interval, sourceUri, entityCollection) {
+        if (!defined(packetData)) {
+            return;
+        }
+
+        if (defined(packetData.velocityReference)) {
+            billboard.alignedAxis = new VelocityVectorProperty(makeReference(entityCollection, packetData.velocityReference), true);
+        } else {
+            processPacketData(Cartesian3, billboard, 'alignedAxis', packetData, interval, sourceUri, entityCollection);
+        }
+    }
+
     function processBillboard(entity, packet, entityCollection, sourceUri) {
         var billboardData = packet.billboard;
         if (!defined(billboardData)) {
@@ -1117,7 +1131,7 @@ define([
         processPacketData(HeightReference, billboard, 'heightReference', billboardData.heightReference, interval, sourceUri, entityCollection);
         processPacketData(Color, billboard, 'color', billboardData.color, interval, sourceUri, entityCollection);
         processPacketData(Rotation, billboard, 'rotation', billboardData.rotation, interval, sourceUri, entityCollection);
-        processPacketData(Cartesian3, billboard, 'alignedAxis', billboardData.alignedAxis, interval, sourceUri, entityCollection);
+        processAlignedAxis(billboard, billboardData.alignedAxis, interval, sourceUri, entityCollection);
         processPacketData(Boolean, billboard, 'sizeInMeters', billboardData.sizeInMeters, interval, sourceUri, entityCollection);
         processPacketData(Number, billboard, 'width', billboardData.width, interval, sourceUri, entityCollection);
         processPacketData(Number, billboard, 'height', billboardData.height, interval, sourceUri, entityCollection);
@@ -1343,7 +1357,7 @@ define([
         if (!defined(label)) {
             entity.label = label = new LabelGraphics();
         }
-        
+
         processPacketData(Boolean, label, 'show', labelData.show, interval, sourceUri, entityCollection);
         processPacketData(String, label, 'text', labelData.text, interval, sourceUri, entityCollection);
         processPacketData(String, label, 'font', labelData.font, interval, sourceUri, entityCollection);
@@ -1495,12 +1509,12 @@ define([
 
         processPacketData(Boolean, point, 'show', pointData.show, interval, sourceUri, entityCollection);
         processPacketData(Number, point, 'pixelSize', pointData.pixelSize, interval, sourceUri, entityCollection);
+        processPacketData(HeightReference, point, 'heightReference', pointData.heightReference, interval, sourceUri, entityCollection);
         processPacketData(Color, point, 'color', pointData.color, interval, sourceUri, entityCollection);
         processPacketData(Color, point, 'outlineColor', pointData.outlineColor, interval, sourceUri, entityCollection);
         processPacketData(Number, point, 'outlineWidth', pointData.outlineWidth, interval, sourceUri, entityCollection);
         processPacketData(NearFarScalar, point, 'scaleByDistance', pointData.scaleByDistance, interval, sourceUri, entityCollection);
         processPacketData(NearFarScalar, point, 'translucencyByDistance', pointData.translucencyByDistance, interval, sourceUri, entityCollection);
-        processPacketData(HeightReference, point, 'heightReference', pointData.heightReference, interval, sourceUri, entityCollection);
     }
 
     function processPolygon(entity, packet, entityCollection, sourceUri) {

data/app/assets/javascripts/Cesium/DataSources/Rotation.js

@@ -34,7 +34,7 @@ define([
      * //a SampledProperty(Number) instead.  Note, the actual
      * //return value is in radians, not degrees.
      * property.getValue(time2);
-     * 
+     *
      * @see PackableForInterpolation
      */
     var Rotation = {
@@ -50,6 +50,8 @@ define([
          * @param {Rotation} value The value to pack.
          * @param {Number[]} array The array to pack into.
          * @param {Number} [startingIndex=0] The index into the array at which to start packing the elements.
+         *
+         * @returns {Number[]} The array that was packed into
          */
         pack : function(value, array, startingIndex) {
             //>>includeStart('debug', pragmas.debug);
@@ -64,6 +66,8 @@ define([
 
             startingIndex = defaultValue(startingIndex, 0);
             array[startingIndex] = value;
+
+            return array;
         },
 
         /**

data/app/assets/javascripts/Cesium/DataSources/StaticGeometryPerMaterialBatch.js

@@ -68,10 +68,8 @@ define([
 
     Batch.prototype.remove = function(updater) {
         var id = updater.entity.id;
-        var createPrimitive = this.updaters.remove(id);
-
-        if (createPrimitive) {
-            this.geometry.remove(id);
+        this.createPrimitive = this.geometry.remove(id) || this.createPrimitive;
+        if (this.updaters.remove(id)) {
             this.updatersWithAttributes.remove(id);
             var unsubscribe = this.subscriptions.get(id);
             if (defined(unsubscribe)) {
@@ -79,8 +77,7 @@ define([
                 this.subscriptions.remove(id);
             }
         }
-        this.createPrimitive = createPrimitive;
-        return createPrimitive;
+        return this.createPrimitive;
     };
 
     Batch.prototype.update = function(time) {

data/app/assets/javascripts/Cesium/DataSources/VelocityOrientationProperty.js

@@ -49,7 +49,7 @@ define([
      * }));
      */
     function VelocityOrientationProperty(position, ellipsoid) {
-        this._velocityVectorProperty = new VelocityVectorProperty(position);
+        this._velocityVectorProperty = new VelocityVectorProperty(position, true);
         this._subscription = undefined;
         this._ellipsoid = undefined;
         this._definitionChanged = new Event();

data/app/assets/javascripts/Cesium/DataSources/VelocityVectorProperty.js

@@ -27,6 +27,7 @@ define([
      * @constructor
      *
      * @param {Property} [position] The position property used to compute the velocity.
+     * @param {Boolean} [normalize=true] Whether to normalize the computed velocity vector.
      *
      * @example
      * //Create an entity with a billboard rotated to match its velocity.
@@ -36,14 +37,15 @@ define([
      *   position : position,
      *   billboard : {
      *     image : 'image.png',
-     *     alignedAxis : new Cesium.VelocityVectorProperty(position)
+     *     alignedAxis : new Cesium.VelocityVectorProperty(position, true) // alignedAxis must be a unit vector
      *   }
      * }));
      */
-    function VelocityVectorProperty(position) {
+    function VelocityVectorProperty(position, normalize) {
         this._position = undefined;
         this._subscription = undefined;
         this._definitionChanged = new Event();
+        this._normalize = defaultValue(normalize, true);
 
         this.position = position;
     }
@@ -74,7 +76,7 @@ define([
             }
         },
         /**
-         * Gets or sets the position property used to compute orientation.
+         * Gets or sets the position property used to compute the velocity vector.
          * @memberof VelocityVectorProperty.prototype
          *
          * @type {Property}
@@ -101,12 +103,31 @@ define([
                     this._definitionChanged.raiseEvent(this);
                 }
             }
+        },
+        /**
+         * Gets or sets whether the vector produced by this property
+         * will be normalized or not.
+         * @memberof VelocityVectorProperty.prototype
+         *
+         * @type {Boolean}
+         */
+        normalize : {
+            get : function() {
+                return this._normalize;
+            },
+            set : function(value) {
+                if (this._normalize === value) {
+                    return;
+                }
+
+                this._normalize = value;
+                this._definitionChanged.raiseEvent(this);
+            }
         }
     });
 
     var position1Scratch = new Cartesian3();
     var position2Scratch = new Cartesian3();
-    var velocityScratch = new Cartesian3();
     var timeScratch = new JulianDate();
     var step = 1.0 / 60.0;
 
@@ -137,7 +158,7 @@ define([
 
         var property = this._position;
         if (Property.isConstant(property)) {
-            return undefined;
+            return this._normalize ? undefined : Cartesian3.clone(Cartesian3.ZERO, velocityResult);
         }
 
         var position1 = property.getValue(time, position1Scratch);
@@ -159,15 +180,19 @@ define([
         }
 
         if (Cartesian3.equals(position1, position2)) {
-            return undefined;
+            return this._normalize ? undefined : Cartesian3.clone(Cartesian3.ZERO, velocityResult);
         }
 
         if (defined(positionResult)) {
             position1.clone(positionResult);
         }
 
-        var velocity = Cartesian3.subtract(position2, position1, velocityScratch);
-        return Cartesian3.normalize(velocity, velocityResult);
+        var velocity = Cartesian3.subtract(position2, position1, velocityResult);
+        if (this._normalize) {
+            return Cartesian3.normalize(velocity, velocityResult);
+        } else {
+            return Cartesian3.divideByScalar(velocity, step, velocityResult);
+        }
     };
 
     /**

data/app/assets/javascripts/Cesium/Scene/Scene.js

@@ -2140,7 +2140,7 @@ define([
         var shadowMaps = frameState.shadowMaps;
         var length = shadowMaps.length;
 
-        frameState.shadowHints.shadowsEnabled = (length > 0) && !frameState.passes.pick;
+        frameState.shadowHints.shadowsEnabled = (length > 0) && !frameState.passes.pick && (scene.mode === SceneMode.SCENE3D);
         if (!frameState.shadowHints.shadowsEnabled) {
             return;
         }

data/app/assets/javascripts/Cesium/Scene/UrlTemplateImageryProvider.js

@@ -89,6 +89,19 @@ define([
      *     <li><code>{latitudeProjected}</code>: The latitude of the picked position in the projected coordinates of the tiling scheme.</li>
      *     <li><code>{format}</code>: The format in which to get feature information, as specified in the {@link GetFeatureInfoFormat}.</li>
      * </ul>
+     * @param {Object} [options.urlSchemeZeroPadding] Gets the URL scheme zero padding for each tile coordinate. The format is '000' where
+     * each coordinate will be padded on the left with zeros to match the width of the passed string of zeros. e.g. Setting:
+     * urlSchemeZeroPadding : { '{x}' : '0000'}
+     * will cause an 'x' value of 12 to return the string '0012' for {x} in the generated URL.
+     * It the passed object has the following keywords:
+     * <ul>
+     *  <li> <code>{z}</code>: The zero padding for the level of the tile in the tiling scheme.</li>
+     *  <li> <code>{x}</code>: The zero padding for the tile X coordinate in the tiling scheme.</li>
+     *  <li> <code>{y}</code>: The zero padding for the the tile Y coordinate in the tiling scheme.</li>
+     *  <li> <code>{reverseX}</code>: The zero padding for the tile reverseX coordinate in the tiling scheme.</li>
+     *  <li> <code>{reverseY}</code>: The zero padding for the tile reverseY coordinate in the tiling scheme.</li>
+     *  <li> <code>{reverseZ}</code>: The zero padding for the reverseZ coordinate of the tile in the tiling scheme.</li>
+     * </ul>
      * @param {String|String[]} [options.subdomains='abc'] The subdomains to use for the <code>{s}</code> placeholder in the URL template.
      *                          If this parameter is a single string, each character in the string is a subdomain.  If it is
      *                          an array, each element in the array is a subdomain.
@@ -170,6 +183,7 @@ define([
         this._errorEvent = new Event();
 
         this._url = undefined;
+        this._urlSchemeZeroPadding = undefined;
         this._pickFeaturesUrl = undefined;
         this._proxy = undefined;
         this._tileWidth = undefined;
@@ -229,6 +243,31 @@ define([
             }
         },
 
+        /**
+         * Gets the URL scheme zero padding for each tile coordinate. The format is '000' where each coordinate will be padded on
+         * the left with zeros to match the width of the passed string of zeros. e.g. Setting:
+         * urlSchemeZeroPadding : { '{x}' : '0000'}
+         * will cause an 'x' value of 12 to return the string '0012' for {x} in the generated URL.
+         * It has the following keywords:
+         * <ul>
+         *  <li> <code>{z}</code>: The zero padding for the level of the tile in the tiling scheme.</li>
+         *  <li> <code>{x}</code>: The zero padding for the tile X coordinate in the tiling scheme.</li>
+         *  <li> <code>{y}</code>: The zero padding for the the tile Y coordinate in the tiling scheme.</li>
+         *  <li> <code>{reverseX}</code>: The zero padding for the tile reverseX coordinate in the tiling scheme.</li>
+         *  <li> <code>{reverseY}</code>: The zero padding for the tile reverseY coordinate in the tiling scheme.</li>
+         *  <li> <code>{reverseZ}</code>: The zero padding for the reverseZ coordinate of the tile in the tiling scheme.</li>
+         * </ul>
+         * @memberof UrlTemplateImageryProvider.prototype
+         * @type {Object}
+         * @readonly
+         */
+        urlSchemeZeroPadding : {
+            get : function() {
+                return this._urlSchemeZeroPadding;
+            }
+        },
+
+
         /**
          * Gets the URL template to use to use to pick features.  If this property is not specified,
          * {@link UrlTemplateImageryProvider#pickFeatures} will immediately returned undefined, indicating no
@@ -502,6 +541,7 @@ define([
             //>>includeEnd('debug');
             that.enablePickFeatures = defaultValue(properties.enablePickFeatures, that.enablePickFeatures);
             that._url = properties.url;
+            that._urlSchemeZeroPadding = defaultValue(properties.urlSchemeZeroPadding, that.urlSchemeZeroPadding);
             that._pickFeaturesUrl = properties.pickFeaturesUrl;
             that._proxy = properties.proxy;
             that._tileDiscardPolicy = properties.tileDiscardPolicy;
@@ -717,29 +757,48 @@ define([
         return parts;
     }
 
+    function padWithZerosIfNecessary(imageryProvider, key, value) {
+        if (imageryProvider &&
+            imageryProvider.urlSchemeZeroPadding &&
+            imageryProvider.urlSchemeZeroPadding.hasOwnProperty(key) )
+        {
+            var paddingTemplate = imageryProvider.urlSchemeZeroPadding[key];
+            if (typeof paddingTemplate === 'string') {
+                var paddingTemplateWidth = paddingTemplate.length;
+                if (paddingTemplateWidth > 1) {
+                    value = (value.length >= paddingTemplateWidth) ? value : new Array(paddingTemplateWidth - value.toString().length + 1).join('0') + value;
+                }
+            }
+        }
+        return value;
+    }
+
     function xTag(imageryProvider, x, y, level) {
-        return x;
+        return padWithZerosIfNecessary(imageryProvider, '{x}', x);
     }
 
     function reverseXTag(imageryProvider, x, y, level) {
-        return imageryProvider.tilingScheme.getNumberOfXTilesAtLevel(level) - x - 1;
+        var reverseX = imageryProvider.tilingScheme.getNumberOfXTilesAtLevel(level) - x - 1;
+        return padWithZerosIfNecessary(imageryProvider, '{reverseX}', reverseX);
     }
 
     function yTag(imageryProvider, x, y, level) {
-        return y;
+        return padWithZerosIfNecessary(imageryProvider, '{y}', y);
     }
 
     function reverseYTag(imageryProvider, x, y, level) {
-        return imageryProvider.tilingScheme.getNumberOfYTilesAtLevel(level) - y - 1;
+        var reverseY = imageryProvider.tilingScheme.getNumberOfYTilesAtLevel(level) - y - 1;
+        return padWithZerosIfNecessary(imageryProvider, '{reverseY}', reverseY);
     }
 
     function reverseZTag(imageryProvider, x, y, level) {
         var maximumLevel = imageryProvider.maximumLevel;
-        return defined(maximumLevel) && level < maximumLevel ? maximumLevel - level - 1 : level;
+        var reverseZ = defined(maximumLevel) && level < maximumLevel ? maximumLevel - level - 1 : level;
+        return padWithZerosIfNecessary(imageryProvider, '{reverseZ}', reverseZ);
     }
 
     function zTag(imageryProvider, x, y, level) {
-        return level;
+        return padWithZerosIfNecessary(imageryProvider, '{z}', level);
     }
 
     function sTag(imageryProvider, x, y, level) {