diff --git a/Apps/Sandcastle/gallery/Black Marble.html b/Apps/Sandcastle/gallery/Black Marble.html index 2fbb39dd2b2a..899e7a4f99b2 100644 --- a/Apps/Sandcastle/gallery/Black Marble.html +++ b/Apps/Sandcastle/gallery/Black Marble.html @@ -28,7 +28,7 @@ var widget = new Cesium.CesiumWidget('cesiumContainer', { imageryProvider : new Cesium.TileMapServiceImageryProvider({ - url : 'http://cesium.agi.com/blackmarble', + url : 'http://cesiumjs.org/blackmarble', maximumLevel : 8, credit : 'Black Marble imagery courtesy NASA Earth Observatory' }) diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html index f78451773124..c86c8e9bf661 100644 --- a/Apps/Sandcastle/gallery/Imagery Layers.html +++ b/Apps/Sandcastle/gallery/Imagery Layers.html @@ -35,7 +35,7 @@ var layers = widget.centralBody.getImageryLayers(); var blackMarble = layers.addImageryProvider(new Cesium.TileMapServiceImageryProvider({ - url : 'http://cesium.agi.com/blackmarble', + url : 'http://cesiumjs.org/blackmarble', maximumLevel : 8, credit : 'Black Marble imagery courtesy NASA Earth Observatory' })); diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html index 56ebde378900..7dca22c1e24d 100644 --- a/Apps/Sandcastle/gallery/Terrain.html +++ b/Apps/Sandcastle/gallery/Terrain.html @@ -197,7 +197,7 @@ centralBody.depthTestAgainstTerrain = true; var cesiumTerrainProvider = new Cesium.CesiumTerrainProvider({ - url : 'http://cesium.agi.com/smallterrain', + url : 'http://cesiumjs.org/smallterrain', credit : 'Terrain data courtesy Analytical Graphics, Inc.' }); diff --git a/Apps/Sandcastle/index.html b/Apps/Sandcastle/index.html index 8d6d62760b86..8d7e9b29635d 100644 --- a/Apps/Sandcastle/index.html +++ b/Apps/Sandcastle/index.html @@ -32,26 +32,11 @@ - - - + + @@ -59,7 +44,7 @@
- - - + + +
diff --git a/Source/Core/BingMapsApi.js b/Source/Core/BingMapsApi.js index 2d1f721bee85..2303a381a615 100644 --- a/Source/Core/BingMapsApi.js +++ b/Source/Core/BingMapsApi.js @@ -40,4 +40,4 @@ define([ }; return BingMapsApi; -}); \ No newline at end of file +}); diff --git a/Source/Core/EllipsoidalOccluder.js b/Source/Core/EllipsoidalOccluder.js index 283f6836a434..fe7a0a1433ce 100644 --- a/Source/Core/EllipsoidalOccluder.js +++ b/Source/Core/EllipsoidalOccluder.js @@ -17,7 +17,7 @@ define([ * Determine whether or not other objects are visible or hidden behind the visible horizon defined by * an {@link Ellipsoid} and a camera position. The ellipsoid is assumed to be located at the * origin of the coordinate system. This class uses the algorithm described in the - * Horizon Culling blog post. + * Horizon Culling blog post. * * @alias EllipsoidalOccluder * @@ -71,7 +71,7 @@ define([ * @param {Cartesian3} cameraPosition The new position of the camera. */ EllipsoidalOccluder.prototype.setCameraPosition = function(cameraPosition) { - // See http://cesium.agi.com/2013/04/25/Horizon-culling/ + // See http://cesiumjs.org/2013/04/25/Horizon-culling/ var ellipsoid = this._ellipsoid; var cv = ellipsoid.transformPositionToScaledSpace(cameraPosition, this._cameraPositionInScaledSpace); var vhMagnitudeSquared = Cartesian3.magnitudeSquared(cv) - 1.0; @@ -136,7 +136,7 @@ define([ * occluder.isScaledSpacePointVisible(scaledSpacePoint); //returns true */ EllipsoidalOccluder.prototype.isScaledSpacePointVisible = function(occludeeScaledSpacePosition) { - // See http://cesium.agi.com/2013/04/25/Horizon-culling/ + // See http://cesiumjs.org/2013/04/25/Horizon-culling/ var cv = this._cameraPositionInScaledSpace; var vhMagnitudeSquared = this._distanceToLimbInScaledSpaceSquared; var vt = Cartesian3.subtract(occludeeScaledSpacePosition, cv, scratchCartesian); diff --git a/Source/Core/Geometry.js b/Source/Core/Geometry.js index 96ebc6300058..6e0b6bf38c62 100644 --- a/Source/Core/Geometry.js +++ b/Source/Core/Geometry.js @@ -56,7 +56,7 @@ define([ * boundingSphere : BoundingSphere.fromVertices(positions) * }); * - * @demo Geometry and Appearances Demo + * @demo Geometry and Appearances Demo * * @see PolygonGeometry * @see ExtentGeometry diff --git a/Source/Core/Shapes.js b/Source/Core/Shapes.js index c2e15cc2ad30..e07be4fce26d 100644 --- a/Source/Core/Shapes.js +++ b/Source/Core/Shapes.js @@ -72,7 +72,7 @@ define([ * * @exports Shapes * - * @demo Cesium Sandcastle Circles and Ellipses Demo + * @demo Cesium Sandcastle Circles and Ellipses Demo */ var Shapes = { /** diff --git a/Source/Scene/AnimationCollection.js b/Source/Scene/AnimationCollection.js index e6a9cb3a2a18..6a152ebfa4bd 100644 --- a/Source/Scene/AnimationCollection.js +++ b/Source/Scene/AnimationCollection.js @@ -19,7 +19,7 @@ define([ * @alias AnimationCollection * @constructor * - * @demo Cesium Sandcastle Animation Demo + * @demo Cesium Sandcastle Animation Demo */ var AnimationCollection = function() { }; diff --git a/Source/Scene/Billboard.js b/Source/Scene/Billboard.js index ab912f5ec8cd..4678d3e9c9c7 100644 --- a/Source/Scene/Billboard.js +++ b/Source/Scene/Billboard.js @@ -61,7 +61,7 @@ define([ * * @internalConstructor * - * @demo Cesium Sandcastle Billboard Demo + * @demo Cesium Sandcastle Billboard Demo */ var Billboard = function(options, billboardCollection) { options = defaultValue(options, EMPTY_OBJECT); diff --git a/Source/Scene/BillboardCollection.js b/Source/Scene/BillboardCollection.js index 89e0b1c6eb8a..9129f04e3bf2 100644 --- a/Source/Scene/BillboardCollection.js +++ b/Source/Scene/BillboardCollection.js @@ -136,7 +136,7 @@ define([ * imageIndex : 1 * }); * - * @demo Cesium Sandcastle Billboard Demo + * @demo Cesium Sandcastle Billboard Demo */ var BillboardCollection = function(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/Camera.js b/Source/Scene/Camera.js index c215c3251e6d..69545e0ac9c9 100644 --- a/Source/Scene/Camera.js +++ b/Source/Scene/Camera.js @@ -50,8 +50,8 @@ define([ * camera.frustum.near = 1.0; * camera.frustum.far = 2.0; * - * @demo Cesium Sandcastle Camera Demo - * @demo Sandcastle Example from the Camera Tutorial + * @demo Cesium Sandcastle Camera Demo + * @demo Sandcastle Example from the Camera Tutorial */ var Camera = function(context) { if (!defined(context)) { diff --git a/Source/Scene/Credit.js b/Source/Scene/Credit.js index ab5d3b7c7577..4840021db224 100644 --- a/Source/Scene/Credit.js +++ b/Source/Scene/Credit.js @@ -19,7 +19,7 @@ define([ * * @example * //Create a credit with a tooltip, image and link - * var credit = new Credit('Cesium', '/images/cesium_logo.png', 'http://cesium.agi.com/'); + * var credit = new Credit('Cesium', '/images/cesium_logo.png', 'http://cesiumjs.org/'); */ var Credit = function(text, imageUrl, link) { diff --git a/Source/Scene/EllipsoidPrimitive.js b/Source/Scene/EllipsoidPrimitive.js index 83dbbd56a51b..104b2b2fe2d7 100644 --- a/Source/Scene/EllipsoidPrimitive.js +++ b/Source/Scene/EllipsoidPrimitive.js @@ -81,7 +81,7 @@ define([ * e.radii = new Cartesian3(100000.0, 100000.0, 200000.0); * primitives.add(e); * - * @demo Cesium Sandcastle Volumes Demo + * @demo Cesium Sandcastle Volumes Demo */ var EllipsoidPrimitive = function(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/ImageryLayerCollection.js b/Source/Scene/ImageryLayerCollection.js index a27d9aa5dfa4..054010d876f6 100644 --- a/Source/Scene/ImageryLayerCollection.js +++ b/Source/Scene/ImageryLayerCollection.js @@ -23,8 +23,8 @@ define([ * @alias ImageryLayerCollection * @constructor * - * @demo Cesium Sandcastle Imagery Adjustment Demo - * @demo Cesium Sandcastle Imagery Manipulation Demo + * @demo Cesium Sandcastle Imagery Adjustment Demo + * @demo Cesium Sandcastle Imagery Manipulation Demo */ var ImageryLayerCollection = function ImageryLayerCollection() { this._layers = []; diff --git a/Source/Scene/ImageryProvider.js b/Source/Scene/ImageryProvider.js index 50adec1dd010..d8a9e650ea30 100644 --- a/Source/Scene/ImageryProvider.js +++ b/Source/Scene/ImageryProvider.js @@ -27,8 +27,8 @@ define([ * @see OpenStreetMapImageryProvider * @see WebMapServiceImageryProvider * - * @demo Cesium Sandcastle Imagery Layers Demo - * @demo Cesium Sandcastle Imagery Manipulation Demo + * @demo Cesium Sandcastle Imagery Layers Demo + * @demo Cesium Sandcastle Imagery Manipulation Demo */ var ImageryProvider = function ImageryProvider() { /** diff --git a/Source/Scene/Label.js b/Source/Scene/Label.js index ec2b824c13fd..ec1f9162eafc 100644 --- a/Source/Scene/Label.js +++ b/Source/Scene/Label.js @@ -53,7 +53,7 @@ define([ * @see LabelCollection * @see LabelCollection#add * - * @demo Cesium Sandcastle Labels Demo + * @demo Cesium Sandcastle Labels Demo */ var Label = function(options, labelCollection) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/LabelCollection.js b/Source/Scene/LabelCollection.js index ae383c0df4be..ae498313e2b2 100644 --- a/Source/Scene/LabelCollection.js +++ b/Source/Scene/LabelCollection.js @@ -298,7 +298,7 @@ define([ * text : 'Another label' * }); * - * @demo Cesium Sandcastle Labels Demo + * @demo Cesium Sandcastle Labels Demo */ var LabelCollection = function(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/Material.js b/Source/Scene/Material.js index c3fa472145bb..de1c2369dbc4 100644 --- a/Source/Scene/Material.js +++ b/Source/Scene/Material.js @@ -349,7 +349,7 @@ define([ * * @see Fabric wiki page for a more detailed description of Fabric. * - * @demo Cesium Sandcastle Materials Demo + * @demo Cesium Sandcastle Materials Demo */ var Material = function(description) { /** diff --git a/Source/Scene/Polygon.js b/Source/Scene/Polygon.js index 194d80e2b8cb..4ec763f432ed 100644 --- a/Source/Scene/Polygon.js +++ b/Source/Scene/Polygon.js @@ -72,7 +72,7 @@ define([ * ellipsoid.cartographicToCartesian(new Cartographic(...)) * ]); * - * @demo Cesium Sandcastle Polygons Demo + * @demo Cesium Sandcastle Polygons Demo */ var Polygon = function(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/Polyline.js b/Source/Scene/Polyline.js index f40cf247e396..013a44dc55d6 100644 --- a/Source/Scene/Polyline.js +++ b/Source/Scene/Polyline.js @@ -27,7 +27,7 @@ define([ * @alias Polyline * @internalConstructor * - * @demo Cesium Sandcastle Polyline Demo + * @demo Cesium Sandcastle Polyline Demo */ var Polyline = function(options, polylineCollection) { options = defaultValue(options, EMPTY_OBJECT); diff --git a/Source/Scene/PolylineCollection.js b/Source/Scene/PolylineCollection.js index cde0270f1d5f..81963ff0fab3 100644 --- a/Source/Scene/PolylineCollection.js +++ b/Source/Scene/PolylineCollection.js @@ -128,7 +128,7 @@ define([ * width:4 * }); * - * @demo Cesium Sandcastle Polyline Demo + * @demo Cesium Sandcastle Polyline Demo */ var PolylineCollection = function(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Scene/SensorVolumeCollection.js b/Source/Scene/SensorVolumeCollection.js index b2d75614a7e4..fd634524259d 100644 --- a/Source/Scene/SensorVolumeCollection.js +++ b/Source/Scene/SensorVolumeCollection.js @@ -21,7 +21,7 @@ define([ * @alias SensorVolumeCollection * @constructor * - * @demo Cesium Sandcastle Sensors Demo + * @demo Cesium Sandcastle Sensors Demo */ var SensorVolumeCollection = function() { this._sensors = []; diff --git a/Source/Scene/sampleTerrain.js b/Source/Scene/sampleTerrain.js index 41145a3badc9..7b471e2966b8 100644 --- a/Source/Scene/sampleTerrain.js +++ b/Source/Scene/sampleTerrain.js @@ -32,7 +32,7 @@ define([ * @example * // Query the terrain height of two Cartographic positions * var terrainProvider = new CesiumTerrainProvider({ - * url : 'http://cesium.agi.com/smallterrain' + * url : 'http://cesiumjs.org/smallterrain' * }); * var positions = [ * Cartographic.fromDegrees(86.925145, 27.988257), diff --git a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js index 4e2e3f9abba9..42b5d4ad6876 100644 --- a/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js +++ b/Source/Widgets/BaseLayerPicker/BaseLayerPicker.js @@ -71,7 +71,7 @@ define([ *in this global view of the Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.', * creationFunction : function() { * return new Cesium.TileMapServiceImageryProvider({ - * url : 'http://cesium.agi.com/blackmarble', + * url : 'http://cesiumjs.org/blackmarble', * maximumLevel : 8, * credit : 'Black Marble imagery courtesy NASA Earth Observatory' * }); diff --git a/Source/Widgets/BaseLayerPicker/createDefaultBaseLayers.js b/Source/Widgets/BaseLayerPicker/createDefaultBaseLayers.js index 9cd86fa7884e..e6df24f5cf23 100644 --- a/Source/Widgets/BaseLayerPicker/createDefaultBaseLayers.js +++ b/Source/Widgets/BaseLayerPicker/createDefaultBaseLayers.js @@ -26,7 +26,7 @@ define(['require', * @private */ function createDefaultBaseLayers() { - var proxy = new DefaultProxy('http://cesium.agi.com/proxy/'); + var proxy = new DefaultProxy('http://cesiumjs.org/proxy/'); //While some sites have CORS on, not all browsers implement it properly, so a proxy is needed anyway; var proxyIfNeeded = FeatureDetection.supportsCrossOriginImagery() ? undefined : proxy; @@ -180,7 +180,7 @@ map of the world.\nhttp://www.openstreetmap.org', Earth at night as seen by NASA/NOAA\'s Suomi NPP satellite.', creationFunction : function() { return new TileMapServiceImageryProvider({ - url : 'http://cesium.agi.com/blackmarble', + url : 'http://cesiumjs.org/blackmarble', maximumLevel : 8, credit : 'Black Marble imagery courtesy NASA Earth Observatory', proxy : proxyIfNeeded diff --git a/Source/Widgets/CesiumWidget/CesiumWidget.js b/Source/Widgets/CesiumWidget/CesiumWidget.js index b9a9ec17ec13..b396acc755c8 100644 --- a/Source/Widgets/CesiumWidget/CesiumWidget.js +++ b/Source/Widgets/CesiumWidget/CesiumWidget.js @@ -122,7 +122,7 @@ define([ * var widget = new Cesium.CesiumWidget('cesiumContainer', { * imageryProvider : new Cesium.OpenStreetMapImageryProvider(), * terrainProvider : new Cesium.CesiumTerrainProvider({ - * url : 'http://cesium.agi.com/smallterrain', + * url : 'http://cesiumjs.org/smallterrain', * credit : 'Terrain data courtesy Analytical Graphics, Inc.' * }), * // Use high-res stars downloaded from https://github.com/AnalyticalGraphicsInc/cesium-assets @@ -179,7 +179,7 @@ define([ var ellipsoid = Ellipsoid.WGS84; var creditDisplay = scene.getFrameState().creditDisplay; - var cesiumCredit = new Credit('Cesium', cesiumLogoData, 'http://cesium.agi.com/'); + var cesiumCredit = new Credit('Cesium', cesiumLogoData, 'http://cesiumjs.org/'); creditDisplay.addDefaultCredit(cesiumCredit); var centralBody = new CentralBody(ellipsoid); @@ -211,7 +211,7 @@ define([ url : 'http://dev.virtualearth.net', // Some versions of Safari support WebGL, but don't correctly implement // cross-origin image loading, so we need to load Bing imagery using a proxy. - proxy : FeatureDetection.supportsCrossOriginImagery() ? undefined : new DefaultProxy('http://cesium.agi.com/proxy/') + proxy: FeatureDetection.supportsCrossOriginImagery() ? undefined : new DefaultProxy('http://cesiumjs.org/proxy/') }); } diff --git a/Source/Widgets/Viewer/Viewer.js b/Source/Widgets/Viewer/Viewer.js index fed0680d5668..82db9912f83d 100644 --- a/Source/Widgets/Viewer/Viewer.js +++ b/Source/Widgets/Viewer/Viewer.js @@ -141,7 +141,7 @@ define([ * sceneMode : Cesium.SceneMode.COLUMBUS_VIEW, * //Use standard Cesium terrain * terrainProvider : new Cesium.CesiumTerrainProvider({ - * url : 'http://cesium.agi.com/smallterrain', + * url : 'http://cesiumjs.org/smallterrain', * credit : 'Terrain data courtesy Analytical Graphics, Inc.' * }), * //Hide the base layer picker diff --git a/Specs/Scene/CreditDisplaySpec.js b/Specs/Scene/CreditDisplaySpec.js index 7f51807007b1..c03880deaee7 100644 --- a/Specs/Scene/CreditDisplaySpec.js +++ b/Specs/Scene/CreditDisplaySpec.js @@ -89,7 +89,7 @@ defineSuite([ it('credit display displays hyperlink credit', function() { var creditDisplay = new CreditDisplay(container); - var link = 'http://cesium.agi.com/'; + var link = 'http://cesiumjs.org/'; var credit = new Credit(undefined, undefined, link); creditDisplay.beginFrame(); creditDisplay.addCredit(credit); diff --git a/Specs/Scene/TileSpec.js b/Specs/Scene/TileSpec.js index 348b0a208676..f2d3c38ddbbf 100644 --- a/Specs/Scene/TileSpec.js +++ b/Specs/Scene/TileSpec.js @@ -180,7 +180,7 @@ defineSuite([ }; realTerrainProvider = new CesiumTerrainProvider({ - url : 'http://cesium.agi.com/smallterrain' + url : 'http://cesiumjs.org/smallterrain' }); }); diff --git a/Specs/Scene/sampleTerrainSpec.js b/Specs/Scene/sampleTerrainSpec.js index 639f9e0620b8..38c3edbd2a05 100644 --- a/Specs/Scene/sampleTerrainSpec.js +++ b/Specs/Scene/sampleTerrainSpec.js @@ -13,7 +13,7 @@ defineSuite([ /*global jasmine,describe,xdescribe,it,xit,expect,beforeEach,afterEach,beforeAll,afterAll,spyOn,runs,waits,waitsFor*/ var terrainProvider = new CesiumTerrainProvider({ - url : 'http://cesium.agi.com/smallterrain' + url : 'http://cesiumjs.org/smallterrain' }); it('queries heights', function() { diff --git a/Tools/jsdoc3/templates/default/tmpl/index.tmpl b/Tools/jsdoc3/templates/default/tmpl/index.tmpl index 77d18edcf517..ead315d39efe 100644 --- a/Tools/jsdoc3/templates/default/tmpl/index.tmpl +++ b/Tools/jsdoc3/templates/default/tmpl/index.tmpl @@ -30,7 +30,7 @@