Skip to content

Commit 19593bc

Browse files
committed
Merge pull request #1320 from AnalyticalGraphicsInc/update-address
Update master's references to the website.
2 parents e37c6ad + e07b146 commit 19593bc

39 files changed

+59
-73
lines changed

Apps/Sandcastle/gallery/Black Marble.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
var widget = new Cesium.CesiumWidget('cesiumContainer', {
3030
imageryProvider : new Cesium.TileMapServiceImageryProvider({
31-
url : 'http://cesium.agi.com/blackmarble',
31+
url : 'http://cesiumjs.org/blackmarble',
3232
maximumLevel : 8,
3333
credit : 'Black Marble imagery courtesy NASA Earth Observatory'
3434
})

Apps/Sandcastle/gallery/Imagery Layers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
var layers = widget.centralBody.getImageryLayers();
3737
var blackMarble = layers.addImageryProvider(new Cesium.TileMapServiceImageryProvider({
38-
url : 'http://cesium.agi.com/blackmarble',
38+
url : 'http://cesiumjs.org/blackmarble',
3939
maximumLevel : 8,
4040
credit : 'Black Marble imagery courtesy NASA Earth Observatory'
4141
}));

Apps/Sandcastle/gallery/Terrain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
centralBody.depthTestAgainstTerrain = true;
198198

199199
var cesiumTerrainProvider = new Cesium.CesiumTerrainProvider({
200-
url : 'http://cesium.agi.com/smallterrain',
200+
url : 'http://cesiumjs.org/smallterrain',
201201
credit : 'Terrain data courtesy Analytical Graphics, Inc.'
202202
});
203203

Apps/Sandcastle/index.html

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,19 @@
3232
<script src="jsHintOptions.js"></script>
3333
<script src="gallery/gallery-index.js"></script>
3434
<script src="CesiumSandcastle.js"></script>
35-
<script type="text/javascript">
36-
if (window.location.host === "cesium.agi.com") {
37-
var _gaq = _gaq || [];
38-
_gaq.push(['_setAccount', 'UA-30040272-1']);
39-
_gaq.push(['_trackPageview']);
40-
(function () {
41-
var ga = document.createElement('script');
42-
ga.type = 'text/javascript';
43-
ga.async = true;
44-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
45-
var s = document.getElementsByTagName('script')[0];
46-
s.parentNode.insertBefore(ga, s);
47-
})();
48-
}
49-
</script>
5035
<meta property="og:title" content="Cesium Sandcastle" />
5136
<meta property="og:description" content="The Cesium Sandcastle provides an interactive environment for testing Cesium code." />
5237
<meta property="og:type" content="website" />
53-
<meta property="og:url" content="http://cesium.agi.com" />
54-
<meta property="og:image" content="http://cesium.agi.com/CesiumViewer.jpg" />
38+
<meta property="og:url" content="http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html" />
39+
<meta property="og:image" content="http://cesiumjs.org/images/Sandcastle.png" />
5540
<meta property="og:site_name" content="Cesium" />
5641
<meta property="fb:admins" content="1222088662,1322006496" />
5742
</head>
5843
<body class="claro">
5944
<div id="loading"><span>Loading...</span></div>
6045
<div id="appLayout" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design: 'headline', gutters: true, liveSplitters: true">
6146
<div id="toolbar" data-dojo-type="dijit.Toolbar" data-dojo-props="region: 'top'">
62-
<div class="cesiumTitle"><a href="http://cesium.agi.com" target="_blank"><img src="./images/Cesium_Logo_Color_Overlay.png" style="width: 118px"/></a></div>
47+
<div class="cesiumTitle"><a href="http://cesiumjs.org/" target="_blank"><img src="./images/Cesium_Logo_Color_Overlay.png" style="width: 118px"/></a></div>
6348
<div id="buttonRun" data-dojo-type="dijit.form.Button" data-dojo-props="iconClass: 'dijitIconFunction', showLabel: true">
6449
Run (F8)
6550
</div>

Apps/TerrainInspector/TerrainInspector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require([
2020
centralBody.depthTestAgainstTerrain = true;
2121

2222
centralBody.terrainProvider = new Cesium.CesiumTerrainProvider({
23-
url : 'http://cesium.agi.com/smallterrain'
23+
url : 'http://cesiumjs.org/smallterrain'
2424
});
2525

2626
var tp = new TitlePane({

Apps/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<script type="text/javascript">
1515
if (window.location.protocol === 'file:') {
1616
document.write('<p><b>Warning: This file must be hosted in a web server.</br>');
17-
document.write('See our <a href="http://cesium.agi.com/2013/04/12/Cesium-up-and-running/">Getting Started</a> ');
17+
document.write('See our <a href="http://cesiumjs.org/2013/04/12/Cesium-up-and-running/">Getting Started</a> ');
1818
document.write('tutorial for a step-by-step guide.</b></p>');
1919
}
2020
</script>
@@ -28,10 +28,10 @@
2828
</li>
2929
<li>External Links
3030
<ul>
31-
<li><a href="http://cesium.agi.com">Homepage</a> - Cesium homepage</li>
32-
<li><a href="http://cesium.agi.com/tutorials.html">Tutorials</a> - Step by step guides for Cesium features</li>
33-
<li><a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html">Sandcastle</a> - Interactive learning and live coding</li>
34-
<li><a href="http://cesium.agi.com/forum.html">Forum</a> - Forum and mailing list, questions and feedback welcome from all skill levels</li>
31+
<li><a href="http://cesiumjs.org">Homepage</a> - Cesium homepage</li>
32+
<li><a href="http://cesiumjs.org/tutorials.html">Tutorials</a> - Step by step guides for Cesium features</li>
33+
<li><a href="http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html">Sandcastle</a> - Interactive learning and live coding</li>
34+
<li><a href="http://cesiumjs.org/forum.html">Forum</a> - Forum and mailing list, questions and feedback welcome from all skill levels</li>
3535
<li><a href="https://github.com/AnalyticalGraphicsInc/cesium">GitHub</a> - Cesium GitHub repository</li>
3636
</ul>
3737
</li>

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Beta Releases
4949
* Added `ObjectOrientedBoundingBox`.
5050
* Added `Ellipsoid.transformPositionFromScaledSpace`.
5151
* Added `Math.nextPowerOfTwo`.
52+
* Renamed our main website from [cesium.agi.com](http://cesium.agi.com/) to [cesiumjs.org](http://cesiumjs.org/).
5253

5354
### b22 - 2013-11-01
5455

@@ -448,7 +449,7 @@ _This releases fixes 2D and other issues with Chrome 29.0.1547.57 ([#1002](https
448449
* Removed `CesiumViewerWidget.fullScreenElement`, instead use the `CesiumViewerWidget.fullscreen.viewModel.fullScreenElement` observable property.
449450
* `IntersectionTests.rayPlane` now takes the new `Plane` type instead of separate `planeNormal` and `planeD` arguments.
450451
* Renamed `ImageryProviderError` to `TileProviderError`.
451-
* Added support for global terrain visualization via `CesiumTerrainProvider`, `ArcGisImageServerTerrainProvider`, and `VRTheWorldTerrainProvider`. See the [Terrain Tutorial](http://cesium.agi.com/2013/02/15/Cesium-Terrain-Tutorial/) for more information.
452+
* Added support for global terrain visualization via `CesiumTerrainProvider`, `ArcGisImageServerTerrainProvider`, and `VRTheWorldTerrainProvider`. See the [Terrain Tutorial](http://cesiumjs.org/2013/02/15/Cesium-Terrain-Tutorial/) for more information.
452453
* Added `FullscreenWidget` which is a simple, single-button widget that toggles fullscreen mode of the specified element.
453454
* Added interactive extent drawing to the `Picking` Sandcastle example.
454455
* Added `HeightmapTessellator` to create a mesh from a heightmap.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ To keep our code quality high, please make sure:
3838
If new public classes, functions, or properties were added, also:
3939
* Include reference documentation with code examples. Check out the [best practices](https://github.com/AnalyticalGraphicsInc/cesium/wiki/Documentation-Best-Practices).
4040
* Update [CHANGES.md](CHANGES.md).
41-
* If the change is significant, add a new [Sandcastle](http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html) example or extend and existing one.
41+
* If the change is significant, add a new [Sandcastle](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html) example or extend and existing one.

CONTRIBUTORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
4040
* [You Lu](https://github.com/YouLu)
4141
* [David Hite](https://github.com/dav3hit3)
4242

43-
Also see [our contributors page](http://cesium.agi.com/contributors.html) for more information.
43+
Also see [our contributors page](http://cesiumjs.org/contributors.html) for more information.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Cesium is a WebGL virtual globe and map engine.
66

7-
http://cesium.agi.com/
7+
http://cesiumjs.org/
88

99
### Mission ###
1010

@@ -16,12 +16,12 @@ Our mission is to create the leading web-based globe and map for visualizing dyn
1616

1717
### Get Started ###
1818

19-
See the [Getting Started](http://cesium.agi.com/2013/04/12/Cesium-up-and-running/). Have questions? Ask them on the [forum](https://groups.google.com/d/forum/cesium-dev).
19+
See the [Getting Started](http://cesiumjs.org/2013/04/12/Cesium-up-and-running/). Have questions? Ask them on the [forum](https://groups.google.com/d/forum/cesium-dev).
2020

2121
Interested in contributing? See the [wiki](https://github.com/AnalyticalGraphicsInc/cesium/wiki).
2222

2323
<p align="center">
24-
<img src="http://cesium.agi.com/images/OneApiThreeViews.png" height="150" />&nbsp;
25-
<img src="http://cesium.agi.com/images/KoreaLaunch.png" height="150" />&nbsp;
26-
<img src="http://cesium.agi.com/images/Terrain.png" height="150" />
24+
<img src="http://cesiumjs.org/images/OneApiThreeViews.png" height="150" />&nbsp;
25+
<img src="http://cesiumjs.org/images/KoreaLaunch.png" height="150" />&nbsp;
26+
<img src="http://cesiumjs.org/images/Terrain.png" height="150" />
2727
</p>

0 commit comments

Comments
 (0)