From ec6eea4db0f12c43778b763b527ad0e0035242fc Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Tue, 3 Jul 2018 11:11:33 +0300 Subject: [PATCH 01/30] Add missing jsdoc tags to Core --- Source/Core/PolylinePipeline.js | 2 ++ Source/Core/Tipsify.js | 1 + Source/Core/defaultValue.js | 1 + 3 files changed, 4 insertions(+) diff --git a/Source/Core/PolylinePipeline.js b/Source/Core/PolylinePipeline.js index 66e745420a09..d1da46883445 100644 --- a/Source/Core/PolylinePipeline.js +++ b/Source/Core/PolylinePipeline.js @@ -201,6 +201,7 @@ define([ /** * Subdivides polyline and raises all points to the specified height. Returns an array of numbers to represent the positions. + * @param {Object} options Object with the following properties: * @param {Cartesian3[]} options.positions The array of type {Cartesian3} representing positions. * @param {Number|Number[]} [options.height=0.0] A number or array of numbers representing the heights of each position. * @param {Number} [options.granularity = CesiumMath.RADIANS_PER_DEGREE] The distance, in radians, between each latitude and longitude. Determines the number of positions in the buffer. @@ -288,6 +289,7 @@ define([ /** * Subdivides polyline and raises all points to the specified height. Returns an array of new {Cartesian3} positions. + * @param {Object} options Object with the following properties: * @param {Cartesian3[]} options.positions The array of type {Cartesian3} representing positions. * @param {Number|Number[]} [options.height=0.0] A number or array of numbers representing the heights of each position. * @param {Number} [options.granularity = CesiumMath.RADIANS_PER_DEGREE] The distance, in radians, between each latitude and longitude. Determines the number of positions in the buffer. diff --git a/Source/Core/Tipsify.js b/Source/Core/Tipsify.js index 2a5350cc62e4..5f618c44fadc 100644 --- a/Source/Core/Tipsify.js +++ b/Source/Core/Tipsify.js @@ -105,6 +105,7 @@ define([ /** * Optimizes triangles for the post-vertex shader cache. * + * @param {Object} options Object with the following properties: * @param {Number[]} options.indices Lists triads of numbers corresponding to the indices of the vertices * in the vertex buffer that define the geometry's triangles. * @param {Number} [options.maximumIndex] The maximum value of the elements in args.indices. diff --git a/Source/Core/defaultValue.js b/Source/Core/defaultValue.js index 0eca91ac6b8e..2ee288343a14 100644 --- a/Source/Core/defaultValue.js +++ b/Source/Core/defaultValue.js @@ -27,6 +27,7 @@ define([ /** * A frozen empty object that can be used as the default value for options passed as * an object literal. + * @type {Object} */ defaultValue.EMPTY_OBJECT = freezeObject({}); From 6ca9c2999556e3de9642a9671924448befd078e0 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Tue, 10 Jul 2018 17:47:42 +0300 Subject: [PATCH 02/30] Add namespace block to aliases in AutomaticUniforms --- Source/Renderer/AutomaticUniforms.js | 62 ++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/Source/Renderer/AutomaticUniforms.js b/Source/Renderer/AutomaticUniforms.js index f75b71423600..9f6a1d1ba4ff 100644 --- a/Source/Renderer/AutomaticUniforms.js +++ b/Source/Renderer/AutomaticUniforms.js @@ -66,6 +66,7 @@ define([ * and w components, respectively. * * @alias czm_viewport + * @namespace * @glslUniform * * @example @@ -99,6 +100,7 @@ define([ * from window coordinates to clip coordinates, and is often used to assign to gl_Position. * * @alias czm_viewportOrthographic + * @namespace * @glslUniform * * @example @@ -137,6 +139,7 @@ define([ * from window coordinates to clip coordinates, and is often used to assign to gl_Position. * * @alias czm_viewportTransformation + * @namespace * @glslUniform * * @example @@ -170,6 +173,7 @@ define([ * @private * * @alias czm_globeDepthTexture + * @namespace * @glslUniform * * @example @@ -193,6 +197,7 @@ define([ * transforms model coordinates to world coordinates. * * @alias czm_model + * @namespace * @glslUniform * * @example @@ -220,6 +225,7 @@ define([ * transforms world coordinates to model coordinates. * * @alias czm_inverseModel + * @namespace * @glslUniform * * @example @@ -246,6 +252,7 @@ define([ * transforms world coordinates to eye coordinates. * * @alias czm_view + * @namespace * @glslUniform * * @example @@ -278,6 +285,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_view3D + * @namespace * @glslUniform * * @example @@ -303,6 +311,7 @@ define([ * transforms vectors in world coordinates to eye coordinates. * * @alias czm_viewRotation + * @namespace * @glslUniform * * @example @@ -333,6 +342,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_viewRotation3D + * @namespace * @glslUniform * * @example @@ -358,6 +368,7 @@ define([ * transforms from eye coordinates to world coordinates. * * @alias czm_inverseView + * @namespace * @glslUniform * * @example @@ -387,6 +398,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_inverseView3D + * @namespace * @glslUniform * * @example @@ -412,6 +424,7 @@ define([ * transforms vectors from eye coordinates to world coordinates. * * @alias czm_inverseViewRotation + * @namespace * @glslUniform * * @example @@ -442,6 +455,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_inverseViewRotation3D + * @namespace * @glslUniform * * @example @@ -468,6 +482,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_projection + * @namespace * @glslUniform * * @example @@ -496,6 +511,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_inverseProjection + * @namespace * @glslUniform * * @example @@ -524,6 +540,7 @@ define([ * are not clipped by the far plane. * * @alias czm_infiniteProjection + * @namespace * @glslUniform * * @example @@ -553,6 +570,7 @@ define([ * normals should be transformed using {@link czm_normal}. * * @alias czm_modelView + * @namespace * @glslUniform * * @example @@ -590,6 +608,7 @@ define([ * normals should be transformed using {@link czm_normal3D}. * * @alias czm_modelView3D + * @namespace * @glslUniform * * @example @@ -619,6 +638,7 @@ define([ * in conjunction with {@link czm_translateRelativeToEye}. * * @alias czm_modelViewRelativeToEye + * @namespace * @glslUniform * * @example @@ -652,6 +672,7 @@ define([ * transforms from eye coordinates to model coordinates. * * @alias czm_inverseModelView + * @namespace * @glslUniform * * @example @@ -680,6 +701,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_inverseModelView3D + * @namespace * @glslUniform * * @example @@ -707,6 +729,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_viewProjection + * @namespace * @glslUniform * * @example @@ -739,6 +762,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_inverseViewProjection + * @namespace * @glslUniform * * @example @@ -765,6 +789,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_modelViewProjection + * @namespace * @glslUniform * * @example @@ -800,6 +825,7 @@ define([ * coordinate system for a vertex shader's gl_Position output. * * @alias czm_inverseModelViewProjection + * @namespace * @glslUniform * * @example @@ -827,6 +853,7 @@ define([ * conjunction with {@link czm_translateRelativeToEye}. * * @alias czm_modelViewProjectionRelativeToEye + * @namespace * @glslUniform * * @example @@ -863,6 +890,7 @@ define([ * proxy geometry to ensure that triangles are not clipped by the far plane. * * @alias czm_modelViewInfiniteProjection + * @namespace * @glslUniform * * @example @@ -893,6 +921,7 @@ define([ * An automatic GLSL uniform that indicates if the current camera is orthographic in 3D. * * @alias czm_orthographicIn3D + * @namespace * @glslUniform * @see UniformState#orthographicIn3D */ @@ -912,6 +941,7 @@ define([ * normals should be transformed using czm_normal. * * @alias czm_normal + * @namespace * @glslUniform * * @example @@ -945,6 +975,7 @@ define([ * normals should be transformed using czm_normal3D. * * @alias czm_normal3D + * @namespace * @glslUniform * * @example @@ -971,6 +1002,7 @@ define([ * the opposite of the transform provided by {@link czm_normal}. * * @alias czm_inverseNormal + * @namespace * @glslUniform * * @example @@ -1003,6 +1035,7 @@ define([ * 2D and Columbus View in the same way that 3D is lit. * * @alias czm_inverseNormal3D + * @namespace * @glslUniform * * @example @@ -1028,6 +1061,7 @@ define([ * of the eye (camera) in the 2D scene in meters. * * @alias czm_eyeHeight2D + * @namespace * @glslUniform * * @see UniformState#eyeHeight2D @@ -1046,6 +1080,7 @@ define([ * frustum used for multi-frustum rendering. * * @alias czm_entireFrustum + * @namespace * @glslUniform * * @example @@ -1072,6 +1107,7 @@ define([ * frustum used for multi-frustum rendering. * * @alias czm_currentFrustum + * @namespace * @glslUniform * * @example @@ -1097,6 +1133,7 @@ define([ * the x, y, z, and w components, respectively. * * @alias czm_frustumPlanes + * @namespace * @glslUniform */ czm_frustumPlanes : new AutomaticUniform({ @@ -1111,6 +1148,7 @@ define([ * The log2 of the current frustums far plane. Used for computing the log depth. * * @alias czm_log2FarDistance + * @namespace * @glslUniform * * @private @@ -1128,6 +1166,7 @@ define([ * This is used when reversing log depth computations. * * @alias czm_log2FarPlusOne + * @namespace * @glslUniform */ czm_log2FarPlusOne : new AutomaticUniform({ @@ -1143,6 +1182,7 @@ define([ * This is used when writing log depth in the fragment shader. * * @alias czm_log2NearDistance + * @namespace * @glslUniform */ czm_log2NearDistance : new AutomaticUniform({ @@ -1157,6 +1197,7 @@ define([ * An automatic GLSL uniform representing the sun position in world coordinates. * * @alias czm_sunPositionWC + * @namespace * @glslUniform * * @example @@ -1179,6 +1220,7 @@ define([ * An automatic GLSL uniform representing the sun position in Columbus view world coordinates. * * @alias czm_sunPositionColumbusView + * @namespace * @glslUniform * * @example @@ -1201,6 +1243,7 @@ define([ * This is commonly used for directional lighting computations. * * @alias czm_sunDirectionEC + * @namespace * @glslUniform * * @example @@ -1227,6 +1270,7 @@ define([ * This is commonly used for directional lighting computations. * * @alias czm_sunDirectionWC + * @namespace * @glslUniform * * @example @@ -1250,6 +1294,7 @@ define([ * This is commonly used for directional lighting computations. * * @alias czm_moonDirectionEC + * @namespace * @glslUniform * * @example @@ -1276,6 +1321,7 @@ define([ * as described in {@link http://blogs.agi.com/insight3d/index.php/2008/09/03/precisions-precisions/|Precisions, Precisions}. * * @alias czm_encodedCameraPositionMCHigh + * @namespace * @glslUniform * * @example @@ -1300,6 +1346,7 @@ define([ * as described in {@link http://blogs.agi.com/insight3d/index.php/2008/09/03/precisions-precisions/|Precisions, Precisions}. * * @alias czm_encodedCameraPositionMCLow + * @namespace * @glslUniform * * @example @@ -1322,6 +1369,7 @@ define([ * An automatic GLSL uniform representing the position of the viewer (camera) in world coordinates. * * @alias czm_viewerPositionWC + * @namespace * @glslUniform * * @example @@ -1341,6 +1389,7 @@ define([ * every frame. * * @alias czm_frameNumber + * @namespace * @glslUniform * * @example @@ -1360,6 +1409,7 @@ define([ * 2D/Columbus View and 3D, with 0.0 being 2D or Columbus View and 1.0 being 3D. * * @alias czm_morphTime + * @namespace * @glslUniform * * @example @@ -1382,6 +1432,7 @@ define([ * as a float. * * @alias czm_sceneMode + * @namespace * @glslUniform * * @example @@ -1411,6 +1462,7 @@ define([ * An automatic GLSL uniform representing the current rendering pass. * * @alias czm_pass + * @namespace * @glslUniform * * @example @@ -1435,6 +1487,7 @@ define([ * An automatic GLSL uniform representing the current scene background color. * * @alias czm_backgroundColor + * @namespace * @glslUniform * * @example @@ -1464,6 +1517,7 @@ define([ * An automatic GLSL uniform containing the BRDF look up texture used for image-based lighting computations. * * @alias czm_brdfLut + * @namespace * @glslUniform * * @example @@ -1487,6 +1541,7 @@ define([ * An automatic GLSL uniform containing the environment map used within the scene. * * @alias czm_environmentMap + * @namespace * @glslUniform * * @example @@ -1510,6 +1565,7 @@ define([ * from True Equator Mean Equinox (TEME) axes to the pseudo-fixed axes at the current scene time. * * @alias czm_temeToPseudoFixed + * @namespace * @glslUniform * * @example @@ -1534,6 +1590,7 @@ define([ * An automatic GLSL uniform representing the ratio of canvas coordinate space to canvas pixel space. * * @alias czm_resolutionScale + * @namespace * @glslUniform * * @example @@ -1551,6 +1608,7 @@ define([ * An automatic GLSL uniform scalar used to mix a color with the fog color based on the distance to the camera. * * @alias czm_fogDensity + * @namespace * @glslUniform * * @see czm_fog @@ -1568,6 +1626,7 @@ define([ * This will be in pixel coordinates relative to the canvas. * * @alias czm_imagerySplitPosition + * @namespace * @glslUniform * * @example @@ -1586,6 +1645,7 @@ define([ * An automatic GLSL uniform scalar representing the geometric tolerance per meter * * @alias czm_geometricToleranceOverMeter + * @namespace * @glslUniform */ czm_geometricToleranceOverMeter : new AutomaticUniform({ @@ -1602,6 +1662,7 @@ define([ * the depth test should never be applied. * * @alias czm_minimumDisableDepthTestDistance + * @namespace * @glslUniform */ czm_minimumDisableDepthTestDistance : new AutomaticUniform({ @@ -1616,6 +1677,7 @@ define([ * An automatic GLSL uniform that will be the highlight color of unclassified 3D Tiles. * * @alias czm_invertClassificationColor + * @namespace * @glslUniform */ czm_invertClassificationColor : new AutomaticUniform({ From 06f51980d63111370da86fd320ecacde8ece0397 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Thu, 19 Jul 2018 12:35:08 -0400 Subject: [PATCH 03/30] compute polygon centroid instead of center of points --- Source/Core/EllipsoidTangentPlane.js | 79 +++++++++++--------- Source/DataSources/PolygonGeometryUpdater.js | 37 ++++++--- Specs/Core/EllipsoidTangentPlaneSpec.js | 24 ++++++ 3 files changed, 94 insertions(+), 46 deletions(-) diff --git a/Source/Core/EllipsoidTangentPlane.js b/Source/Core/EllipsoidTangentPlane.js index 4cb3018c2bea..53d44b6f8ba9 100644 --- a/Source/Core/EllipsoidTangentPlane.js +++ b/Source/Core/EllipsoidTangentPlane.js @@ -3,6 +3,7 @@ define([ './Cartesian2', './Cartesian3', './Cartesian4', + './Check', './defaultValue', './defined', './defineProperties', @@ -18,6 +19,7 @@ define([ Cartesian2, Cartesian3, Cartesian4, + Check, defaultValue, defined, defineProperties, @@ -45,9 +47,7 @@ define([ */ function EllipsoidTangentPlane(origin, ellipsoid) { //>>includeStart('debug', pragmas.debug); - if (!defined(origin)) { - throw new DeveloperError('origin is required.'); - } + Check.defined('origin', origin); //>>includeEnd('debug'); ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84); @@ -146,14 +146,12 @@ define([ * Creates a new instance from the provided ellipsoid and the center * point of the provided Cartesians. * - * @param {Ellipsoid} ellipsoid The ellipsoid to use. * @param {Cartesian3} cartesians The list of positions surrounding the center point. + * @param {Ellipsoid} [ellipsoid=Ellipsoid.WGS84] The ellipsoid to use. */ EllipsoidTangentPlane.fromPoints = function(cartesians, ellipsoid) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesians)) { - throw new DeveloperError('cartesians is required.'); - } + Check.defined('cartesians', cartesians); //>>includeEnd('debug'); var box = AxisAlignedBoundingBox.fromPoints(cartesians, tmp); @@ -172,9 +170,7 @@ define([ */ EllipsoidTangentPlane.prototype.projectPointOntoPlane = function(cartesian, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesian)) { - throw new DeveloperError('cartesian is required.'); - } + Check.defined('cartesian', cartesian); //>>includeEnd('debug'); var ray = scratchProjectPointOntoPlaneRay; @@ -214,9 +210,7 @@ define([ */ EllipsoidTangentPlane.prototype.projectPointsOntoPlane = function(cartesians, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesians)) { - throw new DeveloperError('cartesians is required.'); - } + Check.defined('cartesians', cartesians); //>>includeEnd('debug'); if (!defined(result)) { @@ -245,9 +239,7 @@ define([ */ EllipsoidTangentPlane.prototype.projectPointToNearestOnPlane = function(cartesian, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesian)) { - throw new DeveloperError('cartesian is required.'); - } + Check.defined('cartesian', cartesian); //>>includeEnd('debug'); if (!defined(result)) { @@ -284,9 +276,7 @@ define([ */ EllipsoidTangentPlane.prototype.projectPointsToNearestOnPlane = function(cartesians, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesians)) { - throw new DeveloperError('cartesians is required.'); - } + Check.defined('cartesians', cartesians); //>>includeEnd('debug'); if (!defined(result)) { @@ -302,6 +292,37 @@ define([ }; var projectPointsOntoEllipsoidScratch = new Cartesian3(); + /** + * Computes the projection of the provided 2D position onto the 3D ellipsoid. + * + * @param {Cartesian2} cartesian The points to project. + * @param {Cartesian3} [result] The Cartesian3 instance to store result. + * @returns {Cartesian3} The modified result parameter or a new Cartesian3 instance if none was provided. + */ + EllipsoidTangentPlane.prototype.projectPointOntoEllipsoid = function(cartesian, result) { + //>>includeStart('debug', pragmas.debug); + Check.defined('cartesian', cartesian); + //>>includeEnd('debug'); + + if (!defined(result)) { + result = new Cartesian3(); + } + + var ellipsoid = this._ellipsoid; + var origin = this._origin; + var xAxis = this._xAxis; + var yAxis = this._yAxis; + var tmp = projectPointsOntoEllipsoidScratch; + + Cartesian3.multiplyByScalar(xAxis, cartesian.x, tmp); + result = Cartesian3.add(origin, tmp, result); + Cartesian3.multiplyByScalar(yAxis, cartesian.y, tmp); + Cartesian3.add(result, tmp, result); + ellipsoid.scaleToGeocentricSurface(result, result); + + return result; + }; + /** * Computes the projection of the provided 2D positions onto the 3D ellipsoid. * @@ -311,9 +332,7 @@ define([ */ EllipsoidTangentPlane.prototype.projectPointsOntoEllipsoid = function(cartesians, result) { //>>includeStart('debug', pragmas.debug); - if (!defined(cartesians)) { - throw new DeveloperError('cartesians is required.'); - } + Check.defined('cartesians', cartesians); //>>includeEnd('debug'); var length = cartesians.length; @@ -323,22 +342,8 @@ define([ result.length = length; } - var ellipsoid = this._ellipsoid; - var origin = this._origin; - var xAxis = this._xAxis; - var yAxis = this._yAxis; - var tmp = projectPointsOntoEllipsoidScratch; - for ( var i = 0; i < length; ++i) { - var position = cartesians[i]; - Cartesian3.multiplyByScalar(xAxis, position.x, tmp); - if (!defined(result[i])) { - result[i] = new Cartesian3(); - } - var point = Cartesian3.add(origin, tmp, result[i]); - Cartesian3.multiplyByScalar(yAxis, position.y, tmp); - Cartesian3.add(point, tmp, point); - ellipsoid.scaleToGeocentricSurface(point, point); + result[i] = this.projectPointOntoEllipsoid(cartesians[i], result[i]); } return result; diff --git a/Source/DataSources/PolygonGeometryUpdater.js b/Source/DataSources/PolygonGeometryUpdater.js index 560e6d84b212..492df30341c2 100644 --- a/Source/DataSources/PolygonGeometryUpdater.js +++ b/Source/DataSources/PolygonGeometryUpdater.js @@ -1,5 +1,6 @@ define([ '../Core/ApproximateTerrainHeights', + '../Core/Cartesian2', '../Core/Cartesian3', '../Core/Check', '../Core/Color', @@ -9,6 +10,7 @@ define([ '../Core/defined', '../Core/DeveloperError', '../Core/DistanceDisplayConditionGeometryInstanceAttribute', + '../Core/EllipsoidTangentPlane', '../Core/GeometryInstance', '../Core/GeometryOffsetAttribute', '../Core/isArray', @@ -30,6 +32,7 @@ define([ './Property' ], function( ApproximateTerrainHeights, + Cartesian2, Cartesian3, Check, Color, @@ -39,6 +42,7 @@ define([ defined, DeveloperError, DistanceDisplayConditionGeometryInstanceAttribute, + EllipsoidTangentPlane, GeometryInstance, GeometryOffsetAttribute, isArray, @@ -64,6 +68,8 @@ define([ var defaultOffset = Cartesian3.ZERO; var offsetScratch = new Cartesian3(); var scratchRectangle = new Rectangle(); + var scratch2DPositions = []; + var cart2Scratch = new Cartesian2(); function PolygonGeometryOptions(entity) { this.id = entity; @@ -216,17 +222,30 @@ define([ if (positions.length === 0) { return; } + var ellipsoid = this._scene.mapProjection.ellipsoid; - var centroid = Cartesian3.clone(Cartesian3.ZERO, result); - var length = positions.length; - for (var i = 0; i < length; i++) { - centroid = Cartesian3.add(positions[i], centroid, centroid); - } - centroid = Cartesian3.multiplyByScalar(centroid, 1 / length, centroid); - if (defined(this._scene.globe)) { - centroid = this._scene.globe.ellipsoid.scaleToGeodeticSurface(centroid, centroid); + var tangentPlane = EllipsoidTangentPlane.fromPoints(positions, ellipsoid); + var positions2D = tangentPlane.projectPointsOntoPlane(positions, scratch2DPositions); + + var length = positions2D.length; + var area = 0; + var j = length - 1; + var centroid2D = new Cartesian2(); + for (var i = 0; i < length; j = i++) { + var p1 = positions2D[i]; + var p2 = positions2D[j]; + var f = p1.x * p2.y - p2.x * p1.y; + + var sum = Cartesian2.add(p1, p2, cart2Scratch); + sum = Cartesian2.multiplyByScalar(sum, f, sum); + centroid2D = Cartesian2.add(centroid2D, sum, centroid2D); + + area += f; } - return centroid; + + var a = 1 / (area * 6); + centroid2D = Cartesian2.multiplyByScalar(centroid2D, a, centroid2D); + return tangentPlane.projectPointOntoEllipsoid(centroid2D, result); }; PolygonGeometryUpdater.prototype._isHidden = function(entity, polygon) { diff --git a/Specs/Core/EllipsoidTangentPlaneSpec.js b/Specs/Core/EllipsoidTangentPlaneSpec.js index 2bfff3cd3dc6..c9acde675633 100644 --- a/Specs/Core/EllipsoidTangentPlaneSpec.js +++ b/Specs/Core/EllipsoidTangentPlaneSpec.js @@ -101,6 +101,30 @@ defineSuite([ expect(returnedResults).toEqual(expectedResults); }); + it('projectPointOntoEllipsoid works without a result parameter', function () { + var ellipsoid = Ellipsoid.UNIT_SPHERE; + var origin = new Cartesian3(1, 0, 0); + var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); + + var position = new Cartesian3(2, 2, 0); + var expectedResult = new Cartesian3(1/3, 2/3, 2/3); + var returnedResult = tangentPlane.projectPointOntoEllipsoid(position); + expect(returnedResult).toEqual(expectedResult); + }); + + it('projectPointOntoEllipsoid works with a result parameter', function () { + var ellipsoid = Ellipsoid.UNIT_SPHERE; + var origin = new Cartesian3(1, 0, 0); + var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); + + var position = new Cartesian3(2, -2, 0); + var expectedResult = new Cartesian3(1/3, 2/3, -2/3); + var result = new Cartesian3(); + var returnedResult = tangentPlane.projectPointOntoEllipsoid(position, result); + expect(result).toBe(returnedResult); + expect(returnedResult).toEqual(expectedResult); + }); + it('projectPointsOntoEllipsoid works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; var origin = new Cartesian3(1, 0, 0); From 5f77aa25c164c40219f90337981cfb98cadf947e Mon Sep 17 00:00:00 2001 From: hpinkos Date: Thu, 19 Jul 2018 16:46:47 -0400 Subject: [PATCH 04/30] math --- Source/DataSources/PolygonGeometryUpdater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/DataSources/PolygonGeometryUpdater.js b/Source/DataSources/PolygonGeometryUpdater.js index 492df30341c2..5590559f26db 100644 --- a/Source/DataSources/PolygonGeometryUpdater.js +++ b/Source/DataSources/PolygonGeometryUpdater.js @@ -243,7 +243,7 @@ define([ area += f; } - var a = 1 / (area * 6); + var a = 1 / (area * 3); centroid2D = Cartesian2.multiplyByScalar(centroid2D, a, centroid2D); return tangentPlane.projectPointOntoEllipsoid(centroid2D, result); }; From 23e383de017e42acc1f740fc41a402f44084767a Mon Sep 17 00:00:00 2001 From: hpinkos Date: Thu, 19 Jul 2018 16:59:04 -0400 Subject: [PATCH 05/30] floats --- Source/DataSources/PolygonGeometryUpdater.js | 2 +- Specs/Core/EllipsoidTangentPlaneSpec.js | 96 ++++++++++---------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Source/DataSources/PolygonGeometryUpdater.js b/Source/DataSources/PolygonGeometryUpdater.js index 5590559f26db..fc2e20fbf371 100644 --- a/Source/DataSources/PolygonGeometryUpdater.js +++ b/Source/DataSources/PolygonGeometryUpdater.js @@ -243,7 +243,7 @@ define([ area += f; } - var a = 1 / (area * 3); + var a = 1.0 / (area * 3.0); centroid2D = Cartesian2.multiplyByScalar(centroid2D, a, centroid2D); return tangentPlane.projectPointOntoEllipsoid(centroid2D, result); }; diff --git a/Specs/Core/EllipsoidTangentPlaneSpec.js b/Specs/Core/EllipsoidTangentPlaneSpec.js index c9acde675633..cc980b83546a 100644 --- a/Specs/Core/EllipsoidTangentPlaneSpec.js +++ b/Specs/Core/EllipsoidTangentPlaneSpec.js @@ -11,7 +11,7 @@ defineSuite([ 'use strict'; it('constructor defaults to WGS84', function() { - var origin = new Cartesian3(Ellipsoid.WGS84.radii.x, 0, 0); + var origin = new Cartesian3(Ellipsoid.WGS84.radii.x, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin); expect(tangentPlane.ellipsoid).toBe(Ellipsoid.WGS84); expect(tangentPlane.origin).toEqual(origin); @@ -24,7 +24,7 @@ defineSuite([ }); it('fromPoints sets expected values', function() { - var points = [new Cartesian3(2, 0, 0), new Cartesian3(0, 0, 0)]; + var points = [new Cartesian3(2.0, 0.0, 0.0), new Cartesian3(0.0, 0.0, 0.0)]; var tangentPlane = EllipsoidTangentPlane.fromPoints(points, Ellipsoid.UNIT_SPHERE); expect(tangentPlane.ellipsoid).toBe(Ellipsoid.UNIT_SPHERE); expect(tangentPlane.origin).toEqual(Cartesian3.UNIT_X); @@ -32,31 +32,31 @@ defineSuite([ it('projectPointOntoPlane returns undefined for unsolvable projections', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = new Cartesian3(0, 0, 1); + var positions = new Cartesian3(0.0, 0.0, 1.0); var returnedResult = tangentPlane.projectPointOntoPlane(positions); expect(returnedResult).toBeUndefined(); }); it('projectPointOntoPlane works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = new Cartesian3(1, 0, 1); - var expectedResult = new Cartesian2(0, 1); + var positions = new Cartesian3(1.0, 0.0, 1.0); + var expectedResult = new Cartesian2(0.0, 1.0); var returnedResult = tangentPlane.projectPointOntoPlane(positions); expect(returnedResult).toEqual(expectedResult); }); it('projectPointOntoPlane works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = new Cartesian3(1, 0, 1); - var expectedResult = new Cartesian2(0, 1); + var positions = new Cartesian3(1.0, 0.0, 1.0); + var expectedResult = new Cartesian2(0.0, 1.0); var result = new Cartesian2(); var returnedResult = tangentPlane.projectPointOntoPlane(positions, result); expect(result).toBe(returnedResult); @@ -65,22 +65,22 @@ defineSuite([ it('projectPointsOntoPlane works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(1, 0, 1), new Cartesian3(1, 0, 0), new Cartesian3(1, 1, 0)]; - var expectedResults = [new Cartesian2(0, 1), new Cartesian2(0, 0), new Cartesian2(1, 0)]; + var positions = [new Cartesian3(1.0, 0.0, 1.0), new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(1.0, 1.0, 0.0)]; + var expectedResults = [new Cartesian2(0.0, 1.0), new Cartesian2(0.0, 0.0), new Cartesian2(1.0, 0.0)]; var returnedResults = tangentPlane.projectPointsOntoPlane(positions); expect(returnedResults).toEqual(expectedResults); }); it('projectPointsOntoPlane works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(1, 0, 1), new Cartesian3(1, 0, 0), new Cartesian3(1, 1, 0)]; - var expectedResults = [new Cartesian2(0, 1), new Cartesian2(0, 0), new Cartesian2(1, 0)]; + var positions = [new Cartesian3(1.0, 0.0, 1.0), new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(1.0, 1.0, 0.0)]; + var expectedResults = [new Cartesian2(0.0, 1.0), new Cartesian2(0.0, 0.0), new Cartesian2(1.0, 0.0)]; var index0 = new Cartesian2(); var result = [index0]; @@ -92,33 +92,33 @@ defineSuite([ it('projectPointsOntoPlane works when some points cannot be projected', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(1, 0, 1), new Cartesian3(1, 0, 0), new Cartesian3(0, 0, 1), new Cartesian3(1, 1, 0), new Cartesian3(0, 1, 0)]; - var expectedResults = [new Cartesian2(0, 1), new Cartesian2(0, 0), new Cartesian2(1, 0)]; + var positions = [new Cartesian3(1.0, 0.0, 1.0), new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(0.0, 0.0, 1.0), new Cartesian3(1.0, 1.0, 0.0), new Cartesian3(0.0, 1.0, 0.0)]; + var expectedResults = [new Cartesian2(0.0, 1.0), new Cartesian2(0.0, 0.0), new Cartesian2(1.0, 0.0)]; var returnedResults = tangentPlane.projectPointsOntoPlane(positions); expect(returnedResults).toEqual(expectedResults); }); it('projectPointOntoEllipsoid works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var position = new Cartesian3(2, 2, 0); - var expectedResult = new Cartesian3(1/3, 2/3, 2/3); + var position = new Cartesian3(2.0, 2.0, 0.0); + var expectedResult = new Cartesian3(1.0/3.0, 2.0/3.0, 2.0/3.0); var returnedResult = tangentPlane.projectPointOntoEllipsoid(position); expect(returnedResult).toEqual(expectedResult); }); it('projectPointOntoEllipsoid works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var position = new Cartesian3(2, -2, 0); - var expectedResult = new Cartesian3(1/3, 2/3, -2/3); + var position = new Cartesian3(2.0, -2.0, 0.0); + var expectedResult = new Cartesian3(1.0/3.0, 2.0/3.0, -2.0/3.0); var result = new Cartesian3(); var returnedResult = tangentPlane.projectPointOntoEllipsoid(position, result); expect(result).toBe(returnedResult); @@ -127,22 +127,22 @@ defineSuite([ it('projectPointsOntoEllipsoid works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(2, -2, 0), new Cartesian3(2, 2, 0)]; - var expectedResults = [new Cartesian3(1/3, 2/3, -2/3), new Cartesian3(1/3, 2/3, 2/3)]; + var positions = [new Cartesian3(2.0, -2.0, 0.0), new Cartesian3(2.0, 2.0, 0.0)]; + var expectedResults = [new Cartesian3(1.0/3.0, 2.0/3.0, -2.0/3.0), new Cartesian3(1.0/3.0, 2.0/3.0, 2.0/3.0)]; var returnedResults = tangentPlane.projectPointsOntoEllipsoid(positions); expect(returnedResults).toEqual(expectedResults); }); it('projectPointsOntoEllipsoid works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(2, -2, 0), new Cartesian3(2, 2, 0)]; - var expectedResults = [new Cartesian3(1/3, 2/3, -2/3), new Cartesian3(1/3, 2/3, 2/3)]; + var positions = [new Cartesian3(2.0, -2.0, 0.0), new Cartesian3(2.0, 2.0, 0.0)]; + var expectedResults = [new Cartesian3(1.0/3.0, 2.0/3.0, -2.0/3.0), new Cartesian3(1.0/3.0, 2.0/3.0, 2.0/3.0)]; var index0 = new Cartesian3(); var result = [index0]; var returnedResults = tangentPlane.projectPointsOntoEllipsoid(positions, result); @@ -153,33 +153,33 @@ defineSuite([ it('projectPointToNearestOnPlane works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = new Cartesian3(1, 0, 1); - var expectedResult = new Cartesian2(0, 1); + var positions = new Cartesian3(1.0, 0.0, 1.0); + var expectedResult = new Cartesian2(0.0, 1.0); var returnedResult = tangentPlane.projectPointToNearestOnPlane(positions); expect(returnedResult).toEqual(expectedResult); }); it('projectPointToNearestOnPlane works projecting from various distances', function () { var ellipsoid = Ellipsoid.ZERO; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(2, 0, 0))).toEqual(new Cartesian2(0, 0)); - expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(1, 0, 0))).toEqual(new Cartesian2(0, 0)); - expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(0, 0, 0))).toEqual(new Cartesian2(0, 0)); - expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(-1, 0, 0))).toEqual(new Cartesian2(0, 0)); + expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(2.0, 0.0, 0.0))).toEqual(new Cartesian2(0.0, 0.0)); + expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(1.0, 0.0, 0.0))).toEqual(new Cartesian2(0.0, 0.0)); + expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(0.0, 0.0, 0.0))).toEqual(new Cartesian2(0.0, 0.0)); + expect(tangentPlane.projectPointToNearestOnPlane(new Cartesian3(-1.0, 0.0, 0.0))).toEqual(new Cartesian2(0.0, 0.0)); }); it('projectPointToNearestOnPlane works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = new Cartesian3(1, 0, 1); - var expectedResult = new Cartesian2(0, 1); + var positions = new Cartesian3(1.0, 0.0, 1.0); + var expectedResult = new Cartesian2(0.0, 1.0); var result = new Cartesian2(); var returnedResult = tangentPlane.projectPointToNearestOnPlane(positions, result); expect(result).toBe(returnedResult); @@ -188,22 +188,22 @@ defineSuite([ it('projectPointsToNearestOnPlane works without a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(1, 0, 1), new Cartesian3(1, 0, 0), new Cartesian3(1, 1, 0)]; - var expectedResults = [new Cartesian2(0, 1), new Cartesian2(0, 0), new Cartesian2(1, 0)]; + var positions = [new Cartesian3(1.0, 0.0, 1.0), new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(1.0, 1.0, 0.0)]; + var expectedResults = [new Cartesian2(0.0, 1.0), new Cartesian2(0.0, 0.0), new Cartesian2(1.0, 0.0)]; var returnedResults = tangentPlane.projectPointsToNearestOnPlane(positions); expect(returnedResults).toEqual(expectedResults); }); it('projectPointsToNearestOnPlane works with a result parameter', function () { var ellipsoid = Ellipsoid.UNIT_SPHERE; - var origin = new Cartesian3(1, 0, 0); + var origin = new Cartesian3(1.0, 0.0, 0.0); var tangentPlane = new EllipsoidTangentPlane(origin, ellipsoid); - var positions = [new Cartesian3(1, 0, 1), new Cartesian3(1, 0, 0), new Cartesian3(1, 1, 0)]; - var expectedResults = [new Cartesian2(0, 1), new Cartesian2(0, 0), new Cartesian2(1, 0)]; + var positions = [new Cartesian3(1.0, 0.0, 1.0), new Cartesian3(1.0, 0.0, 0.0), new Cartesian3(1.0, 1.0, 0.0)]; + var expectedResults = [new Cartesian2(0.0, 1.0), new Cartesian2(0.0, 0.0), new Cartesian2(1.0, 0.0)]; var index0 = new Cartesian2(); var result = [index0]; From 41eb063fe008d5210212fc50ebc17cd6bf49085c Mon Sep 17 00:00:00 2001 From: hpinkos Date: Fri, 20 Jul 2018 11:29:24 -0400 Subject: [PATCH 06/30] use promises for requestTileGeometry --- Source/Core/EllipsoidTerrainProvider.js | 4 +- .../GoogleEarthEnterpriseTerrainProvider.js | 8 ++-- Source/Core/VRTheWorldTerrainProvider.js | 45 ++++++++++--------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Source/Core/EllipsoidTerrainProvider.js b/Source/Core/EllipsoidTerrainProvider.js index 6aaeb9a868f7..8ee50e2fc926 100644 --- a/Source/Core/EllipsoidTerrainProvider.js +++ b/Source/Core/EllipsoidTerrainProvider.js @@ -160,11 +160,11 @@ define([ EllipsoidTerrainProvider.prototype.requestTileGeometry = function(x, y, level, request) { var width = 16; var height = 16; - return new HeightmapTerrainData({ + return when.resolve(new HeightmapTerrainData({ buffer : new Uint8Array(width * height), width : width, height : height - }); + })); }; /** diff --git a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js index ff430a868918..ddee7efb177f 100644 --- a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js +++ b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js @@ -374,13 +374,13 @@ define([ var buffer = terrainCache.get(quadKey); if (defined(buffer)) { var credit = metadata.providers[info.terrainProvider]; - return new GoogleEarthEnterpriseTerrainData({ + return when.resolve(new GoogleEarthEnterpriseTerrainData({ buffer : buffer, childTileMask : computeChildMask(quadKey, info, metadata), credits : defined(credit) ? [credit] : undefined, negativeAltitudeExponentBias: metadata.negativeAltitudeExponentBias, negativeElevationThreshold: metadata.negativeAltitudeThreshold - }); + })); } // Clean up the cache @@ -389,11 +389,11 @@ define([ // We have a tile, check to see if no ancestors have terrain or that we know for sure it doesn't if (!info.ancestorHasTerrain) { // We haven't reached a level with terrain, so return the ellipsoid - return new HeightmapTerrainData({ + return when.resovle(new HeightmapTerrainData({ buffer : new Uint8Array(16 * 16), width : 16, height : 16 - }); + })); } else if (terrainState === TerrainState.NONE) { // Already have info and there isn't any terrain here return when.reject(new RuntimeError('Terrain tile doesn\'t exist')); diff --git a/Source/Core/VRTheWorldTerrainProvider.js b/Source/Core/VRTheWorldTerrainProvider.js index 6088b9a790d6..744a228afed8 100644 --- a/Source/Core/VRTheWorldTerrainProvider.js +++ b/Source/Core/VRTheWorldTerrainProvider.js @@ -78,15 +78,15 @@ define([ this._readyPromise = when.defer(); this._terrainDataStructure = { - heightScale : 1.0 / 1000.0, - heightOffset : -1000.0, - elementsPerHeight : 3, - stride : 4, - elementMultiplier : 256.0, - isBigEndian : true, - lowestEncodedHeight : 0, - highestEncodedHeight : 256 * 256 * 256 - 1 - }; + heightScale : 1.0 / 1000.0, + heightOffset : -1000.0, + elementsPerHeight : 3, + stride : 4, + elementMultiplier : 256.0, + isBigEndian : true, + lowestEncodedHeight : 0, + highestEncodedHeight : 256 * 256 * 256 - 1 + }; var credit = options.credit; if (typeof credit === 'string') { @@ -104,7 +104,7 @@ define([ function metadataSuccess(xml) { var srs = xml.getElementsByTagName('SRS')[0].textContent; if (srs === 'EPSG:4326') { - that._tilingScheme = new GeographicTilingScheme({ ellipsoid : ellipsoid }); + that._tilingScheme = new GeographicTilingScheme({ellipsoid : ellipsoid}); } else { metadataFailure('SRS ' + srs + ' is not supported.'); return; @@ -261,11 +261,11 @@ define([ var yTiles = this._tilingScheme.getNumberOfYTilesAtLevel(level); var resource = this._resource.getDerivedResource({ - url: level + '/' + x + '/' + (yTiles - y - 1) + '.tif', - queryParameters: { - cesium: true + url : level + '/' + x + '/' + (yTiles - y - 1) + '.tif', + queryParameters : { + cesium : true }, - request: request + request : request }); var promise = resource.fetchImage(); if (!defined(promise)) { @@ -273,15 +273,16 @@ define([ } var that = this; - return when(promise, function(image) { - return new HeightmapTerrainData({ - buffer : getImagePixels(image), - width : that._heightmapWidth, - height : that._heightmapHeight, - childTileMask : getChildMask(that, x, y, level), - structure : that._terrainDataStructure + return when(promise) + .then(function(image) { + return new HeightmapTerrainData({ + buffer : getImagePixels(image), + width : that._heightmapWidth, + height : that._heightmapHeight, + childTileMask : getChildMask(that, x, y, level), + structure : that._terrainDataStructure + }); }); - }); }; /** From 180a9dad2d50f6ba610c9c4702d0ec3226981532 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Mon, 23 Jul 2018 15:44:42 -0400 Subject: [PATCH 07/30] reduce number of varyings for billboard --- Source/Shaders/BillboardCollectionFS.glsl | 48 +++++++++++++++++------ Source/Shaders/BillboardCollectionVS.glsl | 27 +++++++------ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/Source/Shaders/BillboardCollectionFS.glsl b/Source/Shaders/BillboardCollectionFS.glsl index 853a448d94a9..b909019b4954 100644 --- a/Source/Shaders/BillboardCollectionFS.glsl +++ b/Source/Shaders/BillboardCollectionFS.glsl @@ -11,22 +11,24 @@ varying vec4 v_color; #ifdef FRAGMENT_DEPTH_CHECK varying vec4 v_textureCoordinateBounds; // the min and max x and y values for the texture coordinates varying vec4 v_originTextureCoordinateAndTranslate; // texture coordinate at the origin, billboard translate (used for label glyphs) -varying vec4 v_dimensionsAndImageSize; // dimensions of the bounding rectangle and the size of the image. The values will only be different for label glyphs -varying vec3 v_eyeDepthDistanceAndApplyTranslate; // The depth of the billboard and the disable depth test distance +varying vec4 v_compressed; // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize varying mat2 v_rotationMatrix; -float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST) -{ - vec2 dimensions = v_dimensionsAndImageSize.xy; - vec2 imageSize = v_dimensionsAndImageSize.zw; +const float SHIFT_LEFT12 = 4096.0; +const float SHIFT_LEFT1 = 2.0; + +const float SHIFT_RIGHT12 = 1.0 / 4096.0; +const float SHIFT_RIGHT1 = 1.0 / 2.0; +float getGlobeDepth(vec2 adjustedST, vec2 depthLookupST, bool applyTranslate, vec2 dimensions, vec2 imageSize) +{ vec2 lookupVector = imageSize * (depthLookupST - adjustedST); lookupVector = v_rotationMatrix * lookupVector; vec2 labelOffset = (dimensions - imageSize) * (depthLookupST - vec2(0.0, v_originTextureCoordinateAndTranslate.y)); // aligns label glyph with bounding rectangle. Will be zero for billboards because dimensions and imageSize will be equal vec2 translation = v_originTextureCoordinateAndTranslate.zw; - if (v_eyeDepthDistanceAndApplyTranslate.z != 0.0) + if (applyTranslate) { // this is only needed for labels where the horizontal origin is not LEFT // it moves the label back to where the "origin" should be since all label glyphs are set to HorizontalOrigin.LEFT @@ -80,20 +82,42 @@ void main() czm_writeLogDepth(); #ifdef FRAGMENT_DEPTH_CHECK - if (v_eyeDepthDistanceAndApplyTranslate.y != 0.0) { + float temp = v_compressed.y; + + temp = temp * SHIFT_RIGHT1; + + float temp2 = (temp - floor(temp)) * SHIFT_LEFT1; + bool enableDepthTest = temp2 != 0.0; + bool applyTranslate = floor(temp) != 0.0; + + if (enableDepthTest) { + temp = v_compressed.z; + temp = temp * SHIFT_RIGHT12; + + vec2 dimensions; + dimensions.y = (temp - floor(temp)) * SHIFT_LEFT12; + dimensions.x = floor(temp); + + temp = v_compressed.w; + temp = temp * SHIFT_RIGHT12; + + vec2 imageSize; + imageSize.y = (temp - floor(temp)) * SHIFT_LEFT12; + imageSize.x = floor(temp); + vec2 adjustedST = v_textureCoordinates - v_textureCoordinateBounds.xy; adjustedST = adjustedST / vec2(v_textureCoordinateBounds.z - v_textureCoordinateBounds.x, v_textureCoordinateBounds.w - v_textureCoordinateBounds.y); - float epsilonEyeDepth = v_eyeDepthDistanceAndApplyTranslate.x + czm_epsilon1; - float globeDepth1 = getGlobeDepth(adjustedST, v_originTextureCoordinateAndTranslate.xy); + float epsilonEyeDepth = v_compressed.x + czm_epsilon1; + float globeDepth1 = getGlobeDepth(adjustedST, v_originTextureCoordinateAndTranslate.xy, applyTranslate, dimensions, imageSize); // negative values go into the screen if (globeDepth1 != 0.0 && globeDepth1 > epsilonEyeDepth) { - float globeDepth2 = getGlobeDepth(adjustedST, vec2(0.0, 1.0)); // top left corner + float globeDepth2 = getGlobeDepth(adjustedST, vec2(0.0, 1.0), applyTranslate, dimensions, imageSize); // top left corner if (globeDepth2 != 0.0 && globeDepth2 > epsilonEyeDepth) { - float globeDepth3 = getGlobeDepth(adjustedST, vec2(1.0, 1.0)); // top right corner + float globeDepth3 = getGlobeDepth(adjustedST, vec2(1.0, 1.0), applyTranslate, dimensions, imageSize); // top right corner if (globeDepth3 != 0.0 && globeDepth3 > epsilonEyeDepth) { discard; diff --git a/Source/Shaders/BillboardCollectionVS.glsl b/Source/Shaders/BillboardCollectionVS.glsl index 01e36c3dfb5a..9bf1c29bf863 100644 --- a/Source/Shaders/BillboardCollectionVS.glsl +++ b/Source/Shaders/BillboardCollectionVS.glsl @@ -11,7 +11,7 @@ attribute vec4 scaleByDistance; // near, nearScale, f attribute vec4 pixelOffsetScaleByDistance; // near, nearScale, far, farScale attribute vec4 compressedAttribute3; // distance display condition near, far, disableDepthTestDistance, dimensions #if defined(VERTEX_DEPTH_CHECK) || defined(FRAGMENT_DEPTH_CHECK) -attribute vec4 textureCoordinateBoundsOrLabelTranslate; // the min and max x and y values for the texture coordinates +attribute vec4 textureCoordinateBoundsOrLabelTranslate; // the min and max x and y values for the texture coordinates #endif #ifdef VECTOR_TILE attribute float a_batchId; @@ -21,8 +21,7 @@ varying vec2 v_textureCoordinates; #ifdef FRAGMENT_DEPTH_CHECK varying vec4 v_textureCoordinateBounds; varying vec4 v_originTextureCoordinateAndTranslate; -varying vec4 v_dimensionsAndImageSize; -varying vec3 v_eyeDepthDistanceAndApplyTranslate; +varying vec4 v_compressed; // x: eyeDepth, y: applyTranslate & enableDepthCheck, z: dimensions, w: imageSize varying mat2 v_rotationMatrix; #endif @@ -389,22 +388,26 @@ if (lengthSq < disableDepthTestDistance) { v_rotationMatrix = mat2(1.0, 0.0, 0.0, 1.0); #endif - v_eyeDepthDistanceAndApplyTranslate.x = eyeDepth; + float enableDepthCheck = 0.0; if (lengthSq < disableDepthTestDistance) { - v_eyeDepthDistanceAndApplyTranslate.y = 1.0; - } - else - { - v_eyeDepthDistanceAndApplyTranslate.y = 0.0; + enableDepthCheck = 1.0; } - v_eyeDepthDistanceAndApplyTranslate.z = applyTranslate; + float dw = floor(clamp(dimensions.x, 0.0, SHIFT_LEFT12)); + float dh = floor(clamp(dimensions.y, 0.0, SHIFT_LEFT12)); + + float iw = floor(clamp(imageSize.x, 0.0, SHIFT_LEFT12)); + float ih = floor(clamp(imageSize.y, 0.0, SHIFT_LEFT12)); + + v_compressed.x = eyeDepth; + v_compressed.y = applyTranslate * SHIFT_LEFT1 + enableDepthCheck; + v_compressed.z = dw * SHIFT_LEFT12 + dh; + v_compressed.w = iw * SHIFT_LEFT12 + ih; v_originTextureCoordinateAndTranslate.xy = depthOrigin; v_originTextureCoordinateAndTranslate.zw = translate; v_textureCoordinateBounds = textureCoordinateBoundsOrLabelTranslate; - v_dimensionsAndImageSize.xy = dimensions * scale; - v_dimensionsAndImageSize.zw = imageSize * scale; + #endif v_pickColor = pickColor; From bbc31edfa164483eece5c2c3b11d4010b0b2d353 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 23 Jul 2018 20:41:41 -0400 Subject: [PATCH 08/30] ESLint updates 1. Update to eslint 5.2.0, which has some new default rules. 2. Disable `no-self-assign` in Cesium tests, this new rule is useful but not in our specs. 3. Allow ES 2017 in node code, this includes async/await, which we have started using in Cesium-related Node projects 4. Add `no-var` and `prefer-const` as rules for Node code, we've already have been using them with success in other projects. 5. Bump eslint-config-cesium to 6.0.0 and update CHANGES so I can release once this is merged. --- Source/Core/buildModuleUrl.js | 4 +++- Source/Core/isCrossOriginUrl.js | 3 ++- .../Cesium3DTilesInspectorViewModel.js | 4 ++-- Specs/.eslintrc.json | 3 ++- Tools/eslint-config-cesium/CHANGES.md | 6 ++++++ Tools/eslint-config-cesium/node.js | 10 ++++++---- Tools/eslint-config-cesium/package.json | 4 ++-- package.json | 2 +- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Source/Core/buildModuleUrl.js b/Source/Core/buildModuleUrl.js index 88f1dedabcbe..89202229a375 100644 --- a/Source/Core/buildModuleUrl.js +++ b/Source/Core/buildModuleUrl.js @@ -37,7 +37,9 @@ define([ a = document.createElement('a'); } a.href = url; - a.href = a.href; // IE only absolutizes href on get, not set + + // IE only absolutizes href on get, not set + a.href = a.href; // eslint-disable-line no-self-assign return a.href; } diff --git a/Source/Core/isCrossOriginUrl.js b/Source/Core/isCrossOriginUrl.js index 42bdabb752dc..0f981496f9f0 100644 --- a/Source/Core/isCrossOriginUrl.js +++ b/Source/Core/isCrossOriginUrl.js @@ -25,7 +25,8 @@ define([ var protocol = a.protocol; a.href = url; - a.href = a.href; // IE only absolutizes href on get, not set + // IE only absolutizes href on get, not set + a.href = a.href; // eslint-disable-line no-self-assign return protocol !== a.protocol || host !== a.host; } diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js index dff21171e364..a5217060ae77 100644 --- a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js +++ b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js @@ -50,7 +50,7 @@ define([ viewModel._eventHandler.removeInputAction(ScreenSpaceEventType.MOUSE_MOVE); // Restore hover-over selection to its current value - viewModel.picking = viewModel.picking; + viewModel.picking = viewModel.picking; // eslint-disable-line no-self-assign } } @@ -998,7 +998,7 @@ define([ var loadSiblings = knockout.observable(); knockout.defineProperty(this, 'loadSiblings', { get : function() { - loadSiblings(); + return loadSiblings(); }, set : function(value) { loadSiblings(value); diff --git a/Specs/.eslintrc.json b/Specs/.eslintrc.json index 18af24775402..54cbf9fa1acf 100644 --- a/Specs/.eslintrc.json +++ b/Specs/.eslintrc.json @@ -7,6 +7,7 @@ "defineSuite": true }, "rules": { - "quotes": "off" + "quotes": "off", + "no-self-assign": "off" } } diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md index cbcaa0e6400e..23371b7a4496 100644 --- a/Tools/eslint-config-cesium/CHANGES.md +++ b/Tools/eslint-config-cesium/CHANGES.md @@ -1,6 +1,12 @@ Change Log ========== +### 6.0.0 - 2018-05-01 +* Upgrade to eslint 5.x and it's new default rules. +* Set ecmaVersion to 2017 for Node.js code. +* Enable [no-var](https://eslint.org/docs/rules/no-var) in Node.js code. +* Enable [prefer-const](https://eslint.org/docs/rules/prefer-const) in Node.js code. + ### 5.0.0 - 2018-05-01 * Enable [eol-last](https://eslint.org/docs/rules/eol-last). diff --git a/Tools/eslint-config-cesium/node.js b/Tools/eslint-config-cesium/node.js index 53ea5858ed89..6182d4811385 100644 --- a/Tools/eslint-config-cesium/node.js +++ b/Tools/eslint-config-cesium/node.js @@ -6,11 +6,13 @@ module.exports = { node: true }, parserOptions: { - ecmaVersion: 6 + ecmaVersion: 2017 }, rules: { - 'global-require' : 'error', - 'no-buffer-constructor' : 'error', - 'no-new-require' : 'error' + 'global-require': 'error', + 'no-buffer-constructor': 'error', + 'no-new-require': 'error', + 'no-var': 'error', + 'prefer-const': 'error' } }; diff --git a/Tools/eslint-config-cesium/package.json b/Tools/eslint-config-cesium/package.json index 7d1da3f051aa..c4543ed83888 100644 --- a/Tools/eslint-config-cesium/package.json +++ b/Tools/eslint-config-cesium/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-cesium", - "version": "5.0.0", + "version": "6.0.0", "description": "ESLint shareable configs for Cesium", "homepage": "http://cesiumjs.org", "license": "Apache-2.0", @@ -19,6 +19,6 @@ "cesium" ], "peerDependencies": { - "eslint": ">= 4" + "eslint": ">= 5" } } diff --git a/package.json b/package.json index 7da4eccc80a2..c4831db2d96f 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "compressible": "^2.0.9", "compression": "^1.6.2", "electron": "^1.6.1", - "eslint": "^4.0.0", + "eslint": "^5.2.0", "eslint-plugin-html": "^4.0.2", "event-stream": "^3.3.4", "express": "^4.15.0", From abc3226e33a0c2d958fa1844d75c8cf9c78e9f98 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 23 Jul 2018 22:09:28 -0400 Subject: [PATCH 09/30] Use Chrome Headless instead of Electron Since Chrome added an officially supported headless mode, there's no reason to use Electron for our unit tests. This will be both more accurate (uses actual Chrome) and also gets rid of the rather large Electron dependency. WebGL is disabled in headless, so we only use headless on CI (because we also disable webGL tests there). When running locally, it just shows an actual Chrome window. Chrome has an issue and plans to address this: https://bugs.chromium.org/p/chromium/issues/detail?id=765284 --- .travis.yml | 6 ++++-- Specs/karma.conf.js | 10 ++++++++-- package.json | 2 -- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77bf18d47eff..8adb1b96de6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: node_js node_js: - "8" sudo: false +addons: + chrome: stable before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start @@ -17,7 +19,7 @@ script: - echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r' - npm run build - - npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed + - npm run test -- --browsers ChromeCI --webgl-stub --failTaskOnError --suppressPassed - echo -en 'travis_fold:end:script.test\\r' - echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r' @@ -36,7 +38,7 @@ script: - echo -en 'travis_fold:end:script.deploy\\r' - echo 'test webgl-stub release' && echo -en 'travis_fold:start:script test.release\\r' - - npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed + - npm run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed - echo -en 'travis_fold:end:script test.release\\r' - echo 'test node' && echo -en 'travis_fold:start:script test.node\\r' diff --git a/Specs/karma.conf.js b/Specs/karma.conf.js index d0122212f53d..f87b21c136ad 100644 --- a/Specs/karma.conf.js +++ b/Specs/karma.conf.js @@ -64,8 +64,14 @@ module.exports = function(config) { // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher browsers : ['Chrome'], - electronOpts : { - show : false + //In Travis, we need to run with the no-sandbox flag + customLaunchers: { + ChromeCI: { + base: 'ChromeHeadless', + flags: [ + '--no-sandbox' + ] + } }, browserNoActivityTimeout : 30000, diff --git a/package.json b/package.json index 7da4eccc80a2..34224906fe00 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "cloc": "^2.3.3", "compressible": "^2.0.9", "compression": "^1.6.2", - "electron": "^1.6.1", "eslint": "^4.0.0", "eslint-plugin-html": "^4.0.2", "event-stream": "^3.3.4", @@ -58,7 +57,6 @@ "karma-chrome-launcher": "^2.0.0", "karma-detect-browsers": "^2.2.3", "karma-edge-launcher": "^0.4.2", - "karma-electron": "^5.1.1", "karma-firefox-launcher": "^1.0.0", "karma-ie-launcher": "^1.0.0", "karma-jasmine": "^1.1.0", From bacf265203cba437ffb661e51fa4e89c0b517d6d Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Tue, 24 Jul 2018 17:58:22 +0300 Subject: [PATCH 10/30] Add block tags for Scene --- Source/Scene/Billboard.js | 1 + Source/Scene/LabelCollection.js | 14 ++++++++------ Source/Scene/MaterialAppearance.js | 1 + Source/Scene/ModelAnimation.js | 1 + Source/Scene/ModelAnimationCollection.js | 1 + Source/Scene/ModelMaterial.js | 1 + Source/Scene/ModelMesh.js | 1 + Source/Scene/ModelNode.js | 2 +- Source/Scene/PointPrimitive.js | 1 + Source/Scene/Polyline.js | 1 + Source/Scene/ShadowMap.js | 1 + Source/Scene/WebMapServiceImageryProvider.js | 2 ++ 12 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Source/Scene/Billboard.js b/Source/Scene/Billboard.js index 0baeef037daf..be6198f5d9a4 100644 --- a/Source/Scene/Billboard.js +++ b/Source/Scene/Billboard.js @@ -71,6 +71,7 @@ define([ * @see Label * * @internalConstructor + * @class * * @demo {@link https://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=Billboards.html|Cesium Sandcastle Billboard Demo} */ diff --git a/Source/Scene/LabelCollection.js b/Source/Scene/LabelCollection.js index e6ac85dab71a..47f3f03da662 100644 --- a/Source/Scene/LabelCollection.js +++ b/Source/Scene/LabelCollection.js @@ -599,7 +599,7 @@ define([ * calling update. * * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called. - * + * @memberOf {LabelCollection.prototype} * * @example * // Example 1: Add a label, specifying all the default values. @@ -660,7 +660,7 @@ define([ * {@link Label#show} instead of removing and re-adding the label. * * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called. - * + * @memberOf {LabelCollection.prototype} * * @example * var l = labels.add(...); @@ -689,7 +689,7 @@ define([ * from a collection and then add new ones than to create a new collection entirely. * * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called. - * + * @memberOf {LabelCollection.prototype} * * @example * labels.add(...); @@ -716,6 +716,7 @@ define([ * @returns {Boolean} true if this collection contains the label, false otherwise. * * @see LabelCollection#get + * @memberOf {LabelCollection.prototype} */ LabelCollection.prototype.contains = function(label) { return defined(label) && label._labelCollection === this; @@ -737,7 +738,7 @@ define([ * operation is performed. * * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called. - * + * @memberOf {LabelCollection.prototype} * * @example * // Toggle the show property of every label in the collection @@ -761,6 +762,7 @@ define([ /** * @private + * @memberOf {LabelCollection.prototype} */ LabelCollection.prototype.update = function(frameState) { var billboardCollection = this._billboardCollection; @@ -843,7 +845,7 @@ define([ * isDestroyed will result in a {@link DeveloperError} exception. * * @returns {Boolean} True if this object was destroyed; otherwise, false. - * + * @memberOf {LabelCollection.prototype} * @see LabelCollection#destroy */ LabelCollection.prototype.isDestroyed = function() { @@ -859,7 +861,7 @@ define([ * assign the return value (undefined) to the object as done in the example. * * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called. - * + * @memberOf {LabelCollection.prototype} * * @example * labels = labels && labels.destroy(); diff --git a/Source/Scene/MaterialAppearance.js b/Source/Scene/MaterialAppearance.js index 7d3ecfff2a9e..b83e4f3f350c 100644 --- a/Source/Scene/MaterialAppearance.js +++ b/Source/Scene/MaterialAppearance.js @@ -282,6 +282,7 @@ define([ * {@link MaterialAppearance} instance. This is a trade-off between * flexibility (a wide array of materials) and memory/performance * (required vertex format and GLSL shader complexity. + * @exports MaterialAppearance.MaterialSupport */ MaterialAppearance.MaterialSupport = { /** diff --git a/Source/Scene/ModelAnimation.js b/Source/Scene/ModelAnimation.js index d5bca39de24d..fef6d0b8bba6 100644 --- a/Source/Scene/ModelAnimation.js +++ b/Source/Scene/ModelAnimation.js @@ -26,6 +26,7 @@ define([ * * @alias ModelAnimation * @internalConstructor + * @class * * @see ModelAnimationCollection#add */ diff --git a/Source/Scene/ModelAnimationCollection.js b/Source/Scene/ModelAnimationCollection.js index d046060f0458..9abadc4d64c5 100644 --- a/Source/Scene/ModelAnimationCollection.js +++ b/Source/Scene/ModelAnimationCollection.js @@ -27,6 +27,7 @@ define([ * * @alias ModelAnimationCollection * @internalConstructor + * @class * * @see Model#activeAnimations */ diff --git a/Source/Scene/ModelMaterial.js b/Source/Scene/ModelMaterial.js index cc149d1be3dd..2320fa940ea3 100644 --- a/Source/Scene/ModelMaterial.js +++ b/Source/Scene/ModelMaterial.js @@ -19,6 +19,7 @@ define([ * * @alias ModelMaterial * @internalConstructor + * @class * * @see Model#getMaterial */ diff --git a/Source/Scene/ModelMesh.js b/Source/Scene/ModelMesh.js index 6b1363d3b83f..bfd465d2fb3b 100644 --- a/Source/Scene/ModelMesh.js +++ b/Source/Scene/ModelMesh.js @@ -12,6 +12,7 @@ define([ * * @alias ModelMesh * @internalConstructor + * @class * * @see Model#getMesh */ diff --git a/Source/Scene/ModelNode.js b/Source/Scene/ModelNode.js index 619093d16196..31f3621a4f73 100644 --- a/Source/Scene/ModelNode.js +++ b/Source/Scene/ModelNode.js @@ -17,7 +17,7 @@ define([ * * @alias ModelNode * @internalConstructor - * + * @class * * @example * var node = model.getNode('LOD3sp'); diff --git a/Source/Scene/PointPrimitive.js b/Source/Scene/PointPrimitive.js index 94f370fbac7b..59c53fcfd154 100644 --- a/Source/Scene/PointPrimitive.js +++ b/Source/Scene/PointPrimitive.js @@ -52,6 +52,7 @@ define([ * @see PointPrimitiveCollection#add * * @internalConstructor + * @class * * @demo {@link https://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=Points.html|Cesium Sandcastle Points Demo} */ diff --git a/Source/Scene/Polyline.js b/Source/Scene/Polyline.js index d0ffbb25b86a..7bf13ccd366d 100644 --- a/Source/Scene/Polyline.js +++ b/Source/Scene/Polyline.js @@ -31,6 +31,7 @@ define([ * * @alias Polyline * @internalConstructor + * @class * * @param {Object} [options] Object with the following properties: * @param {Boolean} [options.show=true] true if this polyline will be shown; otherwise, false. diff --git a/Source/Scene/ShadowMap.js b/Source/Scene/ShadowMap.js index 76c5798a2927..217ebca7b0cc 100644 --- a/Source/Scene/ShadowMap.js +++ b/Source/Scene/ShadowMap.js @@ -112,6 +112,7 @@ define([ * * @alias ShadowMap * @internalConstructor + * @class * * @param {Object} options An object containing the following properties: * @param {Camera} options.lightCamera A camera representing the light source. diff --git a/Source/Scene/WebMapServiceImageryProvider.js b/Source/Scene/WebMapServiceImageryProvider.js index 9e581c0b7908..25c6a7f3b594 100644 --- a/Source/Scene/WebMapServiceImageryProvider.js +++ b/Source/Scene/WebMapServiceImageryProvider.js @@ -435,6 +435,7 @@ define([ * format=image/jpeg * * @constant + * @type {Object} */ WebMapServiceImageryProvider.DefaultParameters = freezeObject({ service : 'WMS', @@ -451,6 +452,7 @@ define([ * request=GetFeatureInfo * * @constant + * @type {Object} */ WebMapServiceImageryProvider.GetFeatureInfoDefaultParameters = freezeObject({ service : 'WMS', From 8f688211e41c49504a7a225f861410f13bfaea94 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Tue, 24 Jul 2018 12:31:30 -0400 Subject: [PATCH 11/30] fixes #6826 --- Source/Widgets/Viewer/Viewer.js | 8 ++++++-- Specs/Widgets/Viewer/ViewerSpec.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Source/Widgets/Viewer/Viewer.js b/Source/Widgets/Viewer/Viewer.js index d62b5e560f51..c3993a067d75 100644 --- a/Source/Widgets/Viewer/Viewer.js +++ b/Source/Widgets/Viewer/Viewer.js @@ -257,7 +257,7 @@ define([ * @param {Boolean} [options.baseLayerPicker=true] If set to false, the BaseLayerPicker widget will not be created. * @param {Boolean} [options.fullscreenButton=true] If set to false, the FullscreenButton widget will not be created. * @param {Boolean} [options.vrButton=false] If set to true, the VRButton widget will be created. - * @param {Boolean} [options.geocoder=true] If set to false, the Geocoder widget will not be created. + * @param {Boolean|GeocoderService[]} [options.geocoder=true] If set to false, the Geocoder widget will not be created. * @param {Boolean} [options.homeButton=true] If set to false, the HomeButton widget will not be created. * @param {Boolean} [options.infoBox=true] If set to false, the InfoBox widget will not be created. * @param {Boolean} [options.sceneModePicker=true] If set to false, the SceneModePicker widget will not be created. @@ -489,9 +489,13 @@ Either specify options.terrainProvider instead or set options.baseLayerPicker to var geocoderContainer = document.createElement('div'); geocoderContainer.className = 'cesium-viewer-geocoderContainer'; toolbar.appendChild(geocoderContainer); + var geocoderService; + if (defined(options.geocoder) && typeof options.geocoder !== 'boolean') { + geocoderService = isArray(options.geocoder) ? options.geocoder : [options.geocoder]; + } geocoder = new Geocoder({ container : geocoderContainer, - geocoderServices : defined(options.geocoder) ? (isArray(options.geocoder) ? options.geocoder : [options.geocoder]) : undefined, + geocoderServices : geocoderService, scene : scene }); // Subscribe to search so that we can clear the trackedEntity when it is clicked. diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js index c6d8e8462491..6de5697812e3 100644 --- a/Specs/Widgets/Viewer/ViewerSpec.js +++ b/Specs/Widgets/Viewer/ViewerSpec.js @@ -1,6 +1,7 @@ defineSuite([ 'Core/BoundingSphere', 'Core/Cartesian3', + 'Core/CartographicGeocoderService', 'Core/Clock', 'Core/ClockRange', 'Core/ClockStep', @@ -45,6 +46,7 @@ defineSuite([ ], 'Widgets/Viewer/Viewer', function( BoundingSphere, Cartesian3, + CartographicGeocoderService, Clock, ClockRange, ClockStep, @@ -386,6 +388,34 @@ defineSuite([ viewer.render(); }); + it('constructs geocoder', function() { + viewer = createViewer(container, { + geocoder : true + }); + expect(viewer.geocoder).toBeDefined(); + expect(viewer.geocoder.viewModel._geocoderServices.length).toBe(2); + }); + + it('constructs geocoder with geocoder service option', function() { + var service = new CartographicGeocoderService(); + viewer = createViewer(container, { + geocoder : service + }); + expect(viewer.geocoder).toBeDefined(); + expect(viewer.geocoder.viewModel._geocoderServices.length).toBe(1); + expect(viewer.geocoder.viewModel._geocoderServices[0]).toBe(service); + }); + + it('constructs geocoder with geocoder service options', function() { + var service = new CartographicGeocoderService(); + viewer = createViewer(container, { + geocoder : [service] + }); + expect(viewer.geocoder).toBeDefined(); + expect(viewer.geocoder.viewModel._geocoderServices.length).toBe(1); + expect(viewer.geocoder.viewModel._geocoderServices[0]).toBe(service); + }); + it('can shut off SelectionIndicator', function() { viewer = createViewer(container, { selectionIndicator : false From 1f51fad34d9620dd9f8685e5d7085f6db383d9f1 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Tue, 24 Jul 2018 12:33:25 -0400 Subject: [PATCH 12/30] CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index c5323b39591e..2cf45b24a872 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Change Log * Fixed a bug that caused eye dome lighting for point clouds to fail in Safari on macOS and Edge on Windows by removing the dependency on floating point color textures. [#6792](https://github.com/AnalyticalGraphicsInc/cesium/issues/6792) * Fixed a bug that caused polylines on terrain to render incorrectly in 2D and Columbus View with a `WebMercatorProjection`. [#6809](https://github.com/AnalyticalGraphicsInc/cesium/issues/6809) * Fixed bug where entities with a height reference weren't being updated correctly when the terrain provider was changed. [#6820](https://github.com/AnalyticalGraphicsInc/cesium/pull/6820) +* Fixed the geocoder when `Viewer` is passed the option `geocoder: true` [#6833](https://github.com/AnalyticalGraphicsInc/cesium/pull/6833) * Fixed a bug that caused billboard positions to be set incorrectly when using a `CallbackProperty`. [#6815](https://github.com/AnalyticalGraphicsInc/cesium/pull/6815) ### 1.47 - 2018-07-02 From 6e0911e1103d74019b40ebf3c192587760c25f89 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Tue, 24 Jul 2018 13:28:31 -0400 Subject: [PATCH 13/30] Remove all double quote usage from JS code 99% of this PR was automatically fixed with eslint, I simply removed the `"quotes": "off"` from Sandcastle and Specs which was ignoring the standard rule of using single quotes. Also added some Sandcastle generated files to .eslintignore. --- .eslintignore | 2 + Apps/Sandcastle/.eslintrc.json | 3 +- Apps/Sandcastle/CesiumSandcastle.js | 18 +- Apps/Sandcastle/LinkButton.js | 8 +- .../gallery/3D Models Coloring.html | 6 +- Apps/Sandcastle/gallery/3D Models.html | 8 +- .../gallery/3D Tiles Adjust Height.html | 6 +- Apps/Sandcastle/gallery/3D Tiles BIM.html | 20 +- .../3D Tiles Batch Table Hierarchy.html | 48 +-- .../gallery/3D Tiles Clipping Planes.html | 6 +- .../gallery/3D Tiles Feature Picking.html | 6 +- .../gallery/3D Tiles Feature Styling.html | 52 +-- Apps/Sandcastle/gallery/3D Tiles Formats.html | 20 +- .../gallery/3D Tiles Inspector.html | 6 +- .../gallery/3D Tiles Interactivity.html | 6 +- .../Sandcastle/gallery/3D Tiles Interior.html | 6 +- ...D Tiles Photogrammetry Classification.html | 6 +- .../gallery/3D Tiles Photogrammetry.html | 6 +- .../3D Tiles Point Cloud Classification.html | 8 +- .../gallery/3D Tiles Point Cloud Shading.html | 8 +- .../gallery/3D Tiles Point Cloud Styling.html | 90 ++--- .../gallery/3D Tiles Point Cloud.html | 6 +- .../3D Tiles Terrain Classification.html | 6 +- .../Sandcastle/gallery/Ambient Occlusion.html | 6 +- Apps/Sandcastle/gallery/ArcGIS MapServer.html | 6 +- Apps/Sandcastle/gallery/ArcticDEM.html | 6 +- Apps/Sandcastle/gallery/Atmosphere Color.html | 6 +- Apps/Sandcastle/gallery/Billboards.html | 6 +- Apps/Sandcastle/gallery/Bloom.html | 6 +- Apps/Sandcastle/gallery/Blue Marble.html | 6 +- Apps/Sandcastle/gallery/Box.html | 6 +- .../gallery/CZML Billboard and Label.html | 52 +-- Apps/Sandcastle/gallery/CZML Box.html | 84 ++-- .../gallery/CZML Circles and Ellipses.html | 94 ++--- Apps/Sandcastle/gallery/CZML Colors.html | 66 ++-- .../gallery/CZML Cones and Cylinders.html | 66 ++-- Apps/Sandcastle/gallery/CZML Corridor.html | 94 ++--- .../gallery/CZML Custom Properties.html | 82 ++-- .../CZML Model - Node Transformations.html | 52 +-- Apps/Sandcastle/gallery/CZML Model.html | 28 +- Apps/Sandcastle/gallery/CZML Path.html | 68 ++-- .../gallery/CZML Point - Time Dynamic.html | 36 +- Apps/Sandcastle/gallery/CZML Point.html | 34 +- ...ML Polygon - Interpolating References.html | 82 ++-- ...ZML Polygon - Intervals, Availability.html | 104 ++--- Apps/Sandcastle/gallery/CZML Polygon.html | 82 ++-- Apps/Sandcastle/gallery/CZML Polyline.html | 124 +++--- .../gallery/CZML Position Definitions.html | 78 ++-- Apps/Sandcastle/gallery/CZML Rectangle.html | 118 +++--- .../gallery/CZML Reference Properties.html | 104 ++--- .../gallery/CZML Spheres and Ellipsoids.html | 92 ++--- Apps/Sandcastle/gallery/CZML Wall.html | 28 +- Apps/Sandcastle/gallery/CZML ZIndex.html | 106 +++--- Apps/Sandcastle/gallery/CZML.html | 6 +- .../Sandcastle/gallery/Callback Property.html | 8 +- Apps/Sandcastle/gallery/Camera Tutorial.html | 6 +- Apps/Sandcastle/gallery/Camera.html | 6 +- Apps/Sandcastle/gallery/Cardboard.html | 6 +- Apps/Sandcastle/gallery/Cesium Inspector.html | 6 +- Apps/Sandcastle/gallery/Cesium Widget.html | 6 +- .../gallery/Cesium World Terrain.html | 6 +- .../gallery/Circles and Ellipses.html | 6 +- .../gallery/Classification Types.html | 6 +- Apps/Sandcastle/gallery/Classification.html | 6 +- Apps/Sandcastle/gallery/Clock.html | 12 +- Apps/Sandcastle/gallery/Clustering.html | 6 +- Apps/Sandcastle/gallery/Corridor.html | 6 +- .../Sandcastle/gallery/Custom DataSource.html | 6 +- Apps/Sandcastle/gallery/Custom Geocoder.html | 6 +- .../Custom Per-Feature Post Process.html | 6 +- .../gallery/Custom Post Process.html | 6 +- .../gallery/Cylinders and Cones.html | 6 +- .../gallery/DataSource Ordering.html | 84 ++-- Apps/Sandcastle/gallery/Depth of Field.html | 6 +- .../gallery/Distance Display Conditions.html | 6 +- .../gallery/Drawing on Terrain.html | 6 +- Apps/Sandcastle/gallery/Earth at Night.html | 6 +- .../gallery/GeoJSON and TopoJSON.html | 6 +- .../gallery/GeoJSON simplestyle.html | 6 +- .../gallery/Geometry Height Reference.html | 8 +- .../gallery/Geometry and Appearances.html | 6 +- Apps/Sandcastle/gallery/Globe Materials.html | 8 +- .../gallery/Google Earth Enterprise.html | 6 +- Apps/Sandcastle/gallery/Ground Clamping.html | 6 +- Apps/Sandcastle/gallery/HTML Overlays.html | 6 +- Apps/Sandcastle/gallery/HeadingPitchRoll.html | 6 +- Apps/Sandcastle/gallery/Hello World.html | 6 +- .../gallery/Imagery Adjustment.html | 6 +- .../gallery/Imagery Layers Manipulation.html | 8 +- .../gallery/Imagery Layers Split.html | 6 +- .../Imagery Layers Texture Filters.html | 8 +- Apps/Sandcastle/gallery/Imagery Layers.html | 6 +- Apps/Sandcastle/gallery/Interpolation.html | 6 +- Apps/Sandcastle/gallery/KML Tours.html | 6 +- Apps/Sandcastle/gallery/KML.html | 6 +- Apps/Sandcastle/gallery/Labels.html | 6 +- Apps/Sandcastle/gallery/LensFlare.html | 6 +- .../Sandcastle/gallery/LocalToFixedFrame.html | 6 +- Apps/Sandcastle/gallery/Map Pins.html | 6 +- Apps/Sandcastle/gallery/Materials.html | 6 +- Apps/Sandcastle/gallery/Multi-part CZML.html | 8 +- .../gallery/Multiple Synced Views.html | 6 +- Apps/Sandcastle/gallery/Natural Earth II.html | 6 +- Apps/Sandcastle/gallery/Offline.html | 6 +- Apps/Sandcastle/gallery/PAMAP Terrain.html | 6 +- .../gallery/Particle System Fireworks.html | 6 +- .../gallery/Particle System Tails.html | 6 +- .../gallery/Particle System Weather.html | 6 +- Apps/Sandcastle/gallery/Particle System.html | 6 +- .../gallery/Per-Feature Post Processing.html | 6 +- .../gallery/Physically-Based Materials.html | 22 +- Apps/Sandcastle/gallery/Picking.html | 6 +- Apps/Sandcastle/gallery/Plane.html | 6 +- Apps/Sandcastle/gallery/Points.html | 6 +- Apps/Sandcastle/gallery/Polygon.html | 8 +- Apps/Sandcastle/gallery/Polyline Dash.html | 10 +- Apps/Sandcastle/gallery/Polyline Volume.html | 6 +- Apps/Sandcastle/gallery/Polyline.html | 6 +- Apps/Sandcastle/gallery/Post Processing.html | 6 +- Apps/Sandcastle/gallery/Projection.html | 6 +- Apps/Sandcastle/gallery/Rectangle.html | 6 +- Apps/Sandcastle/gallery/Rotatable 2D Map.html | 6 +- .../gallery/Scene Rendering Performance.html | 8 +- Apps/Sandcastle/gallery/Sentinel-2.html | 6 +- Apps/Sandcastle/gallery/Shadows.html | 6 +- .../gallery/Show or Hide Entities.html | 6 +- .../gallery/Spheres and Ellipsoids.html | 6 +- Apps/Sandcastle/gallery/Star Burst.html | 6 +- .../gallery/Terrain Clipping Planes.html | 10 +- .../gallery/Terrain Exaggeration.html | 6 +- Apps/Sandcastle/gallery/Terrain.html | 6 +- .../gallery/Time Dynamic Point Cloud.html | 8 +- Apps/Sandcastle/gallery/Video.html | 6 +- Apps/Sandcastle/gallery/Wall.html | 6 +- .../gallery/Washington DC 2017.html | 6 +- .../gallery/Web Map Service (WMS).html | 6 +- .../Web Map Tile Service with Time.html | 8 +- .../gallery/Z-Indexing Geometry.html | 8 +- .../development/3D Models Instancing.html | 8 +- .../development/3D Models Node Explorer.html | 6 +- .../gallery/development/3D Models.html | 6 +- .../development/BillboardClampToGround.html | 6 +- .../development/Billboards Instancing.html | 6 +- .../gallery/development/Billboards.html | 6 +- .../gallery/development/Box Outline.html | 6 +- Apps/Sandcastle/gallery/development/Box.html | 6 +- .../gallery/development/Circle Outline.html | 6 +- .../gallery/development/Circle.html | 6 +- .../gallery/development/Clamp to Tileset.html | 8 +- .../development/Coplanar Polygon Outline.html | 8 +- .../gallery/development/Coplanar Polygon.html | 8 +- .../gallery/development/Corridor Outline.html | 6 +- .../gallery/development/Corridor.html | 6 +- .../gallery/development/Cylinder Outline.html | 6 +- .../gallery/development/Cylinder.html | 6 +- .../development/Display Conditions.html | 6 +- .../gallery/development/Ellipse Outline.html | 6 +- .../gallery/development/Ellipse.html | 6 +- .../development/Ellipsoid Outline.html | 6 +- .../development/Ellipsoid Surface.html | 6 +- .../gallery/development/Ellipsoid.html | 6 +- Apps/Sandcastle/gallery/development/Fog.html | 20 +- .../gallery/development/Frustum.html | 6 +- .../Geometry Offset Attribute.html | 8 +- .../development/Geometry and Appearances.html | 6 +- .../development/Ground Polyline Material.html | 6 +- .../Ground Primitive Materials.html | 8 +- .../gallery/development/Ground Primitive.html | 6 +- .../gallery/development/Labels.html | 6 +- .../development/Many Clipping Planes.html | 8 +- .../gallery/development/Material.html | 6 +- .../gallery/development/Multiple Shadows.html | 6 +- .../development/Per Instance Color.html | 6 +- .../gallery/development/Picking.html | 6 +- .../gallery/development/PointPrimitives.html | 6 +- .../gallery/development/Polygon Outline.html | 6 +- .../gallery/development/Polygon.html | 6 +- .../gallery/development/Polyline Color.html | 6 +- .../development/Polyline Material.html | 6 +- .../development/Polyline Volume Outline.html | 6 +- .../gallery/development/Polyline Volume.html | 6 +- .../gallery/development/Polyline.html | 6 +- .../development/Polylines On Terrain.html | 6 +- .../gallery/development/Polylines.html | 6 +- .../development/Rectangle Outline.html | 6 +- .../gallery/development/Rectangle.html | 6 +- .../gallery/development/Shadows.html | 6 +- .../gallery/development/Simple Polyline.html | 6 +- .../gallery/development/Sphere Outline.html | 6 +- .../gallery/development/Sphere.html | 6 +- .../development/Terrain Entity Batching.html | 8 +- .../gallery/development/Volumes.html | 6 +- .../gallery/development/Wall Outline.html | 6 +- Apps/Sandcastle/gallery/development/Wall.html | 6 +- .../templates/bucket-requirejs.html | 2 +- Specs/.eslintrc.json | 1 - Specs/Core/EarthOrientationParametersSpec.js | 16 +- Specs/Core/EllipsoidSpec.js | 2 +- Specs/Core/HeadingPitchRollSpec.js | 2 +- Specs/Core/PeliasGeocoderServiceSpec.js | 6 +- Specs/Core/PinBuilderSpec.js | 4 +- Specs/Core/PolylineGeometrySpec.js | 2 +- Specs/Core/SimplePolylineGeometrySpec.js | 2 +- Specs/Core/VRTheWorldTerrainProviderSpec.js | 4 +- Specs/Core/oneTimeWarningSpec.js | 2 +- Specs/Core/sampleTerrainMostDetailedSpec.js | 2 +- Specs/DataSources/CzmlDataSourceSpec.js | 50 +-- Specs/DataSources/EntityClusterSpec.js | 2 +- Specs/DataSources/KmlDataSourceSpec.js | 358 +++++++++--------- Specs/DataSources/ReferencePropertySpec.js | 2 +- Specs/DataSources/SampledPropertySpec.js | 4 +- Specs/Renderer/BufferSpec.js | 2 +- .../ArcGisMapServerImageryProviderSpec.js | 340 ++++++++--------- Specs/Scene/BingMapsImageryProviderSpec.js | 70 ++-- Specs/Scene/Cesium3DTileStyleSpec.js | 230 +++++------ Specs/Scene/ConditionsExpressionSpec.js | 2 +- Specs/Scene/ExpressionSpec.js | 32 +- .../GoogleEarthEnterpriseMapsProviderSpec.js | 64 ++-- Specs/Scene/ImageryLayerSpec.js | 38 +- Specs/Scene/LabelCollectionSpec.js | 4 +- .../WebMapTileServiceImageryProviderSpec.js | 2 +- ...createTileMapServiceImageryProviderSpec.js | 62 +-- .../Animation/AnimationViewModelSpec.js | 24 +- .../Cesium3DTilesInspectorViewModelSpec.js | 14 +- Specs/Widgets/ClockViewModelSpec.js | 18 +- Specs/createGlobe.js | 2 +- Specs/customizeJasmine.js | 2 +- Specs/karma-main.js | 2 +- Specs/karma.conf.js | 2 +- Specs/spec-main.js | 2 +- 230 files changed, 2227 insertions(+), 2225 deletions(-) diff --git a/.eslintignore b/.eslintignore index b678e5696558..0521a58a04bc 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,3 +8,5 @@ Source/ThirdParty/** Source/Workers/cesiumWorkerBootstrapper.js ThirdParty/** Tools/** +Apps/Sandcastle/jsHintOptions.js +Apps/Sandcastle/gallery/gallery-index.js diff --git a/Apps/Sandcastle/.eslintrc.json b/Apps/Sandcastle/.eslintrc.json index b2f72019ab4c..d740cb4f1c1f 100644 --- a/Apps/Sandcastle/.eslintrc.json +++ b/Apps/Sandcastle/.eslintrc.json @@ -10,7 +10,6 @@ "rules": { "no-alert": ["off"], "no-implicit-globals": "off", - "no-unused-vars": ["off"], - "quotes": "off" + "no-unused-vars": ["off"] } } diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js index fb64fbd22f61..5b496f4e87d6 100644 --- a/Apps/Sandcastle/CesiumSandcastle.js +++ b/Apps/Sandcastle/CesiumSandcastle.js @@ -27,10 +27,10 @@ require({ location: '../Apps/Sandcastle/ThirdParty' }] }, [ - "dijit/Dialog", - "dijit/form/Button", - "dijit/form/Form", - "dijit/form/Textarea", + 'dijit/Dialog', + 'dijit/form/Button', + 'dijit/form/Form', + 'dijit/form/Textarea', 'CodeMirror/lib/codemirror', 'dijit/layout/ContentPane', 'dijit/popup', @@ -549,10 +549,10 @@ require({ '//Sandcastle_End\n' + ' Sandcastle.finishedLoading();\n' + '}\n' + - 'if (typeof Cesium !== "undefined") {\n' + + 'if (typeof Cesium !== \'undefined\') {\n' + ' startup(Cesium);\n' + - '} else if (typeof require === "function") {\n' + - ' require(["Cesium"], startup);\n' + + '} else if (typeof require === \'function\') {\n' + + ' require([\'Cesium\'], startup);\n' + '}\n'; } @@ -949,7 +949,7 @@ require({ }); registry.byId('buttonImport').on('click', function() { - var gistId = document.getElementById("gistId").value; + var gistId = document.getElementById('gistId').value; var gistParameter = '&gist='; var gistIndex = gistId.indexOf(gistParameter); if (gistIndex !== -1) { @@ -1196,7 +1196,7 @@ require({ demoLink.className = 'linkButton'; demoLink.href = 'gallery/' + encodeURIComponent(demo.name) + '.html'; - if (demo.name === "Hello World") { + if (demo.name === 'Hello World') { newDemo = demo; } demoLink.onclick = function(e) { diff --git a/Apps/Sandcastle/LinkButton.js b/Apps/Sandcastle/LinkButton.js index 260b554b5af7..53d9d8a4591e 100644 --- a/Apps/Sandcastle/LinkButton.js +++ b/Apps/Sandcastle/LinkButton.js @@ -15,19 +15,19 @@ define([ 'use strict'; return declare('Sandcastle.LinkButton', [_WidgetBase, _TemplatedMixin, _CssStateMixin], { - baseClass : "dijitButton", + baseClass : 'dijitButton', templateString : template, showLabel : true, _setShowLabelAttr : function(val) { if (this.containerNode) { - domClass.toggle(this.containerNode, "dijitDisplayNone", !val); + domClass.toggle(this.containerNode, 'dijitDisplayNone', !val); } - this._set("showLabel", val); + this._set('showLabel', val); }, _setLabelAttr : function(/*String*/content) { - this._set("label", content); + this._set('label', content); (this.containerNode || this.focusNode).innerHTML = content; } }); diff --git a/Apps/Sandcastle/gallery/3D Models Coloring.html b/Apps/Sandcastle/gallery/3D Models Coloring.html index 44bb38c4f841..6178ade896c9 100644 --- a/Apps/Sandcastle/gallery/3D Models Coloring.html +++ b/Apps/Sandcastle/gallery/3D Models Coloring.html @@ -233,10 +233,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Models.html b/Apps/Sandcastle/gallery/3D Models.html index 929edaf59f53..1f753f589e41 100644 --- a/Apps/Sandcastle/gallery/3D Models.html +++ b/Apps/Sandcastle/gallery/3D Models.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html index 690c686479ef..ae52fbe99fb3 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html +++ b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html @@ -80,10 +80,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles BIM.html b/Apps/Sandcastle/gallery/3D Tiles BIM.html index 0d1e7bafc373..0d1a775a9349 100644 --- a/Apps/Sandcastle/gallery/3D Tiles BIM.html +++ b/Apps/Sandcastle/gallery/3D Tiles BIM.html @@ -2,7 +2,7 @@ - + @@ -10,10 +10,12 @@ @@ -38,12 +40,12 @@ console.log(error); }); //Sandcastle_End -Sandcastle.finishedLoading(); + Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html index 310e82bf5225..5583d1c8c76c 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html +++ b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html @@ -100,55 +100,55 @@ addStyle('No style', {}); addStyle('Color by building', { - "color" : { - "conditions" : [ + 'color' : { + 'conditions' : [ ["${building_name} === 'building0'", "color('purple')"], ["${building_name} === 'building1'", "color('red')"], ["${building_name} === 'building2'", "color('orange')"], - ["true", "color('blue')"] + ['true', "color('blue')"] ] } }); addStyle('Color all doors', { - "color" : { - "conditions" : [ + 'color' : { + 'conditions' : [ ["isExactClass('door')", "color('orange')"], - ["true", "color('white')"] + ['true', "color('white')"] ] } }); addStyle('Color all features derived from door', { - "color" : { - "conditions" : [ + 'color' : { + 'conditions' : [ ["isClass('door')", "color('orange')"], - ["true", "color('white')"] + ['true', "color('white')"] ] } }); addStyle('Color features by class name', { - "defines" : { - "suffix" : "regExp('door(.*)').exec(getExactClassName())" + 'defines' : { + 'suffix' : "regExp('door(.*)').exec(getExactClassName())" }, - "color" : { - "conditions" : [ + 'color' : { + 'conditions' : [ ["${suffix} === 'knob'", "color('yellow')"], ["${suffix} === ''", "color('lime')"], - ["${suffix} === null", "color('gray')"], - ["true", "color('blue')"] + ['${suffix} === null', "color('gray')"], + ['true', "color('blue')"] ] } }); addStyle('Style by height', { - "color" : { - "conditions" : [ - ["${height} >= 10", "color('purple')"], - ["${height} >= 6", "color('red')"], - ["${height} >= 5", "color('orange')"], - ["true", "color('blue')"] + 'color' : { + 'conditions' : [ + ['${height} >= 10', "color('purple')"], + ['${height} >= 6', "color('red')"], + ['${height} >= 5', "color('orange')"], + ['true', "color('blue')"] ] } }); @@ -200,10 +200,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html b/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html index 6f4ad71c76cc..fde98cb3c120 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html +++ b/Apps/Sandcastle/gallery/3D Tiles Clipping Planes.html @@ -264,10 +264,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html index bf941083af49..44abc7f58946 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html +++ b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html @@ -238,10 +238,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html index 1cb8824e1c2e..4f41639f3389 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html +++ b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html @@ -54,14 +54,14 @@ tileset.style = new Cesium.Cesium3DTileStyle({ color: { conditions: [ - ["${height} >= 300", "rgba(45, 0, 75, 0.5)"], - ["${height} >= 200", "rgb(102, 71, 151)"], - ["${height} >= 100", "rgb(170, 162, 204)"], - ["${height} >= 50", "rgb(224, 226, 238)"], - ["${height} >= 25", "rgb(252, 230, 200)"], - ["${height} >= 10", "rgb(248, 176, 87)"], - ["${height} >= 5", "rgb(198, 106, 11)"], - ["true", "rgb(127, 59, 8)"] + ['${height} >= 300', 'rgba(45, 0, 75, 0.5)'], + ['${height} >= 200', 'rgb(102, 71, 151)'], + ['${height} >= 100', 'rgb(170, 162, 204)'], + ['${height} >= 50', 'rgb(224, 226, 238)'], + ['${height} >= 25', 'rgb(252, 230, 200)'], + ['${height} >= 10', 'rgb(248, 176, 87)'], + ['${height} >= 5', 'rgb(198, 106, 11)'], + ['true', 'rgb(127, 59, 8)'] ] } }); @@ -71,17 +71,17 @@ function colorByLatitude() { tileset.style = new Cesium.Cesium3DTileStyle({ defines: { - latitudeRadians: "radians(${latitude})" + latitudeRadians: 'radians(${latitude})' }, color: { conditions: [ - ["${latitudeRadians} >= 0.7125", "color('purple')"], - ["${latitudeRadians} >= 0.712", "color('red')"], - ["${latitudeRadians} >= 0.7115", "color('orange')"], - ["${latitudeRadians} >= 0.711", "color('yellow')"], - ["${latitudeRadians} >= 0.7105", "color('lime')"], - ["${latitudeRadians} >= 0.710", "color('cyan')"], - ["true", "color('blue')"] + ['${latitudeRadians} >= 0.7125', "color('purple')"], + ['${latitudeRadians} >= 0.712', "color('red')"], + ['${latitudeRadians} >= 0.7115', "color('orange')"], + ['${latitudeRadians} >= 0.711', "color('yellow')"], + ['${latitudeRadians} >= 0.7105', "color('lime')"], + ['${latitudeRadians} >= 0.710', "color('cyan')"], + ['true', "color('blue')"] ] } }); @@ -91,15 +91,15 @@ function colorByDistance() { tileset.style = new Cesium.Cesium3DTileStyle({ defines : { - distance : "distance(vec2(radians(${longitude}), radians(${latitude})), vec2(-1.291777521, 0.7105706624))" + distance : 'distance(vec2(radians(${longitude}), radians(${latitude})), vec2(-1.291777521, 0.7105706624))' }, color : { conditions : [ - ["${distance} > 0.0012","color('gray')"], - ["${distance} > 0.0008", "mix(color('yellow'), color('red'), (${distance} - 0.008) / 0.0004)"], - ["${distance} > 0.0004", "mix(color('green'), color('yellow'), (${distance} - 0.0004) / 0.0004)"], - ["${distance} < 0.00001", "color('white')"], - ["true", "mix(color('blue'), color('green'), ${distance} / 0.0004)"] + ['${distance} > 0.0012',"color('gray')"], + ['${distance} > 0.0008', "mix(color('yellow'), color('red'), (${distance} - 0.008) / 0.0004)"], + ['${distance} > 0.0004', "mix(color('green'), color('yellow'), (${distance} - 0.0004) / 0.0004)"], + ['${distance} < 0.00001', "color('white')"], + ['true', "mix(color('blue'), color('green'), ${distance} / 0.0004)"] ] } }); @@ -115,7 +115,7 @@ // Show only buildings greater than 200 meters in height. function hideByHeight() { tileset.style = new Cesium.Cesium3DTileStyle({ - show : "${height} > 200" + show : '${height} > 200' }); } @@ -151,10 +151,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Formats.html b/Apps/Sandcastle/gallery/3D Tiles Formats.html index 8d45a6808936..7a1afdba6146 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Formats.html +++ b/Apps/Sandcastle/gallery/3D Tiles Formats.html @@ -122,13 +122,13 @@ tileset.style = new Cesium.Cesium3DTileStyle({ color: { conditions: [ - ["${Height} >= 83", "color('purple', 0.5)"], - ["${Height} >= 80", "color('red')"], - ["${Height} >= 70", "color('orange')"], - ["${Height} >= 12", "color('yellow')"], - ["${Height} >= 7", "color('lime')"], - ["${Height} >= 1", "color('cyan')"], - ["true", "color('blue')"] + ['${Height} >= 83', "color('purple', 0.5)"], + ['${Height} >= 80', "color('red')"], + ['${Height} >= 70', "color('orange')"], + ['${Height} >= 12', "color('yellow')"], + ['${Height} >= 7', "color('lime')"], + ['${Height} >= 1', "color('cyan')"], + ['true', "color('blue')"] ] } }); @@ -163,10 +163,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Inspector.html b/Apps/Sandcastle/gallery/3D Tiles Inspector.html index d447927ef377..5e5cf24e4865 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Inspector.html +++ b/Apps/Sandcastle/gallery/3D Tiles Inspector.html @@ -45,10 +45,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Interactivity.html b/Apps/Sandcastle/gallery/3D Tiles Interactivity.html index 573838a2849a..91bf12b00de8 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Interactivity.html +++ b/Apps/Sandcastle/gallery/3D Tiles Interactivity.html @@ -194,10 +194,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.html b/Apps/Sandcastle/gallery/3D Tiles Interior.html index a379ff88c0bb..5ce12aa89265 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Interior.html +++ b/Apps/Sandcastle/gallery/3D Tiles Interior.html @@ -45,10 +45,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html index 6877d474affd..6886394e42d6 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html +++ b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html @@ -64,10 +64,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html index a1555967b879..7d5e47553f71 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html +++ b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html @@ -38,10 +38,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html index 65985a0d08cb..14b36fd1bf9f 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html @@ -53,7 +53,7 @@ ["${id} === 'roof2'", "color('#004FFF', 0.5)"], ["${id} === 'tower3'", "color('#FF8833', 0.5)"], ["${id} === 'tower4'", "color('#FFAA22', 0.5)"], - ["true", "color('#FFFF00', 0.5)"] + ['true', "color('#FFFF00', 0.5)"] ] } }); @@ -94,10 +94,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html index 6084aa2698ba..a91fc186722f 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Shading.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html index f8045f32e619..fbeeef9b3266 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html @@ -52,7 +52,7 @@ }); addStyle('Color Gradient', { - color : "color() * ${temperature}" + color : 'color() * ${temperature}' }); addStyle('Step Red/Blue', { @@ -66,125 +66,125 @@ addStyle('Color Ramp', { color : { conditions : [ - ["${temperature} < 0.1", "color('#000099')"], - ["${temperature} < 0.2", "color('#00cc99', 1.0)"], - ["${temperature} < 0.3", "color('#66ff33', 0.5)"], - ["${temperature} < 0.4", "rgba(255, 255, 0, 0.1)"], - ["${temperature} < 0.5", "rgb(255, 128, 0)"], - ["${temperature} < 0.6", "color('red')"], - ["${temperature} < 0.7", "color('rgb(255, 102, 102)')"], - ["${temperature} < 0.8", "hsl(0.875, 1.0, 0.6)"], - ["${temperature} < 0.9", "hsla(0.83, 1.0, 0.5, 0.1)"], - ["true", "color('#FFFFFF', 1.0)"] + ['${temperature} < 0.1', "color('#000099')"], + ['${temperature} < 0.2', "color('#00cc99', 1.0)"], + ['${temperature} < 0.3', "color('#66ff33', 0.5)"], + ['${temperature} < 0.4', 'rgba(255, 255, 0, 0.1)'], + ['${temperature} < 0.5', 'rgb(255, 128, 0)'], + ['${temperature} < 0.6', "color('red')"], + ['${temperature} < 0.7', "color('rgb(255, 102, 102)')"], + ['${temperature} < 0.8', 'hsl(0.875, 1.0, 0.6)'], + ['${temperature} < 0.9', 'hsla(0.83, 1.0, 0.5, 0.1)'], + ['true', "color('#FFFFFF', 1.0)"] ] } }); addStyle('Transparency', { - color : "rgba(0, 255, 0, ${temperature})" + color : 'rgba(0, 255, 0, ${temperature})' }); addStyle('Hide Low Temperature', { - color : "rgb(${temperature}*255, 0, 0)", - show : "${temperature} > 0.3" + color : 'rgb(${temperature}*255, 0, 0)', + show : '${temperature} > 0.3' }); addStyle('Show Subsections', { - show : "${id} === 1 || ${id} > 250 && ${id} < 300" + show : '${id} === 1 || ${id} > 250 && ${id} < 300' }); addStyle('Mod', { - show : "${id} % 2 === 0" + show : '${id} % 2 === 0' }); addStyle('Abs', { - color : "color() * abs(${temperature} - 0.5)" + color : 'color() * abs(${temperature} - 0.5)' }); addStyle('Trigonometric Functions', { - color : "color() * radians(cos(${temperature})) + color() * sin(${temperature}) + color() * tan(${temperature})" + color : 'color() * radians(cos(${temperature})) + color() * sin(${temperature}) + color() * tan(${temperature})' }); addStyle('Arc Trigonometric Functions', { - color : "color() * acos(degrees(${temperature})) + color() * asin(${temperature}) + color() * atan(${temperature}) + color() * atan2(${POSITION}[0],${temperature})" + color : 'color() * acos(degrees(${temperature})) + color() * asin(${temperature}) + color() * atan(${temperature}) + color() * atan2(${POSITION}[0],${temperature})' }); addStyle('Sqrt', { - color : "color() * sqrt(${temperature})" + color : 'color() * sqrt(${temperature})' }); addStyle('Sign', { - color : "rgb(sign(${POSITION}[0]) * 255, sign(${POSITION}[1]) * 255, sign(${POSITION}[2]) * 255)" + color : 'rgb(sign(${POSITION}[0]) * 255, sign(${POSITION}[1]) * 255, sign(${POSITION}[2]) * 255)' }); addStyle('Rounding Functions', { - color : "rgb(floor(${POSITION}[0]) * 255, ceil(${POSITION}[1]) * 255, round(${POSITION}[2]) * 255)" + color : 'rgb(floor(${POSITION}[0]) * 255, ceil(${POSITION}[1]) * 255, round(${POSITION}[2]) * 255)' }); addStyle('Exp and Log Functions', { - color : "rgb(log(${POSITION}[0]) * 255, log2(${POSITION}[1]) * 255 + exp2(${POSITION}[1]) * 255, exp(${POSITION}[2]) * 255)" + color : 'rgb(log(${POSITION}[0]) * 255, log2(${POSITION}[1]) * 255 + exp2(${POSITION}[1]) * 255, exp(${POSITION}[2]) * 255)' }); addStyle('Fractional Part', { - color : "rgb(fract(${POSITION}[0]) * 255, fract(${POSITION}[1]) * 255, fract(${POSITION}[2]) * 255)" + color : 'rgb(fract(${POSITION}[0]) * 255, fract(${POSITION}[1]) * 255, fract(${POSITION}[2]) * 255)' }); addStyle('Pow', { - color : "color() * pow(${temperature}, 3)" + color : 'color() * pow(${temperature}, 3)' }); addStyle('Min and Max', { - color : "rgb(min(${POSITION}.x, 0.75) * 255, max(${POSITION}.z, 0.25) * 255, 255)" + color : 'rgb(min(${POSITION}.x, 0.75) * 255, max(${POSITION}.z, 0.25) * 255, 255)' }); addStyle('Clamp and Mix', { - color : "color() * clamp(${temperature}, 0.1, 0.2)" + color : 'color() * clamp(${temperature}, 0.1, 0.2)' }); addStyle('Secondary Color', { color : { conditions : [ - ["${id} < 250", "vec4(${secondaryColor}, 1.0)"], - ["${id} < 500", "vec4(${secondaryColor} * ${secondaryColor}, 1.0)"], - ["${id} < 750", "vec4(${secondaryColor} / 5.0, 1.0)"], - ["${id} < 1000", "rgb(0, 0, Number(${secondaryColor}.x < 0.5) * 255)"] + ['${id} < 250', 'vec4(${secondaryColor}, 1.0)'], + ['${id} < 500', 'vec4(${secondaryColor} * ${secondaryColor}, 1.0)'], + ['${id} < 750', 'vec4(${secondaryColor} / 5.0, 1.0)'], + ['${id} < 1000', 'rgb(0, 0, Number(${secondaryColor}.x < 0.5) * 255)'] ] } }); addStyle('Use point colors', { - color : "${COLOR} * ${temperature} + rgb(128,128,128)" + color : '${COLOR} * ${temperature} + rgb(128,128,128)' }); addStyle('Use point positions', { - show : "${POSITION}[0] > 0.5 || ${POSITION}[1] > 0.5 || ${POSITION}[2] > 0.5" + show : '${POSITION}[0] > 0.5 || ${POSITION}[1] > 0.5 || ${POSITION}[2] > 0.5' }); // POSITION contains 0 as its last component, so add 1.0 to make the point cloud opaque addStyle('Color based on position', { - color : "vec4(${POSITION}, 1.0)" + color : 'vec4(${POSITION}, 1.0)' }); addStyle('Style point size', { color : "color('red')", - pointSize : "${temperature} * 10" + pointSize : '${temperature} * 10' }); addStyle('Multiple defines', { defines : { - length : "length(${POSITION})", - time : "${tiles3d_tileset_time} * 3.0" + length : 'length(${POSITION})', + time : '${tiles3d_tileset_time} * 3.0' }, color : { conditions : [ - ["${length} < 0.5", "${length} * color('red')"], - ["${length} < 1.0", "vec4(vec3(${temperature} * fract(${time})), 1.0)"], - ["true", "${COLOR}"] + ['${length} < 0.5', "${length} * color('red')"], + ['${length} < 1.0', 'vec4(vec3(${temperature} * fract(${time})), 1.0)'], + ['true', '${COLOR}'] ] }, - pointSize : "5.0 - ${length} * 2.0", - show : "${length} < 2.0" + pointSize : '5.0 - ${length} * 2.0', + show : '${length} < 2.0' }); function setStyle(style) { @@ -206,10 +206,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html index 28044c3fd65d..ead11a1560d8 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html @@ -35,10 +35,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html b/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html index 0331f1d365ab..9c35752a1d37 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html +++ b/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html @@ -73,10 +73,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Ambient Occlusion.html b/Apps/Sandcastle/gallery/Ambient Occlusion.html index b13b908da0ec..9249b734d0a3 100644 --- a/Apps/Sandcastle/gallery/Ambient Occlusion.html +++ b/Apps/Sandcastle/gallery/Ambient Occlusion.html @@ -112,10 +112,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/ArcGIS MapServer.html b/Apps/Sandcastle/gallery/ArcGIS MapServer.html index b205658d1aee..8a2cdee4f9c4 100644 --- a/Apps/Sandcastle/gallery/ArcGIS MapServer.html +++ b/Apps/Sandcastle/gallery/ArcGIS MapServer.html @@ -41,10 +41,10 @@ });//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/ArcticDEM.html b/Apps/Sandcastle/gallery/ArcticDEM.html index a3c10a68e835..6055b1d80781 100644 --- a/Apps/Sandcastle/gallery/ArcticDEM.html +++ b/Apps/Sandcastle/gallery/ArcticDEM.html @@ -88,10 +88,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Atmosphere Color.html b/Apps/Sandcastle/gallery/Atmosphere Color.html index 9e23fbd04f6e..4d8885e463cf 100644 --- a/Apps/Sandcastle/gallery/Atmosphere Color.html +++ b/Apps/Sandcastle/gallery/Atmosphere Color.html @@ -114,10 +114,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Billboards.html b/Apps/Sandcastle/gallery/Billboards.html index a986db1a055c..19293e45cea4 100644 --- a/Apps/Sandcastle/gallery/Billboards.html +++ b/Apps/Sandcastle/gallery/Billboards.html @@ -315,10 +315,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Bloom.html b/Apps/Sandcastle/gallery/Bloom.html index b249b805deac..3f921d3817c2 100644 --- a/Apps/Sandcastle/gallery/Bloom.html +++ b/Apps/Sandcastle/gallery/Bloom.html @@ -121,10 +121,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Blue Marble.html b/Apps/Sandcastle/gallery/Blue Marble.html index ebbaba72154c..ee925c2f573f 100644 --- a/Apps/Sandcastle/gallery/Blue Marble.html +++ b/Apps/Sandcastle/gallery/Blue Marble.html @@ -34,10 +34,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Box.html b/Apps/Sandcastle/gallery/Box.html index 14c975158f4e..8c02e0f3add3 100644 --- a/Apps/Sandcastle/gallery/Box.html +++ b/Apps/Sandcastle/gallery/Box.html @@ -64,10 +64,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Billboard and Label.html b/Apps/Sandcastle/gallery/CZML Billboard and Label.html index 37889f6d28ca..9fd36e770a41 100644 --- a/Apps/Sandcastle/gallery/CZML Billboard and Label.html +++ b/Apps/Sandcastle/gallery/CZML Billboard and Label.html @@ -29,35 +29,35 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "Basic CZML billboard and label", - "version" : "1.0" + 'id' : 'document', + 'name' : 'Basic CZML billboard and label', + 'version' : '1.0' }, { - "id" : "some-unique-id", - "name" : "AGI", - "description" : "

Analytical Graphics, Inc. (AGI) founded Cesium.

", - "billboard" : { - "image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACvSURBVDhPrZDRDcMgDAU9GqN0lIzijw6SUbJJygUeNQgSqepJTyHG91LVVpwDdfxM3T9TSl1EXZvDwii471fivK73cBFFQNTT/d2KoGpfGOpSIkhUpgUMxq9DFEsWv4IXhlyCnhBFnZcFEEuYqbiUlNwWgMTdrZ3JbQFoEVG53rd8ztG9aPJMnBUQf/VFraBJeWnLS0RfjbKyLJA8FkT5seDYS1Qwyv8t0B/5C2ZmH2/eTGNNBgMmAAAAAElFTkSuQmCC", - "scale" : 1.5 + 'id' : 'some-unique-id', + 'name' : 'AGI', + 'description' : "

Analytical Graphics, Inc. (AGI) founded Cesium.

", + 'billboard' : { + 'image' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACvSURBVDhPrZDRDcMgDAU9GqN0lIzijw6SUbJJygUeNQgSqepJTyHG91LVVpwDdfxM3T9TSl1EXZvDwii471fivK73cBFFQNTT/d2KoGpfGOpSIkhUpgUMxq9DFEsWv4IXhlyCnhBFnZcFEEuYqbiUlNwWgMTdrZ3JbQFoEVG53rd8ztG9aPJMnBUQf/VFraBJeWnLS0RfjbKyLJA8FkT5seDYS1Qwyv8t0B/5C2ZmH2/eTGNNBgMmAAAAAElFTkSuQmCC', + 'scale' : 1.5 }, - "label" : { - "fillColor" : { - "rgba" : [255, 255, 255, 255] + 'label' : { + 'fillColor' : { + 'rgba' : [255, 255, 255, 255] }, - "font" : "12pt Lucida Console", - "horizontalOrigin" : "LEFT", - "pixelOffset" : { - "cartesian2" : [8, 0] + 'font' : '12pt Lucida Console', + 'horizontalOrigin' : 'LEFT', + 'pixelOffset' : { + 'cartesian2' : [8, 0] }, - "style" : "FILL", - "text" : "AGI", - "showBackground" : true, - "backgroundColor" : { - "rgba" : [112, 89, 57, 200] + 'style' : 'FILL', + 'text' : 'AGI', + 'showBackground' : true, + 'backgroundColor' : { + 'rgba' : [112, 89, 57, 200] } }, - "position" : { - "cartesian":[ + 'position' : { + 'cartesian':[ 1216361.4096947117, -4736253.175342511, 4081267.4865667094 ] } @@ -68,10 +68,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Box.html b/Apps/Sandcastle/gallery/CZML Box.html index 501bb78a05ea..541351efe7fa 100644 --- a/Apps/Sandcastle/gallery/CZML Box.html +++ b/Apps/Sandcastle/gallery/CZML Box.html @@ -29,63 +29,63 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "box", - "version" : "1.0" + 'id' : 'document', + 'name' : 'box', + 'version' : '1.0' }, { - "id" : "shape1", - "name" : "Blue box", - "position" : { - "cartographicDegrees" : [-114.0, 40.0, 300000.0] + 'id' : 'shape1', + 'name' : 'Blue box', + 'position' : { + 'cartographicDegrees' : [-114.0, 40.0, 300000.0] }, - "box" : { - "dimensions" : { - "cartesian": [400000.0, 300000.0, 500000.0] + 'box' : { + 'dimensions' : { + 'cartesian': [400000.0, 300000.0, 500000.0] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 0, 255, 255] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 0, 255, 255] } } } } }, { - "id" : "shape2", - "name" : "Red box with black outline", - "position" : { - "cartographicDegrees" : [-107.0, 40.0, 300000.0] + 'id' : 'shape2', + 'name' : 'Red box with black outline', + 'position' : { + 'cartographicDegrees' : [-107.0, 40.0, 300000.0] }, - "box" : { - "dimensions" : { - "cartesian": [400000.0, 300000.0, 500000.0] + 'box' : { + 'dimensions' : { + 'cartesian': [400000.0, 300000.0, 500000.0] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 128] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 128] } } }, - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }, { - "id" : "shape3", - "name" : "Yellow box outline", - "position" : { - "cartographicDegrees" : [-100.0, 40.0, 300000.0] + 'id' : 'shape3', + 'name' : 'Yellow box outline', + 'position' : { + 'cartographicDegrees' : [-100.0, 40.0, 300000.0] }, - "box" : { - "dimensions" : { - "cartesian": [400000.0, 300000.0, 500000.0] + 'box' : { + 'dimensions' : { + 'cartesian': [400000.0, 300000.0, 500000.0] }, - "fill" : false, - "outline" : true, - "outlineColor" : { - "rgba" : [255, 255, 0, 255] + 'fill' : false, + 'outline' : true, + 'outlineColor' : { + 'rgba' : [255, 255, 0, 255] } } }]; @@ -97,10 +97,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Circles and Ellipses.html b/Apps/Sandcastle/gallery/CZML Circles and Ellipses.html index 21dee0241acc..f502776cd573 100644 --- a/Apps/Sandcastle/gallery/CZML Circles and Ellipses.html +++ b/Apps/Sandcastle/gallery/CZML Circles and Ellipses.html @@ -29,68 +29,68 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Circles and Ellipses", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Circles and Ellipses', + 'version' : '1.0' }, { - "id" : "shape1", - "name" : "Green circle at height", - "position" : { - "cartographicDegrees" : [-111.0, 40.0, 150000.0] + 'id' : 'shape1', + 'name' : 'Green circle at height', + 'position' : { + 'cartographicDegrees' : [-111.0, 40.0, 150000.0] }, - "ellipse" : { - "semiMinorAxis" : 300000.0, - "semiMajorAxis" : 300000.0, - "height" : 200000.0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 255] + 'ellipse' : { + 'semiMinorAxis' : 300000.0, + 'semiMajorAxis' : 300000.0, + 'height' : 200000.0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 255] } } } } }, { - "id" : "shape2", - "name" : "Red ellipse with white outline on surface", - "position" : { - "cartographicDegrees" : [-103.0, 40.0, 0] + 'id' : 'shape2', + 'name' : 'Red ellipse with white outline on surface', + 'position' : { + 'cartographicDegrees' : [-103.0, 40.0, 0] }, - "ellipse" : { - "semiMinorAxis" : 250000.0, - "semiMajorAxis" : 400000.0, - "height" : 0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 127] + 'ellipse' : { + 'semiMinorAxis' : 250000.0, + 'semiMajorAxis' : 400000.0, + 'height' : 0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 127] } } }, - "outline" : true, // height must be set for outlines to display - "outlineColor" : { - "rgba" : [255, 255, 255, 255] + 'outline' : true, // height must be set for outlines to display + 'outlineColor' : { + 'rgba' : [255, 255, 255, 255] } } }, { - "id" : "shape3", - "name" : "Blue translucent, rotated, and extruded ellipse with outline", - "position" : { - "cartographicDegrees" : [-95.0, 40.0, 100000.0] + 'id' : 'shape3', + 'name' : 'Blue translucent, rotated, and extruded ellipse with outline', + 'position' : { + 'cartographicDegrees' : [-95.0, 40.0, 100000.0] }, - "ellipse" : { - "semiMinorAxis" : 150000.0, - "semiMajorAxis" : 300000.0, - "extrudedHeight" : 200000.0, - "rotation" : 0.78539, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 0, 255, 127] + 'ellipse' : { + 'semiMinorAxis' : 150000.0, + 'semiMajorAxis' : 300000.0, + 'extrudedHeight' : 200000.0, + 'rotation' : 0.78539, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 0, 255, 127] } } }, - "outline" : true + 'outline' : true } }]; @@ -102,10 +102,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Colors.html b/Apps/Sandcastle/gallery/CZML Colors.html index 986b3ad71f38..138f93945deb 100644 --- a/Apps/Sandcastle/gallery/CZML Colors.html +++ b/Apps/Sandcastle/gallery/CZML Colors.html @@ -29,47 +29,47 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Colors", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Colors', + 'version' : '1.0' }, { - "id" : "rgba", - "name" : "Rectangle with outline using RGBA Colors", - "rectangle" : { - "coordinates" : { - "wsenDegrees" : [-120, 40, -110, 50] + 'id' : 'rgba', + 'name' : 'Rectangle with outline using RGBA Colors', + 'rectangle' : { + 'coordinates' : { + 'wsenDegrees' : [-120, 40, -110, 50] }, - "fill" : true, - "material" : { - "solidColor" : { - "color": { - "rgba" : [255, 0, 0, 100] + 'fill' : true, + 'material' : { + 'solidColor' : { + 'color': { + 'rgba' : [255, 0, 0, 100] } } }, - "height" : 0, // disables ground clamping, needed for outlines - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'height' : 0, // disables ground clamping, needed for outlines + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }, { - "id" : "rgbaf", - "name" : "Rectangle using RGBAF Colors", - "rectangle" : { - "coordinates" : { "wsenDegrees" : [-100, 40, -90, 50] }, - "fill" : true, - "material" : { - "solidColor" : { - "color": { - "rgbaf" : [1, 0, 0, 0.39] + 'id' : 'rgbaf', + 'name' : 'Rectangle using RGBAF Colors', + 'rectangle' : { + 'coordinates' : { 'wsenDegrees' : [-100, 40, -90, 50] }, + 'fill' : true, + 'material' : { + 'solidColor' : { + 'color': { + 'rgbaf' : [1, 0, 0, 0.39] } } }, - "height" : 0, // disables ground clamping, needed for outlines - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'height' : 0, // disables ground clamping, needed for outlines + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }]; @@ -80,10 +80,10 @@ viewer.zoomTo(dataSourcePromise);//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Cones and Cylinders.html b/Apps/Sandcastle/gallery/CZML Cones and Cylinders.html index b69d26d3cf4d..3e25d970304b 100644 --- a/Apps/Sandcastle/gallery/CZML Cones and Cylinders.html +++ b/Apps/Sandcastle/gallery/CZML Cones and Cylinders.html @@ -29,45 +29,45 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Cones and Cylinders", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Cones and Cylinders', + 'version' : '1.0' }, { - "id" : "shape1", - "name" : "Green cylinder with black outline", - "position" : { - "cartographicDegrees" : [-100.0, 40.0, 200000.0] + 'id' : 'shape1', + 'name' : 'Green cylinder with black outline', + 'position' : { + 'cartographicDegrees' : [-100.0, 40.0, 200000.0] }, - "cylinder" : { - "length" : 400000.0, - "topRadius" : 200000.0, - "bottomRadius" : 200000.0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 128] + 'cylinder' : { + 'length' : 400000.0, + 'topRadius' : 200000.0, + 'bottomRadius' : 200000.0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 128] } } }, - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }, { - "id" : "shape2", - "name" : "Red cone", - "position" : { - "cartographicDegrees" : [-105.0, 40.0, 200000.0] + 'id' : 'shape2', + 'name' : 'Red cone', + 'position' : { + 'cartographicDegrees' : [-105.0, 40.0, 200000.0] }, - "cylinder" : { - "length" : 400000.0, - "topRadius" : 0.0, - "bottomRadius" : 200000.0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 255] + 'cylinder' : { + 'length' : 400000.0, + 'topRadius' : 0.0, + 'bottomRadius' : 200000.0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 255] } } } @@ -82,10 +82,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Corridor.html b/Apps/Sandcastle/gallery/CZML Corridor.html index 544d08676400..24bcfe0da19e 100644 --- a/Apps/Sandcastle/gallery/CZML Corridor.html +++ b/Apps/Sandcastle/gallery/CZML Corridor.html @@ -29,80 +29,80 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Polyline", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Polyline', + 'version' : '1.0' }, { - "id" : "redCorridor", - "name" : "Red corridor on surface with rounded corners", - "corridor" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'redCorridor', + 'name' : 'Red corridor on surface with rounded corners', + 'corridor' : { + 'positions' : { + 'cartographicDegrees' : [ -100.0, 40.0, 0, -105.0, 40.0, 0, -105.0, 35.0, 0 ] }, - "width" : 200000.0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 127] + 'width' : 200000.0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 127] } } } } }, { - "id" : "greenCorridor", - "name" : "Green corridor at height with mitered corners and outline", - "corridor" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'greenCorridor', + 'name' : 'Green corridor at height with mitered corners and outline', + 'corridor' : { + 'positions' : { + 'cartographicDegrees' : [ -90.0, 40.0, 0, -95.0, 40.0, 0, -95.0, 35.0, 0 ] }, - "height" : 100000.0, - "cornerType" : "MITERED", - "width" : 200000.0, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 255] + 'height' : 100000.0, + 'cornerType' : 'MITERED', + 'width' : 200000.0, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 255] } } }, - "outline" : true, // height must be set for outlines to display - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'outline' : true, // height must be set for outlines to display + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }, { - "id" : "blueCorridor", - "name" : "Blue extruded corridor with beveled corners and outline", - "corridor" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'blueCorridor', + 'name' : 'Blue extruded corridor with beveled corners and outline', + 'corridor' : { + 'positions' : { + 'cartographicDegrees' : [ -80.0, 40.0, 0, -85.0, 40.0, 0, -85.0, 35.0, 0 ] }, - "height" : 200000.0, - "extrudedHeight" : 100000.0, - "width" : 200000.0, - "cornerType": "BEVELED", - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 0, 255, 255] + 'height' : 200000.0, + 'extrudedHeight' : 100000.0, + 'width' : 200000.0, + 'cornerType': 'BEVELED', + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 0, 255, 255] } } }, - "outline" : true, - "outlineColor" : { - "rgba" : [255, 255, 255, 255] + 'outline' : true, + 'outlineColor' : { + 'rgba' : [255, 255, 255, 255] } } }]; @@ -115,10 +115,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Custom Properties.html b/Apps/Sandcastle/gallery/CZML Custom Properties.html index 08ac7c451591..2fe071b4d48a 100644 --- a/Apps/Sandcastle/gallery/CZML Custom Properties.html +++ b/Apps/Sandcastle/gallery/CZML Custom Properties.html @@ -32,63 +32,63 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Custom Properties", - "version" : "1.0", - "clock": { - "interval": "1970/2010", - "currentTime": "1970", - "multiplier": 500000000 + 'id' : 'document', + 'name' : 'CZML Custom Properties', + 'version' : '1.0', + 'clock': { + 'interval': '1970/2010', + 'currentTime': '1970', + 'multiplier': 500000000 } }, { - "id" : "custom_property_object", - "name" : "An object with custom properties", - "properties" : { - "constant_property" : true, - "population_intervals" : [{ - "interval": "1970/1980", - "number": 2209600 + 'id' : 'custom_property_object', + 'name' : 'An object with custom properties', + 'properties' : { + 'constant_property' : true, + 'population_intervals' : [{ + 'interval': '1970/1980', + 'number': 2209600 }, { - "interval": "1980/2090", - "number": 2889700 + 'interval': '1980/2090', + 'number': 2889700 }, { - "interval" : "1990/2000", - "number": 3307600 + 'interval' : '1990/2000', + 'number': 3307600 }, { - "interval" : "2000/2010", - "number" : 4326900 + 'interval' : '2000/2010', + 'number' : 4326900 }], - "population_sampled" : { - "number": [ - "1970", 2209600, - "1980", 2889700, - "1990", 3307600, - "2000", 4326900, - "2010", 5049100 + 'population_sampled' : { + 'number': [ + '1970', 2209600, + '1980', 2889700, + '1990', 3307600, + '2000', 4326900, + '2010', 5049100 ] } } }, { - "id" : "colorado", - "name" : "Colorado", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'colorado', + 'name' : 'Colorado', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -109.03, 41, 0, -102.03, 41, 0, -102.03, 37, 0, -109.03, 37, 0 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 150] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 150] } } }, - "height" : 0, - "extrudedHeight": 0 + 'height' : 0, + 'extrudedHeight': 0 } }]; @@ -138,10 +138,10 @@ viewer.zoomTo(dataSource);//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html b/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html index e740ea211c71..a6920d04bf8d 100644 --- a/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html +++ b/Apps/Sandcastle/gallery/CZML Model - Node Transformations.html @@ -29,39 +29,39 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Model", - "version" : "1.0", - "clock": { - "interval": "2015-01-01T00:00:00Z/2015-01-01T00:00:20Z", - "currentTime": "2015-01-01T00:00:00Z", - "multiplier": 20 + 'id' : 'document', + 'name' : 'CZML Model', + 'version' : '1.0', + 'clock': { + 'interval': '2015-01-01T00:00:00Z/2015-01-01T00:00:20Z', + 'currentTime': '2015-01-01T00:00:00Z', + 'multiplier': 20 } }, { - "id" : "model", - "position" : { - "cartographicDegrees" : [-77, 37, 100000] + 'id' : 'model', + 'position' : { + 'cartographicDegrees' : [-77, 37, 100000] }, - "viewFrom" : { - "cartesian" : [4.3, 0.1, 2.6] + 'viewFrom' : { + 'cartesian' : [4.3, 0.1, 2.6] }, - "model": { - "gltf" : "../../SampleData/models/CesiumMan/Cesium_Man.glb", - "runAnimations": false, - "nodeTransformations": { - "Skeleton_arm_joint_L__3_": { - "rotation": { - "epoch": "2015-01-01T00:00:00Z", - "unitQuaternion":[ + 'model': { + 'gltf' : '../../SampleData/models/CesiumMan/Cesium_Man.glb', + 'runAnimations': false, + 'nodeTransformations': { + 'Skeleton_arm_joint_L__3_': { + 'rotation': { + 'epoch': '2015-01-01T00:00:00Z', + 'unitQuaternion':[ 0,-0.7762877147481148, -0.16428915803853994, 0.3706585477262082, 0.482699386243276, 10,-0.6840422631464792, -0.40211904424847345, 0.05175867757399086, 0.6063888981321548, 20,-0.7762877147481148, -0.16428915803853994, 0.3706585477262082, 0.482699386243276 ] } }, - "Skeleton_arm_joint_R__2_": { - "rotation": { - "unitQuaternion": [ + 'Skeleton_arm_joint_R__2_': { + 'rotation': { + 'unitQuaternion': [ 0.31933321618140015, 0.5055578277509731, -0.5903490075872426, 0.5421490838170975 ] } @@ -83,10 +83,10 @@ });//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Model.html b/Apps/Sandcastle/gallery/CZML Model.html index 6a49da3dfa2b..ed76e5ff414a 100644 --- a/Apps/Sandcastle/gallery/CZML Model.html +++ b/Apps/Sandcastle/gallery/CZML Model.html @@ -29,19 +29,19 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Model", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Model', + 'version' : '1.0' }, { - "id" : "aircraft model", - "name" : "Cesium Air", - "position" : { - "cartographicDegrees" : [-77, 37, 10000] + 'id' : 'aircraft model', + 'name' : 'Cesium Air', + 'position' : { + 'cartographicDegrees' : [-77, 37, 10000] }, - "model": { - "gltf" : "../../SampleData/models/CesiumAir/Cesium_Air.glb", - "scale" : 2.0, - "minimumPixelSize": 128 + 'model': { + 'gltf' : '../../SampleData/models/CesiumAir/Cesium_Air.glb', + 'scale' : 2.0, + 'minimumPixelSize': 128 } }]; @@ -60,10 +60,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Path.html b/Apps/Sandcastle/gallery/CZML Path.html index 4bcd470dcf3a..b3235e47bcd1 100644 --- a/Apps/Sandcastle/gallery/CZML Path.html +++ b/Apps/Sandcastle/gallery/CZML Path.html @@ -29,46 +29,46 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Path", - "version" : "1.0", - "clock": { - "interval": "2012-08-04T10:00:00Z/2012-08-04T15:00:00Z", - "currentTime": "2012-08-04T10:00:00Z", - "multiplier": 10 + 'id' : 'document', + 'name' : 'CZML Path', + 'version' : '1.0', + 'clock': { + 'interval': '2012-08-04T10:00:00Z/2012-08-04T15:00:00Z', + 'currentTime': '2012-08-04T10:00:00Z', + 'multiplier': 10 } }, { - "id" : "path", - "name" : "path with GPS flight data", - "description" : "

Hang gliding flight log data from Daniel H. Friedman.
Icon created by Larisa Skosyrska from the Noun Project

", - "availability" : "2012-08-04T10:00:00Z/2012-08-04T15:00:00Z", - "path" : { - "material" : { - "polylineOutline" : { - "color" : { - "rgba" : [255, 0, 255, 255] + 'id' : 'path', + 'name' : 'path with GPS flight data', + 'description' : '

Hang gliding flight log data from Daniel H. Friedman.
Icon created by Larisa Skosyrska from the Noun Project

', + 'availability' : '2012-08-04T10:00:00Z/2012-08-04T15:00:00Z', + 'path' : { + 'material' : { + 'polylineOutline' : { + 'color' : { + 'rgba' : [255, 0, 255, 255] }, - "outlineColor" : { - "rgba" : [0, 255, 255, 255] + 'outlineColor' : { + 'rgba' : [0, 255, 255, 255] }, - "outlineWidth" : 5 + 'outlineWidth' : 5 } }, - "width" : 8, - "leadTime" : 10, - "trailTime" : 1000, - "resolution" : 5 + 'width' : 8, + 'leadTime' : 10, + 'trailTime' : 1000, + 'resolution' : 5 }, - "billboard" : { - "image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=", - "scale" : 1.5, - "eyeOffset": { - "cartesian": [ 0.0, 0.0, -10.0 ] + 'billboard' : { + 'image' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=', + 'scale' : 1.5, + 'eyeOffset': { + 'cartesian': [ 0.0, 0.0, -10.0 ] } }, - "position" : { - "epoch" : "2012-08-04T10:00:00Z", - "cartographicDegrees" : [ + 'position' : { + 'epoch' : '2012-08-04T10:00:00Z', + 'cartographicDegrees' : [ 0,-122.93797,39.50935,1776, 10,-122.93822,39.50918,1773, 20,-122.9385,39.50883,1772, @@ -1876,10 +1876,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Point - Time Dynamic.html b/Apps/Sandcastle/gallery/CZML Point - Time Dynamic.html index d381546af221..29e0b8a2edff 100644 --- a/Apps/Sandcastle/gallery/CZML Point - Time Dynamic.html +++ b/Apps/Sandcastle/gallery/CZML Point - Time Dynamic.html @@ -29,30 +29,30 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Point - Time Dynamic", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Point - Time Dynamic', + 'version' : '1.0' }, { - "id" : "point", - "availability" :"2012-08-04T16:00:00Z/2012-08-04T16:05:00Z", - "position" : { - "epoch" : "2012-08-04T16:00:00Z", - "cartographicDegrees" : [ + 'id' : 'point', + 'availability' :'2012-08-04T16:00:00Z/2012-08-04T16:05:00Z', + 'position' : { + 'epoch' : '2012-08-04T16:00:00Z', + 'cartographicDegrees' : [ 0, -70, 20, 150000, 100, -80, 44, 150000, 200, -90, 18, 150000, 300, -98, 52, 150000 ] }, - "point" : { - "color" : { - "rgba" : [255, 255, 255, 128] + 'point' : { + 'color' : { + 'rgba' : [255, 255, 255, 128] }, - "outlineColor" : { - "rgba" : [255, 0, 0, 128] + 'outlineColor' : { + 'rgba' : [255, 0, 0, 128] }, - "outlineWidth" : 3, - "pixelSize" : 15 + 'outlineWidth' : 3, + 'pixelSize' : 15 } }]; @@ -65,10 +65,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Point.html b/Apps/Sandcastle/gallery/CZML Point.html index 2a1565a37ac7..c182214ccf26 100644 --- a/Apps/Sandcastle/gallery/CZML Point.html +++ b/Apps/Sandcastle/gallery/CZML Point.html @@ -29,24 +29,24 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Point", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Point', + 'version' : '1.0' }, { - "id" : "point 1", - "name": "point", - "position" : { - "cartographicDegrees" : [-111.0, 40.0, 0] + 'id' : 'point 1', + 'name': 'point', + 'position' : { + 'cartographicDegrees' : [-111.0, 40.0, 0] }, - "point": { - "color": { - "rgba": [255, 255, 255, 255] + 'point': { + 'color': { + 'rgba': [255, 255, 255, 255] }, - "outlineColor": { - "rgba": [255, 0, 0, 255] + 'outlineColor': { + 'rgba': [255, 0, 0, 255] }, - "outlineWidth" : 4, - "pixelSize": 20 + 'outlineWidth' : 4, + 'pixelSize': 20 } }]; @@ -58,10 +58,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Polygon - Interpolating References.html b/Apps/Sandcastle/gallery/CZML Polygon - Interpolating References.html index fb4eb821a141..ea7485322042 100644 --- a/Apps/Sandcastle/gallery/CZML Polygon - Interpolating References.html +++ b/Apps/Sandcastle/gallery/CZML Polygon - Interpolating References.html @@ -29,42 +29,42 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Polygon - Interpolating References", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Polygon - Interpolating References', + 'version' : '1.0' }, { - "id" : "dynamicPolygon", - "name": "Dynamic Polygon with Reference Properties", - "availability":"2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "polygon": { - "positions": { - "references": [ - "v1#position", - "v2#position", - "v3#position" + 'id' : 'dynamicPolygon', + 'name': 'Dynamic Polygon with Reference Properties', + 'availability':'2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'polygon': { + 'positions': { + 'references': [ + 'v1#position', + 'v2#position', + 'v3#position' ] }, - "perPositionHeight" : true, - "material": { - "solidColor": { - "color": [{ - "interval" : "2012-08-04T16:00:00Z/2012-08-04T16:25:00Z", - "rgbaf" : [1, 0, 1, 1] + 'perPositionHeight' : true, + 'material': { + 'solidColor': { + 'color': [{ + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T16:25:00Z', + 'rgbaf' : [1, 0, 1, 1] }, { - "interval" : "2012-08-04T16:30:00Z/2012-08-04T17:00:00Z", - "rgbaf" : [0, 1, 1, 1] + 'interval' : '2012-08-04T16:30:00Z/2012-08-04T17:00:00Z', + 'rgbaf' : [0, 1, 1, 1] }] } } } }, { - "id": "v1", - "position": { - "interpolationAlgorithm": "LINEAR", - "interpolationDegree": 1, - "interval" : "2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "epoch" : "2012-08-04T16:00:00Z", - "cartographicDegrees": [ + 'id': 'v1', + 'position': { + 'interpolationAlgorithm': 'LINEAR', + 'interpolationDegree': 1, + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'epoch' : '2012-08-04T16:00:00Z', + 'cartographicDegrees': [ 0, -60, 35, 30000, 160, -65, 35, 5000000, 400, -70, 40, 20000, @@ -74,21 +74,21 @@ ] } }, { - "id": "v2", - "position": { - "interval" : "2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "cartographicDegrees": [ + 'id': 'v2', + 'position': { + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'cartographicDegrees': [ -45.0, 20, 4000000 ] } }, { - "id": "v3", - "position": { - "interpolationAlgorithm": "LINEAR", - "interpolationDegree": 1, - "interval" : "2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "epoch" : "2012-08-04T16:00:00Z", - "cartographicDegrees": [ + 'id': 'v3', + 'position': { + 'interpolationAlgorithm': 'LINEAR', + 'interpolationDegree': 1, + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'epoch' : '2012-08-04T16:00:00Z', + 'cartographicDegrees': [ 0, -45, 60, 4000, 400, -40, 70, 2000000, 1000, -35, 75, 100000, @@ -106,10 +106,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Polygon - Intervals, Availability.html b/Apps/Sandcastle/gallery/CZML Polygon - Intervals, Availability.html index c9a2a175a8a6..7cbc2a578975 100644 --- a/Apps/Sandcastle/gallery/CZML Polygon - Intervals, Availability.html +++ b/Apps/Sandcastle/gallery/CZML Polygon - Intervals, Availability.html @@ -29,62 +29,62 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Polygon - Intervals and Availability", - "version" : "1.0", - "clock": { - "interval": "2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "currentTime": "2012-08-04T16:00:00Z", - "multiplier": 900 + 'id' : 'document', + 'name' : 'CZML Polygon - Intervals and Availability', + 'version' : '1.0', + 'clock': { + 'interval': '2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'currentTime': '2012-08-04T16:00:00Z', + 'multiplier': 900 } }, { - "id" : "dynamicPolygon", - "name": "Dynamic Polygon with Intervals", - "availability":"2012-08-04T16:00:00Z/2012-08-04T17:00:00Z", - "polygon": { - "positions": [{ - "interval" : "2012-08-04T16:00:00Z/2012-08-04T16:20:00Z", - "cartographicDegrees" : [ + 'id' : 'dynamicPolygon', + 'name': 'Dynamic Polygon with Intervals', + 'availability':'2012-08-04T16:00:00Z/2012-08-04T17:00:00Z', + 'polygon': { + 'positions': [{ + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T16:20:00Z', + 'cartographicDegrees' : [ -50, 20, 0, -50, 40, 0, -40, 40, 0, -40, 20, 0 ] }, { - "interval" : "2012-08-04T16:20:00Z/2012-08-04T16:40:00Z", - "cartographicDegrees": [ + 'interval' : '2012-08-04T16:20:00Z/2012-08-04T16:40:00Z', + 'cartographicDegrees': [ -35, 50, 0, -35, 10, 0, -45, 30, 0 ] }, { - "interval" : "2012-08-04T16:40:00Z/2012-08-04T17:00:00Z", - "cartographicDegrees" : [ + 'interval' : '2012-08-04T16:40:00Z/2012-08-04T17:00:00Z', + 'cartographicDegrees' : [ -35, 50, 0, -40, 50, 0, -40, 20, 0, -35, 20, 0 ] }], - "material": { - "solidColor": { - "color": [{ - "interval" : "2012-08-04T16:00:00Z/2012-08-04T16:30:00Z", - "rgbaf" : [1, 0, 1, 1] + 'material': { + 'solidColor': { + 'color': [{ + 'interval' : '2012-08-04T16:00:00Z/2012-08-04T16:30:00Z', + 'rgbaf' : [1, 0, 1, 1] }, { - "interval" : "2012-08-04T16:30:00Z/2012-08-04T17:00:00Z", - "rgbaf" : [0, 1, 1, 1] + 'interval' : '2012-08-04T16:30:00Z/2012-08-04T17:00:00Z', + 'rgbaf' : [0, 1, 1, 1] }] } } } }, { - "id" : "california", - "name" : "static california with set availability", - "availability":"2012-08-04T16:10:00Z/2012-08-04T16:30:00Z", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'california', + 'name' : 'static california with set availability', + 'availability':'2012-08-04T16:10:00Z/2012-08-04T16:30:00Z', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -120, 42, 50000, -124, 42, 30500, -124.5, 40, 3000, @@ -98,23 +98,23 @@ -120, 39, 30500 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 150] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 150] } } }, - "perPositionHeight" : true, - "extrudedHeight": 0 + 'perPositionHeight' : true, + 'extrudedHeight': 0 } }, { - "id" : "pennsylvania", - "name" : "static pennsylvania with set availability", - "availability":"2012-08-04T16:20:00Z/2012-08-04T16:40:00Z", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'pennsylvania', + 'name' : 'static pennsylvania with set availability', + 'availability':'2012-08-04T16:20:00Z/2012-08-04T16:40:00Z', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -75.5, 42, 0, -79.8, 42, 0, -79.9, 42.3, 0, @@ -126,15 +126,15 @@ -74.7, 41.3, 0 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 150] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 150] } } }, - "height" : 50000, - "extrudedHeight": 200000 + 'height' : 50000, + 'extrudedHeight': 200000 } }]; @@ -147,10 +147,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Polygon.html b/Apps/Sandcastle/gallery/CZML Polygon.html index 38816d8b1c9b..c3a6a2d3c20f 100644 --- a/Apps/Sandcastle/gallery/CZML Polygon.html +++ b/Apps/Sandcastle/gallery/CZML Polygon.html @@ -29,15 +29,15 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Polygon", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Polygon', + 'version' : '1.0' }, { - "id" : "redPolygon", - "name" : "Red polygon on surface", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'redPolygon', + 'name' : 'Red polygon on surface', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -115.0, 37.0, 0, -115.0, 32.0, 0, -107.0, 33.0, 0, @@ -45,60 +45,60 @@ -102.0, 35.0, 0 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 255] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 255] } } } } }, { - "id" : "greenPolygon", - "name" : "Green extruded polygon", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'greenPolygon', + 'name' : 'Green extruded polygon', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -108.0, 42.0, 0, -100.0, 42.0, 0, -104.0, 40.0, 0 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 255, 0, 255] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 255, 0, 255] } } }, - "extrudedHeight" : 500000.0, - "closeTop" : false, - "closeBottom" : false + 'extrudedHeight' : 500000.0, + 'closeTop' : false, + 'closeBottom' : false } }, { - "id" : "orangePolygon", - "name" : "Orange polygon with per-position heights and outline", - "polygon" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'orangePolygon', + 'name' : 'Orange polygon with per-position heights and outline', + 'polygon' : { + 'positions' : { + 'cartographicDegrees' : [ -108.0, 25.0, 100000, -100.0, 25.0, 100000, -100.0, 30.0, 100000, -108.0, 30.0, 300000 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 100, 0, 100] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 100, 0, 100] } } }, - "extrudedHeight" : 0, - "perPositionHeight" : true, - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'extrudedHeight' : 0, + 'perPositionHeight' : true, + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }]; @@ -111,10 +111,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Polyline.html b/Apps/Sandcastle/gallery/CZML Polyline.html index 4b39e7c0f5f3..6cf563348b39 100644 --- a/Apps/Sandcastle/gallery/CZML Polyline.html +++ b/Apps/Sandcastle/gallery/CZML Polyline.html @@ -29,110 +29,110 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Polyline", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Polyline', + 'version' : '1.0' }, { - "id" : "redLine", - "name" : "Red line clamped to terain", - "polyline" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'redLine', + 'name' : 'Red line clamped to terain', + 'polyline' : { + 'positions' : { + 'cartographicDegrees' : [ -75, 35, 0, -125, 35, 0 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 255] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 255] } } }, - "width" : 5, - "clampToGround" : true + 'width' : 5, + 'clampToGround' : true } }, { - "id" : "blueLine", - "name" : "Glowing blue line on the surface", - "polyline" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'blueLine', + 'name' : 'Glowing blue line on the surface', + 'polyline' : { + 'positions' : { + 'cartographicDegrees' : [ -75, 37, 0, -125, 37, 0 ] }, - "material" : { - "polylineGlow" : { - "color" : { - "rgba" : [0, 0, 255, 255] + 'material' : { + 'polylineGlow' : { + 'color' : { + 'rgba' : [0, 0, 255, 255] }, - "glowPower" : 0.2 + 'glowPower' : 0.2 } }, - "width" : 10 + 'width' : 10 } }, { - "id" : "orangeLine", - "name" : "Orange line with black outline at height and following the surface", - "polyline" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'orangeLine', + 'name' : 'Orange line with black outline at height and following the surface', + 'polyline' : { + 'positions' : { + 'cartographicDegrees' : [ -75, 39, 250000, -125, 39, 250000 ] }, - "material" : { - "polylineOutline" : { - "color" : { - "rgba" : [255, 165, 0, 255] + 'material' : { + 'polylineOutline' : { + 'color' : { + 'rgba' : [255, 165, 0, 255] }, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] }, - "outlineWidth" : 2 + 'outlineWidth' : 2 } }, - "width" : 5 + 'width' : 5 } }, { - "id" : "purpleLine", - "name" : "Purple arrow at height", - "polyline" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'purpleLine', + 'name' : 'Purple arrow at height', + 'polyline' : { + 'positions' : { + 'cartographicDegrees' : [ -75, 43, 500000, -125, 43, 500000 ] }, - "material" : { - "polylineArrow" : { - "color" : { - "rgba" : [148, 0, 211, 255] + 'material' : { + 'polylineArrow' : { + 'color' : { + 'rgba' : [148, 0, 211, 255] } } }, - "followSurface" : false, - "width" : 10 + 'followSurface' : false, + 'width' : 10 } }, { - "id" : "dashedLine", - "name" : "Blue dashed line", - "polyline" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'dashedLine', + 'name' : 'Blue dashed line', + 'polyline' : { + 'positions' : { + 'cartographicDegrees' : [ -75, 45, 500000, -125, 45, 500000 ] }, - "material" : { - "polylineDash" : { - "color" : { - "rgba" : [0, 255, 255, 255] + 'material' : { + 'polylineDash' : { + 'color' : { + 'rgba' : [0, 255, 255, 255] } } }, - "width" : 4 + 'width' : 4 } }]; @@ -144,10 +144,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Position Definitions.html b/Apps/Sandcastle/gallery/CZML Position Definitions.html index 80a42eaba24f..2cf0dd243ace 100644 --- a/Apps/Sandcastle/gallery/CZML Position Definitions.html +++ b/Apps/Sandcastle/gallery/CZML Position Definitions.html @@ -29,58 +29,58 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Position Definitions", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Position Definitions', + 'version' : '1.0' }, { - "id" : "point1", - "name": "point in cartographic degrees", - "position" : { - "cartographicDegrees" : [-111.0, 40.0, 150000.0] + 'id' : 'point1', + 'name': 'point in cartographic degrees', + 'position' : { + 'cartographicDegrees' : [-111.0, 40.0, 150000.0] }, - "point": { - "color": { - "rgba": [100, 0, 200, 255] + 'point': { + 'color': { + 'rgba': [100, 0, 200, 255] }, - "outlineColor": { - "rgba": [200, 0, 200, 255] + 'outlineColor': { + 'rgba': [200, 0, 200, 255] }, - "pixelSize": { - "number": 10 + 'pixelSize': { + 'number': 10 } } }, { - "id" : "point2", - "name": "point in cartesian coordinates", - "position" : { - "cartesian" : [1216469.9357990976, -4736121.71856379, 4081386.8856866374] + 'id' : 'point2', + 'name': 'point in cartesian coordinates', + 'position' : { + 'cartesian' : [1216469.9357990976, -4736121.71856379, 4081386.8856866374] }, - "point": { - "color": { - "rgba": [0, 100, 200, 255] + 'point': { + 'color': { + 'rgba': [0, 100, 200, 255] }, - "outlineColor": { - "rgba": [200, 0, 200, 255] + 'outlineColor': { + 'rgba': [200, 0, 200, 255] }, - "pixelSize": { - "number": 10 + 'pixelSize': { + 'number': 10 } } }, { - "id" : "point 3", - "name": "point in cartographic radians", - "position" : { - "cartographicRadians" : [Math.PI, 3 * Math.PI/4, 150000] + 'id' : 'point 3', + 'name': 'point in cartographic radians', + 'position' : { + 'cartographicRadians' : [Math.PI, 3 * Math.PI/4, 150000] }, - "point": { - "color": { - "rgba": [10, 200, 10, 255] + 'point': { + 'color': { + 'rgba': [10, 200, 10, 255] }, - "outlineColor": { - "rgba": [200, 0, 200, 255] + 'outlineColor': { + 'rgba': [200, 0, 200, 255] }, - "pixelSize": { - "number": 10 + 'pixelSize': { + 'number': 10 } } }]; @@ -91,10 +91,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Rectangle.html b/Apps/Sandcastle/gallery/CZML Rectangle.html index 8d76348b7e77..b7f5c1057c18 100644 --- a/Apps/Sandcastle/gallery/CZML Rectangle.html +++ b/Apps/Sandcastle/gallery/CZML Rectangle.html @@ -29,80 +29,80 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Rectangle", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Rectangle', + 'version' : '1.0' }, { - "id" : "redRectangle", - "name" : "extruded red rectangle with black outline", - "rectangle" : { - "coordinates" : { - "wsenDegrees" : [-120, 40, -110, 50] + 'id' : 'redRectangle', + 'name' : 'extruded red rectangle with black outline', + 'rectangle' : { + 'coordinates' : { + 'wsenDegrees' : [-120, 40, -110, 50] }, - "height" : 600000, - "extrudedHeight" : 0, - "fill" : true, - "material" : { - "solidColor" : { - "color": { - "rgba" : [255, 0, 0, 100] + 'height' : 600000, + 'extrudedHeight' : 0, + 'fill' : true, + 'material' : { + 'solidColor' : { + 'color': { + 'rgba' : [255, 0, 0, 100] } } }, - "outline" : true, - "outlineColor" : { - "rgba" : [0, 0, 0, 255] + 'outline' : true, + 'outlineColor' : { + 'rgba' : [0, 0, 0, 255] } } }, { - "id" : "stripeRectangle", - "name" : "rectangle with blue/green stripes", - "rectangle" : { - "coordinates" : { - "wsenDegrees" : [-105, 40, -95, 50] + 'id' : 'stripeRectangle', + 'name' : 'rectangle with blue/green stripes', + 'rectangle' : { + 'coordinates' : { + 'wsenDegrees' : [-105, 40, -95, 50] }, - "height" : 0, - "fill" : true, - "material" : { - "stripe" : { - "orientation" : "VERTICAL", - "evenColor" : { "rgba" : [0, 255, 0, 255] }, - "oddColor" : { "rgba" : [0, 0, 255, 255] }, - "repeat" : 5 + 'height' : 0, + 'fill' : true, + 'material' : { + 'stripe' : { + 'orientation' : 'VERTICAL', + 'evenColor' : { 'rgba' : [0, 255, 0, 255] }, + 'oddColor' : { 'rgba' : [0, 0, 255, 255] }, + 'repeat' : 5 } } } }, { - "id" : "yellowRectangle", - "name" : "extruded rectangle with yellow outline", - "rectangle" : { - "coordinates" : { - "wsenDegrees" : [-90, 40, -80, 50] + 'id' : 'yellowRectangle', + 'name' : 'extruded rectangle with yellow outline', + 'rectangle' : { + 'coordinates' : { + 'wsenDegrees' : [-90, 40, -80, 50] }, - "height" : 600000, - "extrudedHeight" : 0, - "fill" : false, - "outline" : true, - "outlineColor" : { - "rgba" : [255, 255, 0, 255] + 'height' : 600000, + 'extrudedHeight' : 0, + 'fill' : false, + 'outline' : true, + 'outlineColor' : { + 'rgba' : [255, 255, 0, 255] }, - "outlineWidth" : 2, - "rotation" : 0.5 + 'outlineWidth' : 2, + 'rotation' : 0.5 } }, { - "id" : "textureRectangle", - "name" : "rectangle with image, above surface", - "rectangle" : { - "coordinates" : { - "wsenDegrees" : [-75, 40, -50, 45] + 'id' : 'textureRectangle', + 'name' : 'rectangle with image, above surface', + 'rectangle' : { + 'coordinates' : { + 'wsenDegrees' : [-75, 40, -50, 45] }, - "height" : 600000, - "fill" : true, - "material" : { - "image" : { - "image" : { "uri" : "../images/Cesium_Logo_Color.jpg" }, - "color" : { - "rgba" : [255, 255, 255, 128] + 'height' : 600000, + 'fill' : true, + 'material' : { + 'image' : { + 'image' : { 'uri' : '../images/Cesium_Logo_Color.jpg' }, + 'color' : { + 'rgba' : [255, 255, 255, 128] } } } @@ -117,10 +117,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Reference Properties.html b/Apps/Sandcastle/gallery/CZML Reference Properties.html index 862c96ca8a6e..edbac56ddefa 100644 --- a/Apps/Sandcastle/gallery/CZML Reference Properties.html +++ b/Apps/Sandcastle/gallery/CZML Reference Properties.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/CZML Spheres and Ellipsoids.html b/Apps/Sandcastle/gallery/CZML Spheres and Ellipsoids.html index f5794f04e63a..f093f4c4f7af 100644 --- a/Apps/Sandcastle/gallery/CZML Spheres and Ellipsoids.html +++ b/Apps/Sandcastle/gallery/CZML Spheres and Ellipsoids.html @@ -29,68 +29,68 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Geometries: Spheres and Ellipsoids", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Geometries: Spheres and Ellipsoids', + 'version' : '1.0' }, { - "id" : "blueEllipsoid", - "name" : "blue ellipsoid", - "position" : { - "cartographicDegrees" : [-114.0, 40.0, 300000.0] + 'id' : 'blueEllipsoid', + 'name' : 'blue ellipsoid', + 'position' : { + 'cartographicDegrees' : [-114.0, 40.0, 300000.0] }, - "ellipsoid" : { - "radii" : { - "cartesian" : [200000.0, 200000.0, 300000.0] + 'ellipsoid' : { + 'radii' : { + 'cartesian' : [200000.0, 200000.0, 300000.0] }, - "fill" : true, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [0, 0, 255, 255] + 'fill' : true, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [0, 0, 255, 255] } } } } }, { - "id" : "redSphere", - "name" : "Red sphere with black outline", - "position" : { - "cartographicDegrees" : [-107.0, 40.0, 300000.0] + 'id' : 'redSphere', + 'name' : 'Red sphere with black outline', + 'position' : { + 'cartographicDegrees' : [-107.0, 40.0, 300000.0] }, - "ellipsoid" : { - "radii" : { - "cartesian" : [300000.0, 300000.0, 300000.0] + 'ellipsoid' : { + 'radii' : { + 'cartesian' : [300000.0, 300000.0, 300000.0] }, - "fill" : true, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 100] + 'fill' : true, + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 100] } } }, - "outline" : true, - "outlineColor" : { - "rgbaf" : [0, 0, 0, 1] + 'outline' : true, + 'outlineColor' : { + 'rgbaf' : [0, 0, 0, 1] } } }, { - "id" : "yellowEllipsoid", - "name" : "ellipsoid with yellow outline", - "position" : { - "cartographicDegrees" : [-100.0, 40.0, 300000.0] + 'id' : 'yellowEllipsoid', + 'name' : 'ellipsoid with yellow outline', + 'position' : { + 'cartographicDegrees' : [-100.0, 40.0, 300000.0] }, - "ellipsoid" : { - "radii" : { - "cartesian" : [200000.0, 200000.0, 300000.0] + 'ellipsoid' : { + 'radii' : { + 'cartesian' : [200000.0, 200000.0, 300000.0] }, - "fill" : false, - "outline" : true, - "outlineColor" : { - "rgba" : [255, 255, 0, 255] + 'fill' : false, + 'outline' : true, + 'outlineColor' : { + 'rgba' : [255, 255, 0, 255] }, - "slicePartitions" : 24, - "stackPartitions" : 36 + 'slicePartitions' : 24, + 'stackPartitions' : 36 } }]; @@ -102,10 +102,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML Wall.html b/Apps/Sandcastle/gallery/CZML Wall.html index 6ddcfe36bd03..a91d0f6c041b 100644 --- a/Apps/Sandcastle/gallery/CZML Wall.html +++ b/Apps/Sandcastle/gallery/CZML Wall.html @@ -29,14 +29,14 @@ 'use strict'; //Sandcastle_Begin var czml = [{ - "id" : "document", - "name" : "CZML Wall", - "version" : "1.0" + 'id' : 'document', + 'name' : 'CZML Wall', + 'version' : '1.0' }, { - "id" : "wall", - "wall" : { - "positions" : { - "cartographicDegrees" : [ + 'id' : 'wall', + 'wall' : { + 'positions' : { + 'cartographicDegrees' : [ -115.0, 50.0, 1500000, -112.5, 50.0, 500000, -110.0, 50.0,1500000, @@ -50,10 +50,10 @@ -90.0, 50.0, 1500000 ] }, - "material" : { - "solidColor" : { - "color" : { - "rgba" : [255, 0, 0, 150] + 'material' : { + 'solidColor' : { + 'color' : { + 'rgba' : [255, 0, 0, 150] } } } @@ -68,10 +68,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/CZML ZIndex.html b/Apps/Sandcastle/gallery/CZML ZIndex.html index e967d5f5cc4c..b344718b4bf1 100644 --- a/Apps/Sandcastle/gallery/CZML ZIndex.html +++ b/Apps/Sandcastle/gallery/CZML ZIndex.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/CZML.html b/Apps/Sandcastle/gallery/CZML.html index b5b79945795e..c5397e12a66a 100644 --- a/Apps/Sandcastle/gallery/CZML.html +++ b/Apps/Sandcastle/gallery/CZML.html @@ -55,10 +55,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Callback Property.html b/Apps/Sandcastle/gallery/Callback Property.html index 5448dea68ec5..9136f0c2fcf9 100644 --- a/Apps/Sandcastle/gallery/Callback Property.html +++ b/Apps/Sandcastle/gallery/Callback Property.html @@ -68,7 +68,7 @@ geodesic.setEndPoints(startCartographic, endCartographic); var lengthInMeters = Math.round(geodesic.surfaceDistance); - return (lengthInMeters / 1000).toFixed(1) + " km"; + return (lengthInMeters / 1000).toFixed(1) + ' km'; } function getMidpoint(time, result) { @@ -97,10 +97,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Camera Tutorial.html b/Apps/Sandcastle/gallery/Camera Tutorial.html index a11bb57af9cc..20bc04543aca 100644 --- a/Apps/Sandcastle/gallery/Camera Tutorial.html +++ b/Apps/Sandcastle/gallery/Camera Tutorial.html @@ -166,10 +166,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Camera.html b/Apps/Sandcastle/gallery/Camera.html index 4181a3d56d42..5aff2bbecd55 100644 --- a/Apps/Sandcastle/gallery/Camera.html +++ b/Apps/Sandcastle/gallery/Camera.html @@ -398,10 +398,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Cardboard.html b/Apps/Sandcastle/gallery/Cardboard.html index 42ce43bc1b8d..67606e73c971 100644 --- a/Apps/Sandcastle/gallery/Cardboard.html +++ b/Apps/Sandcastle/gallery/Cardboard.html @@ -152,10 +152,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Cesium Inspector.html b/Apps/Sandcastle/gallery/Cesium Inspector.html index 87aedb753266..352e48afe129 100644 --- a/Apps/Sandcastle/gallery/Cesium Inspector.html +++ b/Apps/Sandcastle/gallery/Cesium Inspector.html @@ -83,10 +83,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Cesium Widget.html b/Apps/Sandcastle/gallery/Cesium Widget.html index 4158885e115b..6254e12bcc96 100644 --- a/Apps/Sandcastle/gallery/Cesium Widget.html +++ b/Apps/Sandcastle/gallery/Cesium Widget.html @@ -36,10 +36,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Cesium World Terrain.html b/Apps/Sandcastle/gallery/Cesium World Terrain.html index 03d7dd1aa81a..03ca485778b9 100644 --- a/Apps/Sandcastle/gallery/Cesium World Terrain.html +++ b/Apps/Sandcastle/gallery/Cesium World Terrain.html @@ -34,10 +34,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Circles and Ellipses.html b/Apps/Sandcastle/gallery/Circles and Ellipses.html index 783fff5a326a..61f0eb9a7493 100644 --- a/Apps/Sandcastle/gallery/Circles and Ellipses.html +++ b/Apps/Sandcastle/gallery/Circles and Ellipses.html @@ -68,10 +68,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Classification Types.html b/Apps/Sandcastle/gallery/Classification Types.html index 5d5007ed10f6..fdae6d7391a7 100644 --- a/Apps/Sandcastle/gallery/Classification Types.html +++ b/Apps/Sandcastle/gallery/Classification Types.html @@ -66,10 +66,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Classification.html b/Apps/Sandcastle/gallery/Classification.html index 1a5e9140ea56..d221edf1f538 100644 --- a/Apps/Sandcastle/gallery/Classification.html +++ b/Apps/Sandcastle/gallery/Classification.html @@ -259,10 +259,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Clock.html b/Apps/Sandcastle/gallery/Clock.html index 7216838c90d9..0ba03c4d33e6 100644 --- a/Apps/Sandcastle/gallery/Clock.html +++ b/Apps/Sandcastle/gallery/Clock.html @@ -29,9 +29,9 @@ //Sandcastle_Begin // Create a clock that loops on Christmas day 2013 and runs in 4000x real time. var clock = new Cesium.Clock({ - startTime : Cesium.JulianDate.fromIso8601("2013-12-25"), - currentTime : Cesium.JulianDate.fromIso8601("2013-12-25"), - stopTime : Cesium.JulianDate.fromIso8601("2013-12-26"), + startTime : Cesium.JulianDate.fromIso8601('2013-12-25'), + currentTime : Cesium.JulianDate.fromIso8601('2013-12-25'), + stopTime : Cesium.JulianDate.fromIso8601('2013-12-26'), clockRange : Cesium.ClockRange.LOOP_STOP, // loop when we hit the end time clockStep : Cesium.ClockStep.SYSTEM_CLOCK_MULTIPLIER, multiplier : 4000, // how much time to advance each tick @@ -59,10 +59,10 @@ });//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Clustering.html b/Apps/Sandcastle/gallery/Clustering.html index 0c9fcf18d4bb..547078f91659 100644 --- a/Apps/Sandcastle/gallery/Clustering.html +++ b/Apps/Sandcastle/gallery/Clustering.html @@ -165,10 +165,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Corridor.html b/Apps/Sandcastle/gallery/Corridor.html index ab0f8350e3d4..71305e02cd5e 100644 --- a/Apps/Sandcastle/gallery/Corridor.html +++ b/Apps/Sandcastle/gallery/Corridor.html @@ -80,10 +80,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Custom DataSource.html b/Apps/Sandcastle/gallery/Custom DataSource.html index 73ccd23eecab..9b4c51e8e511 100644 --- a/Apps/Sandcastle/gallery/Custom DataSource.html +++ b/Apps/Sandcastle/gallery/Custom DataSource.html @@ -377,10 +377,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Custom Geocoder.html b/Apps/Sandcastle/gallery/Custom Geocoder.html index 8602a154e2b7..2292086a4a7e 100644 --- a/Apps/Sandcastle/gallery/Custom Geocoder.html +++ b/Apps/Sandcastle/gallery/Custom Geocoder.html @@ -85,10 +85,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Custom Per-Feature Post Process.html b/Apps/Sandcastle/gallery/Custom Per-Feature Post Process.html index 5a97159ac0cc..eb86af302924 100644 --- a/Apps/Sandcastle/gallery/Custom Per-Feature Post Process.html +++ b/Apps/Sandcastle/gallery/Custom Per-Feature Post Process.html @@ -79,10 +79,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Custom Post Process.html b/Apps/Sandcastle/gallery/Custom Post Process.html index ab408c3097d8..6f219f822116 100644 --- a/Apps/Sandcastle/gallery/Custom Post Process.html +++ b/Apps/Sandcastle/gallery/Custom Post Process.html @@ -66,10 +66,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Cylinders and Cones.html b/Apps/Sandcastle/gallery/Cylinders and Cones.html index 193d22059c2a..57a73b770485 100644 --- a/Apps/Sandcastle/gallery/Cylinders and Cones.html +++ b/Apps/Sandcastle/gallery/Cylinders and Cones.html @@ -57,10 +57,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/DataSource Ordering.html b/Apps/Sandcastle/gallery/DataSource Ordering.html index d659892a4635..45be1641f486 100644 --- a/Apps/Sandcastle/gallery/DataSource Ordering.html +++ b/Apps/Sandcastle/gallery/DataSource Ordering.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Depth of Field.html b/Apps/Sandcastle/gallery/Depth of Field.html index 8e2f75c3140f..02f0e56cdf6b 100644 --- a/Apps/Sandcastle/gallery/Depth of Field.html +++ b/Apps/Sandcastle/gallery/Depth of Field.html @@ -114,10 +114,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Distance Display Conditions.html b/Apps/Sandcastle/gallery/Distance Display Conditions.html index 0679bc3c39a7..36c0f0ac623f 100644 --- a/Apps/Sandcastle/gallery/Distance Display Conditions.html +++ b/Apps/Sandcastle/gallery/Distance Display Conditions.html @@ -94,10 +94,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Drawing on Terrain.html b/Apps/Sandcastle/gallery/Drawing on Terrain.html index 8ba337ca55b4..7bd15840563a 100644 --- a/Apps/Sandcastle/gallery/Drawing on Terrain.html +++ b/Apps/Sandcastle/gallery/Drawing on Terrain.html @@ -145,10 +145,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Earth at Night.html b/Apps/Sandcastle/gallery/Earth at Night.html index fc24182fc2ec..30adaca958ef 100644 --- a/Apps/Sandcastle/gallery/Earth at Night.html +++ b/Apps/Sandcastle/gallery/Earth at Night.html @@ -34,10 +34,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html b/Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html index 57d1d988b2b2..8eaa5ca1e2c6 100644 --- a/Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html +++ b/Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html @@ -97,10 +97,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/GeoJSON simplestyle.html b/Apps/Sandcastle/gallery/GeoJSON simplestyle.html index 2fc283a0fe5e..20f4cc18134c 100644 --- a/Apps/Sandcastle/gallery/GeoJSON simplestyle.html +++ b/Apps/Sandcastle/gallery/GeoJSON simplestyle.html @@ -45,10 +45,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Geometry Height Reference.html b/Apps/Sandcastle/gallery/Geometry Height Reference.html index affc60edc5a0..d3202f476d38 100644 --- a/Apps/Sandcastle/gallery/Geometry Height Reference.html +++ b/Apps/Sandcastle/gallery/Geometry Height Reference.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Geometry and Appearances.html b/Apps/Sandcastle/gallery/Geometry and Appearances.html index 1f06f5cc3b5f..6ad27199ba50 100644 --- a/Apps/Sandcastle/gallery/Geometry and Appearances.html +++ b/Apps/Sandcastle/gallery/Geometry and Appearances.html @@ -490,10 +490,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Globe Materials.html b/Apps/Sandcastle/gallery/Globe Materials.html index 5f764271d42b..f7c5e3cd7e4a 100644 --- a/Apps/Sandcastle/gallery/Globe Materials.html +++ b/Apps/Sandcastle/gallery/Globe Materials.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Google Earth Enterprise.html b/Apps/Sandcastle/gallery/Google Earth Enterprise.html index d557f86662ba..9fe145449a57 100644 --- a/Apps/Sandcastle/gallery/Google Earth Enterprise.html +++ b/Apps/Sandcastle/gallery/Google Earth Enterprise.html @@ -49,10 +49,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Ground Clamping.html b/Apps/Sandcastle/gallery/Ground Clamping.html index 6c45eb7006ca..fc695c504c9e 100644 --- a/Apps/Sandcastle/gallery/Ground Clamping.html +++ b/Apps/Sandcastle/gallery/Ground Clamping.html @@ -257,10 +257,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/HTML Overlays.html b/Apps/Sandcastle/gallery/HTML Overlays.html index 482542945d1f..b7cab64cfb54 100644 --- a/Apps/Sandcastle/gallery/HTML Overlays.html +++ b/Apps/Sandcastle/gallery/HTML Overlays.html @@ -46,10 +46,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/HeadingPitchRoll.html b/Apps/Sandcastle/gallery/HeadingPitchRoll.html index 64a570e88d38..abb0132f9df4 100644 --- a/Apps/Sandcastle/gallery/HeadingPitchRoll.html +++ b/Apps/Sandcastle/gallery/HeadingPitchRoll.html @@ -226,10 +226,10 @@

Loading...

//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Hello World.html b/Apps/Sandcastle/gallery/Hello World.html index 640e8e317705..9bd4fd5f0ba8 100644 --- a/Apps/Sandcastle/gallery/Hello World.html +++ b/Apps/Sandcastle/gallery/Hello World.html @@ -31,10 +31,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Imagery Adjustment.html b/Apps/Sandcastle/gallery/Imagery Adjustment.html index 4e0b008cc1fc..7303e7d32144 100644 --- a/Apps/Sandcastle/gallery/Imagery Adjustment.html +++ b/Apps/Sandcastle/gallery/Imagery Adjustment.html @@ -128,10 +128,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html index be4b1b620e36..a696e8a56d5e 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html +++ b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Imagery Layers Split.html b/Apps/Sandcastle/gallery/Imagery Layers Split.html index 75e674459f95..e5554c7b8e78 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers Split.html +++ b/Apps/Sandcastle/gallery/Imagery Layers Split.html @@ -99,10 +99,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Imagery Layers Texture Filters.html b/Apps/Sandcastle/gallery/Imagery Layers Texture Filters.html index 72fca860b7e6..13c20e5bc860 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers Texture Filters.html +++ b/Apps/Sandcastle/gallery/Imagery Layers Texture Filters.html @@ -91,17 +91,17 @@ function sliderMove(e) { var slider = document.getElementById('slider'); var splitPosition = (e.clientX - dragStartX) / slider.parentElement.offsetWidth; - slider.style.left = 100.0 * splitPosition + "%"; + slider.style.left = 100.0 * splitPosition + '%'; viewer.scene.imagerySplitPosition = splitPosition; } //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html index 643dd7ea3ca1..6f13d30a4a2f 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers.html +++ b/Apps/Sandcastle/gallery/Imagery Layers.html @@ -46,10 +46,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Interpolation.html b/Apps/Sandcastle/gallery/Interpolation.html index 6ff3fb77fd23..9432591840c2 100644 --- a/Apps/Sandcastle/gallery/Interpolation.html +++ b/Apps/Sandcastle/gallery/Interpolation.html @@ -163,10 +163,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/KML Tours.html b/Apps/Sandcastle/gallery/KML Tours.html index 28c95e0ec112..946c47d156a4 100644 --- a/Apps/Sandcastle/gallery/KML Tours.html +++ b/Apps/Sandcastle/gallery/KML Tours.html @@ -69,10 +69,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/KML.html b/Apps/Sandcastle/gallery/KML.html index 4b17efaf306d..34054d417d38 100644 --- a/Apps/Sandcastle/gallery/KML.html +++ b/Apps/Sandcastle/gallery/KML.html @@ -70,10 +70,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Labels.html b/Apps/Sandcastle/gallery/Labels.html index f8e623ce7e5c..24258dae0a0a 100644 --- a/Apps/Sandcastle/gallery/Labels.html +++ b/Apps/Sandcastle/gallery/Labels.html @@ -182,10 +182,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/LensFlare.html b/Apps/Sandcastle/gallery/LensFlare.html index 418e77b9f5bd..e4a1fbfd8523 100644 --- a/Apps/Sandcastle/gallery/LensFlare.html +++ b/Apps/Sandcastle/gallery/LensFlare.html @@ -91,10 +91,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/LocalToFixedFrame.html b/Apps/Sandcastle/gallery/LocalToFixedFrame.html index 64124f0647cc..0fc145270f67 100644 --- a/Apps/Sandcastle/gallery/LocalToFixedFrame.html +++ b/Apps/Sandcastle/gallery/LocalToFixedFrame.html @@ -229,10 +229,10 @@

Loading...

//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Map Pins.html b/Apps/Sandcastle/gallery/Map Pins.html index dd2ec4448c4c..55afd98842ac 100644 --- a/Apps/Sandcastle/gallery/Map Pins.html +++ b/Apps/Sandcastle/gallery/Map Pins.html @@ -81,10 +81,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Materials.html b/Apps/Sandcastle/gallery/Materials.html index e98c8f570e1f..105bc9c7dd4d 100644 --- a/Apps/Sandcastle/gallery/Materials.html +++ b/Apps/Sandcastle/gallery/Materials.html @@ -523,10 +523,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Multi-part CZML.html b/Apps/Sandcastle/gallery/Multi-part CZML.html index 68b80c6b1fa2..36a18f545d77 100644 --- a/Apps/Sandcastle/gallery/Multi-part CZML.html +++ b/Apps/Sandcastle/gallery/Multi-part CZML.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Multiple Synced Views.html b/Apps/Sandcastle/gallery/Multiple Synced Views.html index d429ed75cdf5..95cfb77350fe 100644 --- a/Apps/Sandcastle/gallery/Multiple Synced Views.html +++ b/Apps/Sandcastle/gallery/Multiple Synced Views.html @@ -103,10 +103,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Natural Earth II.html b/Apps/Sandcastle/gallery/Natural Earth II.html index 3f7db4c8ae97..6520916d8c09 100644 --- a/Apps/Sandcastle/gallery/Natural Earth II.html +++ b/Apps/Sandcastle/gallery/Natural Earth II.html @@ -34,10 +34,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Offline.html b/Apps/Sandcastle/gallery/Offline.html index 36d02c454644..d02a851c4548 100644 --- a/Apps/Sandcastle/gallery/Offline.html +++ b/Apps/Sandcastle/gallery/Offline.html @@ -42,10 +42,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/PAMAP Terrain.html b/Apps/Sandcastle/gallery/PAMAP Terrain.html index 61e775de5fb3..3ecd3e5738b9 100644 --- a/Apps/Sandcastle/gallery/PAMAP Terrain.html +++ b/Apps/Sandcastle/gallery/PAMAP Terrain.html @@ -100,10 +100,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Particle System Fireworks.html b/Apps/Sandcastle/gallery/Particle System Fireworks.html index 440b23381d67..88fca7816f72 100644 --- a/Apps/Sandcastle/gallery/Particle System Fireworks.html +++ b/Apps/Sandcastle/gallery/Particle System Fireworks.html @@ -163,10 +163,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Particle System Tails.html b/Apps/Sandcastle/gallery/Particle System Tails.html index 643c0b29ea46..bdfbe3df8799 100644 --- a/Apps/Sandcastle/gallery/Particle System Tails.html +++ b/Apps/Sandcastle/gallery/Particle System Tails.html @@ -216,10 +216,10 @@ Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Particle System Weather.html b/Apps/Sandcastle/gallery/Particle System Weather.html index b1886e906b54..5c5fbaa648d8 100644 --- a/Apps/Sandcastle/gallery/Particle System Weather.html +++ b/Apps/Sandcastle/gallery/Particle System Weather.html @@ -159,10 +159,10 @@ Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Particle System.html b/Apps/Sandcastle/gallery/Particle System.html index 58d25362742f..4e245a71b2e8 100644 --- a/Apps/Sandcastle/gallery/Particle System.html +++ b/Apps/Sandcastle/gallery/Particle System.html @@ -422,10 +422,10 @@ Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Per-Feature Post Processing.html b/Apps/Sandcastle/gallery/Per-Feature Post Processing.html index 6b9d63734c9b..9ea955b9b920 100644 --- a/Apps/Sandcastle/gallery/Per-Feature Post Processing.html +++ b/Apps/Sandcastle/gallery/Per-Feature Post Processing.html @@ -91,10 +91,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Physically-Based Materials.html b/Apps/Sandcastle/gallery/Physically-Based Materials.html index 279e730f51cc..e0383b635f32 100644 --- a/Apps/Sandcastle/gallery/Physically-Based Materials.html +++ b/Apps/Sandcastle/gallery/Physically-Based Materials.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Picking.html b/Apps/Sandcastle/gallery/Picking.html index c51d151053b7..b86758986e25 100644 --- a/Apps/Sandcastle/gallery/Picking.html +++ b/Apps/Sandcastle/gallery/Picking.html @@ -223,10 +223,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Plane.html b/Apps/Sandcastle/gallery/Plane.html index 2e4c6e8cef46..c326c7ac28c6 100644 --- a/Apps/Sandcastle/gallery/Plane.html +++ b/Apps/Sandcastle/gallery/Plane.html @@ -67,10 +67,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Points.html b/Apps/Sandcastle/gallery/Points.html index d126617f637f..4b0ce2f4dfa3 100644 --- a/Apps/Sandcastle/gallery/Points.html +++ b/Apps/Sandcastle/gallery/Points.html @@ -167,10 +167,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Polygon.html b/Apps/Sandcastle/gallery/Polygon.html index 42acc0be55ce..e5052bbc06f5 100644 --- a/Apps/Sandcastle/gallery/Polygon.html +++ b/Apps/Sandcastle/gallery/Polygon.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Polyline Dash.html b/Apps/Sandcastle/gallery/Polyline Dash.html index 5e797180d55e..914a52295e54 100644 --- a/Apps/Sandcastle/gallery/Polyline Dash.html +++ b/Apps/Sandcastle/gallery/Polyline Dash.html @@ -75,7 +75,7 @@ width : 10, material : new Cesium.PolylineDashMaterialProperty({ color : Cesium.Color.CYAN, - dashPattern: parseInt("110000001111", 2) + dashPattern: parseInt('110000001111', 2) }) } }); @@ -88,7 +88,7 @@ width : 10, material : new Cesium.PolylineDashMaterialProperty({ color : Cesium.Color.YELLOW, - dashPattern: parseInt("1010101010101010", 2) + dashPattern: parseInt('1010101010101010', 2) }) } }); @@ -97,10 +97,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Polyline Volume.html b/Apps/Sandcastle/gallery/Polyline Volume.html index 8ef42c4cbc94..617a23cd57d4 100644 --- a/Apps/Sandcastle/gallery/Polyline Volume.html +++ b/Apps/Sandcastle/gallery/Polyline Volume.html @@ -93,10 +93,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Polyline.html b/Apps/Sandcastle/gallery/Polyline.html index 203f2afe55c4..6ae30db914c5 100644 --- a/Apps/Sandcastle/gallery/Polyline.html +++ b/Apps/Sandcastle/gallery/Polyline.html @@ -94,10 +94,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Post Processing.html b/Apps/Sandcastle/gallery/Post Processing.html index d07c2c912d32..aa52bbd5438c 100644 --- a/Apps/Sandcastle/gallery/Post Processing.html +++ b/Apps/Sandcastle/gallery/Post Processing.html @@ -103,10 +103,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Projection.html b/Apps/Sandcastle/gallery/Projection.html index faa01ed692d1..ebd7a122bc92 100644 --- a/Apps/Sandcastle/gallery/Projection.html +++ b/Apps/Sandcastle/gallery/Projection.html @@ -52,10 +52,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Rectangle.html b/Apps/Sandcastle/gallery/Rectangle.html index cf3b11fc4dec..8cba1ffc4401 100644 --- a/Apps/Sandcastle/gallery/Rectangle.html +++ b/Apps/Sandcastle/gallery/Rectangle.html @@ -71,10 +71,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Rotatable 2D Map.html b/Apps/Sandcastle/gallery/Rotatable 2D Map.html index 3a8afe0a41da..6666ac581b78 100644 --- a/Apps/Sandcastle/gallery/Rotatable 2D Map.html +++ b/Apps/Sandcastle/gallery/Rotatable 2D Map.html @@ -41,10 +41,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Scene Rendering Performance.html b/Apps/Sandcastle/gallery/Scene Rendering Performance.html index 3dd91b722f0e..c1df36034cc7 100644 --- a/Apps/Sandcastle/gallery/Scene Rendering Performance.html +++ b/Apps/Sandcastle/gallery/Scene Rendering Performance.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Sentinel-2.html b/Apps/Sandcastle/gallery/Sentinel-2.html index 37f7007681f3..763538e5a1e4 100644 --- a/Apps/Sandcastle/gallery/Sentinel-2.html +++ b/Apps/Sandcastle/gallery/Sentinel-2.html @@ -34,10 +34,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Shadows.html b/Apps/Sandcastle/gallery/Shadows.html index cd5e27cad313..a5e64c14cb7e 100644 --- a/Apps/Sandcastle/gallery/Shadows.html +++ b/Apps/Sandcastle/gallery/Shadows.html @@ -270,10 +270,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Show or Hide Entities.html b/Apps/Sandcastle/gallery/Show or Hide Entities.html index 38fc7b22bf7c..80712671d4fd 100644 --- a/Apps/Sandcastle/gallery/Show or Hide Entities.html +++ b/Apps/Sandcastle/gallery/Show or Hide Entities.html @@ -85,10 +85,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html b/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html index 7e5ca4390eda..8d8e30bbd3b4 100644 --- a/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html +++ b/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html @@ -66,10 +66,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Star Burst.html b/Apps/Sandcastle/gallery/Star Burst.html index 34b75b4be17a..9f43819f437b 100644 --- a/Apps/Sandcastle/gallery/Star Burst.html +++ b/Apps/Sandcastle/gallery/Star Burst.html @@ -320,10 +320,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { -require(["Cesium"], startup); +} else if (typeof require === 'function') { +require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Terrain Clipping Planes.html b/Apps/Sandcastle/gallery/Terrain Clipping Planes.html index 46b990379a04..fe1ddc8b7588 100644 --- a/Apps/Sandcastle/gallery/Terrain Clipping Planes.html +++ b/Apps/Sandcastle/gallery/Terrain Clipping Planes.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Terrain Exaggeration.html b/Apps/Sandcastle/gallery/Terrain Exaggeration.html index 39d7f8caeee5..3299c7fe2528 100644 --- a/Apps/Sandcastle/gallery/Terrain Exaggeration.html +++ b/Apps/Sandcastle/gallery/Terrain Exaggeration.html @@ -75,10 +75,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html index abbbeab0ef05..5ac4107debab 100644 --- a/Apps/Sandcastle/gallery/Terrain.html +++ b/Apps/Sandcastle/gallery/Terrain.html @@ -199,10 +199,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Time Dynamic Point Cloud.html b/Apps/Sandcastle/gallery/Time Dynamic Point Cloud.html index 4b53c638665d..de2766a8132e 100644 --- a/Apps/Sandcastle/gallery/Time Dynamic Point Cloud.html +++ b/Apps/Sandcastle/gallery/Time Dynamic Point Cloud.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Video.html b/Apps/Sandcastle/gallery/Video.html index 6400884ec6bd..c8223ab9504b 100644 --- a/Apps/Sandcastle/gallery/Video.html +++ b/Apps/Sandcastle/gallery/Video.html @@ -122,10 +122,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Wall.html b/Apps/Sandcastle/gallery/Wall.html index 8564c8175e9e..36a7cd026b00 100644 --- a/Apps/Sandcastle/gallery/Wall.html +++ b/Apps/Sandcastle/gallery/Wall.html @@ -77,10 +77,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Washington DC 2017.html b/Apps/Sandcastle/gallery/Washington DC 2017.html index 24ce8601dfc9..fc1effcf9deb 100644 --- a/Apps/Sandcastle/gallery/Washington DC 2017.html +++ b/Apps/Sandcastle/gallery/Washington DC 2017.html @@ -35,10 +35,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Web Map Service (WMS).html b/Apps/Sandcastle/gallery/Web Map Service (WMS).html index 119d7e7c877c..1f0ff329d7da 100644 --- a/Apps/Sandcastle/gallery/Web Map Service (WMS).html +++ b/Apps/Sandcastle/gallery/Web Map Service (WMS).html @@ -46,10 +46,10 @@ });//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/Web Map Tile Service with Time.html b/Apps/Sandcastle/gallery/Web Map Tile Service with Time.html index d2618fbc2380..421e017ff90f 100644 --- a/Apps/Sandcastle/gallery/Web Map Tile Service with Time.html +++ b/Apps/Sandcastle/gallery/Web Map Tile Service with Time.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/Z-Indexing Geometry.html b/Apps/Sandcastle/gallery/Z-Indexing Geometry.html index 6940e7dd4555..0e6f9d8ce225 100644 --- a/Apps/Sandcastle/gallery/Z-Indexing Geometry.html +++ b/Apps/Sandcastle/gallery/Z-Indexing Geometry.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/3D Models Instancing.html b/Apps/Sandcastle/gallery/development/3D Models Instancing.html index 69a61bb357f5..716668680628 100644 --- a/Apps/Sandcastle/gallery/development/3D Models Instancing.html +++ b/Apps/Sandcastle/gallery/development/3D Models Instancing.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/3D Models Node Explorer.html b/Apps/Sandcastle/gallery/development/3D Models Node Explorer.html index f17078d6a602..1f08b59064d5 100644 --- a/Apps/Sandcastle/gallery/development/3D Models Node Explorer.html +++ b/Apps/Sandcastle/gallery/development/3D Models Node Explorer.html @@ -232,10 +232,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/3D Models.html b/Apps/Sandcastle/gallery/development/3D Models.html index 777035166a5f..9facf1c0b47a 100644 --- a/Apps/Sandcastle/gallery/development/3D Models.html +++ b/Apps/Sandcastle/gallery/development/3D Models.html @@ -211,10 +211,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/BillboardClampToGround.html b/Apps/Sandcastle/gallery/development/BillboardClampToGround.html index 9c4b622412d4..bd530e425cce 100644 --- a/Apps/Sandcastle/gallery/development/BillboardClampToGround.html +++ b/Apps/Sandcastle/gallery/development/BillboardClampToGround.html @@ -130,10 +130,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Billboards Instancing.html b/Apps/Sandcastle/gallery/development/Billboards Instancing.html index f4c8f9353de1..601a7237bb3c 100644 --- a/Apps/Sandcastle/gallery/development/Billboards Instancing.html +++ b/Apps/Sandcastle/gallery/development/Billboards Instancing.html @@ -189,10 +189,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Billboards.html b/Apps/Sandcastle/gallery/development/Billboards.html index 6c85e49555ea..18ec81297f38 100644 --- a/Apps/Sandcastle/gallery/development/Billboards.html +++ b/Apps/Sandcastle/gallery/development/Billboards.html @@ -356,10 +356,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Box Outline.html b/Apps/Sandcastle/gallery/development/Box Outline.html index 3df46a6a3770..f10388f9616a 100644 --- a/Apps/Sandcastle/gallery/development/Box Outline.html +++ b/Apps/Sandcastle/gallery/development/Box Outline.html @@ -71,10 +71,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Box.html b/Apps/Sandcastle/gallery/development/Box.html index 48458b1d2357..26a48728aca4 100644 --- a/Apps/Sandcastle/gallery/development/Box.html +++ b/Apps/Sandcastle/gallery/development/Box.html @@ -65,10 +65,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Circle Outline.html b/Apps/Sandcastle/gallery/development/Circle Outline.html index f1b2ba7f0b97..dc15b4c86689 100644 --- a/Apps/Sandcastle/gallery/development/Circle Outline.html +++ b/Apps/Sandcastle/gallery/development/Circle Outline.html @@ -88,10 +88,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Circle.html b/Apps/Sandcastle/gallery/development/Circle.html index 8978042de3ce..335978cee319 100644 --- a/Apps/Sandcastle/gallery/development/Circle.html +++ b/Apps/Sandcastle/gallery/development/Circle.html @@ -111,10 +111,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Clamp to Tileset.html b/Apps/Sandcastle/gallery/development/Clamp to Tileset.html index ccf40c6c0444..d0b2ee658a1a 100644 --- a/Apps/Sandcastle/gallery/development/Clamp to Tileset.html +++ b/Apps/Sandcastle/gallery/development/Clamp to Tileset.html @@ -48,7 +48,7 @@ var lastFrame = new Image(); lastFrame.width = canvas.width; lastFrame.height = canvas.height; -lastFrame.style = "position: absolute; left: 0; top: 0;"; +lastFrame.style = 'position: absolute; left: 0; top: 0;'; canvas.parentNode.appendChild(lastFrame); var samplePosition = Cesium.Cartesian3.fromDegrees(-76.360485, 34.949670, 0); @@ -144,10 +144,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Coplanar Polygon Outline.html b/Apps/Sandcastle/gallery/development/Coplanar Polygon Outline.html index 561ec8c6bb93..25c8e3a20008 100644 --- a/Apps/Sandcastle/gallery/development/Coplanar Polygon Outline.html +++ b/Apps/Sandcastle/gallery/development/Coplanar Polygon Outline.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Coplanar Polygon.html b/Apps/Sandcastle/gallery/development/Coplanar Polygon.html index e60410d4f33c..6c874ba8c7ef 100644 --- a/Apps/Sandcastle/gallery/development/Coplanar Polygon.html +++ b/Apps/Sandcastle/gallery/development/Coplanar Polygon.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Corridor Outline.html b/Apps/Sandcastle/gallery/development/Corridor Outline.html index 139df5208db0..b12256560429 100644 --- a/Apps/Sandcastle/gallery/development/Corridor Outline.html +++ b/Apps/Sandcastle/gallery/development/Corridor Outline.html @@ -83,10 +83,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Corridor.html b/Apps/Sandcastle/gallery/development/Corridor.html index 11d4456733ed..b16efdfbf14e 100644 --- a/Apps/Sandcastle/gallery/development/Corridor.html +++ b/Apps/Sandcastle/gallery/development/Corridor.html @@ -130,10 +130,10 @@ }));//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Cylinder Outline.html b/Apps/Sandcastle/gallery/development/Cylinder Outline.html index a3efd7b8acc8..a1185f71823e 100644 --- a/Apps/Sandcastle/gallery/development/Cylinder Outline.html +++ b/Apps/Sandcastle/gallery/development/Cylinder Outline.html @@ -71,10 +71,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Cylinder.html b/Apps/Sandcastle/gallery/development/Cylinder.html index 916a26940caf..5256840bf7db 100644 --- a/Apps/Sandcastle/gallery/development/Cylinder.html +++ b/Apps/Sandcastle/gallery/development/Cylinder.html @@ -97,10 +97,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Display Conditions.html b/Apps/Sandcastle/gallery/development/Display Conditions.html index 86c2a6e13132..ad72260871ac 100644 --- a/Apps/Sandcastle/gallery/development/Display Conditions.html +++ b/Apps/Sandcastle/gallery/development/Display Conditions.html @@ -98,10 +98,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ellipse Outline.html b/Apps/Sandcastle/gallery/development/Ellipse Outline.html index 5600e8e191fa..160b39f52b33 100644 --- a/Apps/Sandcastle/gallery/development/Ellipse Outline.html +++ b/Apps/Sandcastle/gallery/development/Ellipse Outline.html @@ -84,10 +84,10 @@ }));//Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ellipse.html b/Apps/Sandcastle/gallery/development/Ellipse.html index 551104826d39..373b752a81c4 100644 --- a/Apps/Sandcastle/gallery/development/Ellipse.html +++ b/Apps/Sandcastle/gallery/development/Ellipse.html @@ -105,10 +105,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ellipsoid Outline.html b/Apps/Sandcastle/gallery/development/Ellipsoid Outline.html index 7a326ce80bec..c6dbb11036ff 100644 --- a/Apps/Sandcastle/gallery/development/Ellipsoid Outline.html +++ b/Apps/Sandcastle/gallery/development/Ellipsoid Outline.html @@ -68,10 +68,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ellipsoid Surface.html b/Apps/Sandcastle/gallery/development/Ellipsoid Surface.html index fb9ca2eb1ac9..7bd5d2f23c60 100644 --- a/Apps/Sandcastle/gallery/development/Ellipsoid Surface.html +++ b/Apps/Sandcastle/gallery/development/Ellipsoid Surface.html @@ -88,10 +88,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ellipsoid.html b/Apps/Sandcastle/gallery/development/Ellipsoid.html index e571d0829c89..6f56e3256763 100644 --- a/Apps/Sandcastle/gallery/development/Ellipsoid.html +++ b/Apps/Sandcastle/gallery/development/Ellipsoid.html @@ -67,10 +67,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Fog.html b/Apps/Sandcastle/gallery/development/Fog.html index caf77700a565..256e2d631706 100644 --- a/Apps/Sandcastle/gallery/development/Fog.html +++ b/Apps/Sandcastle/gallery/development/Fog.html @@ -84,7 +84,7 @@ viewModel.density = viewer.scene.fog.density; viewModel.sse = viewer.scene.fog.screenSpaceErrorFactor; -Sandcastle.addToolbarButton("Horizon high altitude", function() { +Sandcastle.addToolbarButton('Horizon high altitude', function() { viewer.camera.setView({ destination: new Cesium.Cartesian3(-2467730.5740817646, -4390507.315824514, 3906155.113316938), orientation: { @@ -94,7 +94,7 @@ }); }); -Sandcastle.addToolbarButton("Horizon low altitude", function() { +Sandcastle.addToolbarButton('Horizon low altitude', function() { viewer.camera.setView({ destination : new Cesium.Cartesian3(-734001.9511656855, -4214090.596769834, 4715898.125886317), orientation : { @@ -106,17 +106,17 @@ viewer.scene.globe._surface._debug.enableDebugOutput = true; -Sandcastle.addToolbarButton("Snap", function() { - var container = document.getElementById("cesiumContainer"); +Sandcastle.addToolbarButton('Snap', function() { + var container = document.getElementById('cesiumContainer'); var tmpH = container.style.height; var tmpW = container.style.width; - container.style.height = "600px"; - container.style.width = "800px"; + container.style.height = '600px'; + container.style.width = '800px'; viewer.resize(); viewer.render(); - window.open(viewer.canvas.toDataURL("image/png")); + window.open(viewer.canvas.toDataURL('image/png')); container.style.height = tmpH; container.style.width = tmpW; viewer.resize(); @@ -126,10 +126,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Frustum.html b/Apps/Sandcastle/gallery/development/Frustum.html index ff24c1ff323a..d4f53ff4662c 100644 --- a/Apps/Sandcastle/gallery/development/Frustum.html +++ b/Apps/Sandcastle/gallery/development/Frustum.html @@ -91,10 +91,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { -require(["Cesium"], startup); +} else if (typeof require === 'function') { +require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Geometry Offset Attribute.html b/Apps/Sandcastle/gallery/development/Geometry Offset Attribute.html index 0f367c0a92d5..cf9094ec6b71 100644 --- a/Apps/Sandcastle/gallery/development/Geometry Offset Attribute.html +++ b/Apps/Sandcastle/gallery/development/Geometry Offset Attribute.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Geometry and Appearances.html b/Apps/Sandcastle/gallery/development/Geometry and Appearances.html index 70eff33f1e86..45627c21e389 100644 --- a/Apps/Sandcastle/gallery/development/Geometry and Appearances.html +++ b/Apps/Sandcastle/gallery/development/Geometry and Appearances.html @@ -986,10 +986,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ground Polyline Material.html b/Apps/Sandcastle/gallery/development/Ground Polyline Material.html index ee5c8a489f78..a190ec437357 100644 --- a/Apps/Sandcastle/gallery/development/Ground Polyline Material.html +++ b/Apps/Sandcastle/gallery/development/Ground Polyline Material.html @@ -90,10 +90,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html b/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html index 53990f9fc3b7..0b6ba374679c 100644 --- a/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html +++ b/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Ground Primitive.html b/Apps/Sandcastle/gallery/development/Ground Primitive.html index 8b9c7e238314..7406c23b0225 100644 --- a/Apps/Sandcastle/gallery/development/Ground Primitive.html +++ b/Apps/Sandcastle/gallery/development/Ground Primitive.html @@ -339,10 +339,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Labels.html b/Apps/Sandcastle/gallery/development/Labels.html index d5ab916b0955..e05299362c3b 100644 --- a/Apps/Sandcastle/gallery/development/Labels.html +++ b/Apps/Sandcastle/gallery/development/Labels.html @@ -183,10 +183,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html index c6d28dfa42e8..a60855a39bfb 100644 --- a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html +++ b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Material.html b/Apps/Sandcastle/gallery/development/Material.html index 48f156e7ba31..ddebac403654 100644 --- a/Apps/Sandcastle/gallery/development/Material.html +++ b/Apps/Sandcastle/gallery/development/Material.html @@ -66,10 +66,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Multiple Shadows.html b/Apps/Sandcastle/gallery/development/Multiple Shadows.html index 5e0eacfbe3bc..35bf6f7a7c8e 100644 --- a/Apps/Sandcastle/gallery/development/Multiple Shadows.html +++ b/Apps/Sandcastle/gallery/development/Multiple Shadows.html @@ -117,10 +117,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } - if (typeof Cesium !== "undefined") { + if (typeof Cesium !== 'undefined') { startup(Cesium); - } else if (typeof require === "function") { - require(["Cesium"], startup); + } else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Per Instance Color.html b/Apps/Sandcastle/gallery/development/Per Instance Color.html index 0e431eca773b..b3df93c59ef1 100644 --- a/Apps/Sandcastle/gallery/development/Per Instance Color.html +++ b/Apps/Sandcastle/gallery/development/Per Instance Color.html @@ -51,10 +51,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Picking.html b/Apps/Sandcastle/gallery/development/Picking.html index 83e65fcef17f..e65a0c7bcd12 100644 --- a/Apps/Sandcastle/gallery/development/Picking.html +++ b/Apps/Sandcastle/gallery/development/Picking.html @@ -487,10 +487,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/PointPrimitives.html b/Apps/Sandcastle/gallery/development/PointPrimitives.html index ab53581644fe..6d0ef8b6648e 100644 --- a/Apps/Sandcastle/gallery/development/PointPrimitives.html +++ b/Apps/Sandcastle/gallery/development/PointPrimitives.html @@ -231,10 +231,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polygon Outline.html b/Apps/Sandcastle/gallery/development/Polygon Outline.html index 1beca252239c..a7d46bdfdd8f 100644 --- a/Apps/Sandcastle/gallery/development/Polygon Outline.html +++ b/Apps/Sandcastle/gallery/development/Polygon Outline.html @@ -112,10 +112,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polygon.html b/Apps/Sandcastle/gallery/development/Polygon.html index d487229cb8cd..aade59213582 100644 --- a/Apps/Sandcastle/gallery/development/Polygon.html +++ b/Apps/Sandcastle/gallery/development/Polygon.html @@ -157,10 +157,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polyline Color.html b/Apps/Sandcastle/gallery/development/Polyline Color.html index d4333715684d..dc6d6f76deec 100644 --- a/Apps/Sandcastle/gallery/development/Polyline Color.html +++ b/Apps/Sandcastle/gallery/development/Polyline Color.html @@ -78,10 +78,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polyline Material.html b/Apps/Sandcastle/gallery/development/Polyline Material.html index d6fcd1ee858d..e89350f2631a 100644 --- a/Apps/Sandcastle/gallery/development/Polyline Material.html +++ b/Apps/Sandcastle/gallery/development/Polyline Material.html @@ -83,10 +83,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polyline Volume Outline.html b/Apps/Sandcastle/gallery/development/Polyline Volume Outline.html index 2056b8bfc230..af27afd7c099 100644 --- a/Apps/Sandcastle/gallery/development/Polyline Volume Outline.html +++ b/Apps/Sandcastle/gallery/development/Polyline Volume Outline.html @@ -100,10 +100,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polyline Volume.html b/Apps/Sandcastle/gallery/development/Polyline Volume.html index b1d6144160f5..5ed5caec880a 100644 --- a/Apps/Sandcastle/gallery/development/Polyline Volume.html +++ b/Apps/Sandcastle/gallery/development/Polyline Volume.html @@ -129,10 +129,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polyline.html b/Apps/Sandcastle/gallery/development/Polyline.html index 9477ad0ad4c3..e6f13782a0d0 100644 --- a/Apps/Sandcastle/gallery/development/Polyline.html +++ b/Apps/Sandcastle/gallery/development/Polyline.html @@ -75,10 +75,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polylines On Terrain.html b/Apps/Sandcastle/gallery/development/Polylines On Terrain.html index 714121e15252..d2ba8f6624a9 100644 --- a/Apps/Sandcastle/gallery/development/Polylines On Terrain.html +++ b/Apps/Sandcastle/gallery/development/Polylines On Terrain.html @@ -290,10 +290,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Polylines.html b/Apps/Sandcastle/gallery/development/Polylines.html index 8f55cb627d88..2f40bfaebf59 100644 --- a/Apps/Sandcastle/gallery/development/Polylines.html +++ b/Apps/Sandcastle/gallery/development/Polylines.html @@ -131,10 +131,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Rectangle Outline.html b/Apps/Sandcastle/gallery/development/Rectangle Outline.html index 39c944414c62..e0d1493cc055 100644 --- a/Apps/Sandcastle/gallery/development/Rectangle Outline.html +++ b/Apps/Sandcastle/gallery/development/Rectangle Outline.html @@ -56,10 +56,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Rectangle.html b/Apps/Sandcastle/gallery/development/Rectangle.html index fc56cc4b6539..66fce97ca5c4 100644 --- a/Apps/Sandcastle/gallery/development/Rectangle.html +++ b/Apps/Sandcastle/gallery/development/Rectangle.html @@ -71,10 +71,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Shadows.html b/Apps/Sandcastle/gallery/development/Shadows.html index 50c6265ce0ac..0c05f58107b5 100644 --- a/Apps/Sandcastle/gallery/development/Shadows.html +++ b/Apps/Sandcastle/gallery/development/Shadows.html @@ -742,10 +742,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Simple Polyline.html b/Apps/Sandcastle/gallery/development/Simple Polyline.html index b4fe4afcb01e..b37588a1061e 100644 --- a/Apps/Sandcastle/gallery/development/Simple Polyline.html +++ b/Apps/Sandcastle/gallery/development/Simple Polyline.html @@ -104,10 +104,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Sphere Outline.html b/Apps/Sandcastle/gallery/development/Sphere Outline.html index 85a04e4718bf..dc0d59cff67d 100644 --- a/Apps/Sandcastle/gallery/development/Sphere Outline.html +++ b/Apps/Sandcastle/gallery/development/Sphere Outline.html @@ -67,10 +67,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Sphere.html b/Apps/Sandcastle/gallery/development/Sphere.html index 63e2e569b26f..4c2f37d92f0e 100644 --- a/Apps/Sandcastle/gallery/development/Sphere.html +++ b/Apps/Sandcastle/gallery/development/Sphere.html @@ -67,10 +67,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html b/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html index b9f0a5998ae1..86e3b8f3d041 100644 --- a/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html +++ b/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html @@ -10,7 +10,7 @@ diff --git a/Apps/Sandcastle/gallery/development/Volumes.html b/Apps/Sandcastle/gallery/development/Volumes.html index 8b101f1dcc3f..c0dbd56edbe4 100644 --- a/Apps/Sandcastle/gallery/development/Volumes.html +++ b/Apps/Sandcastle/gallery/development/Volumes.html @@ -54,10 +54,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Wall Outline.html b/Apps/Sandcastle/gallery/development/Wall Outline.html index 39b646096277..b7b6206785fc 100644 --- a/Apps/Sandcastle/gallery/development/Wall Outline.html +++ b/Apps/Sandcastle/gallery/development/Wall Outline.html @@ -58,10 +58,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/gallery/development/Wall.html b/Apps/Sandcastle/gallery/development/Wall.html index d20e8d26cfa3..23e16e9caa5e 100644 --- a/Apps/Sandcastle/gallery/development/Wall.html +++ b/Apps/Sandcastle/gallery/development/Wall.html @@ -113,10 +113,10 @@ //Sandcastle_End Sandcastle.finishedLoading(); } -if (typeof Cesium !== "undefined") { +if (typeof Cesium !== 'undefined') { startup(Cesium); -} else if (typeof require === "function") { - require(["Cesium"], startup); +} else if (typeof require === 'function') { + require(['Cesium'], startup); } diff --git a/Apps/Sandcastle/templates/bucket-requirejs.html b/Apps/Sandcastle/templates/bucket-requirejs.html index 75c88309f303..3d28bf9dd37b 100644 --- a/Apps/Sandcastle/templates/bucket-requirejs.html +++ b/Apps/Sandcastle/templates/bucket-requirejs.html @@ -8,7 +8,7 @@