Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Terrain and Imagery support for Google Earth Enterprise #5189

Merged
merged 63 commits into from
Apr 28, 2017
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
960945f
Added Imagery provider for Google Earth Enterprise servers.
Mar 27, 2017
99839b7
Google Earth Enterprise. Initial submit of terrain.
Mar 27, 2017
dd7e056
More work on terrain. Heights are off but lat/lon positions seem at l…
Mar 27, 2017
8787f66
Terrain and Imagery requests now return undefined if we know there is…
Mar 28, 2017
c36a004
Fixed terrain issue with incorrect height and added some terrain data…
Mar 29, 2017
d560680
Got terrain mostly loading.
Mar 30, 2017
6d35ced
Added skirts.
Mar 30, 2017
3eb039e
Got upsampling mostly working.
Mar 31, 2017
ef659d1
Tweak.
Mar 31, 2017
99f81a3
Fixed bit checks.
Mar 31, 2017
e9f402e
More cleanup for terrain. Should even work if a child is loaded befor…
Mar 31, 2017
c9c1d20
Added back cnodeVersion.
Mar 31, 2017
842d9c4
Added first try at removing dups along quad borders. Missing triangle…
Apr 1, 2017
e4648da
Fixed holes in mesh and unit tests. Still need to remove duplicate co…
Apr 1, 2017
89bd3df
Removed duplicate vertices from skirts.
Apr 1, 2017
a5119c4
Fixed jshint.
Apr 1, 2017
917f087
Fixed tests.
Apr 1, 2017
a8b312a
Removed credit and added sandcastle example.
Apr 1, 2017
d81c81e
Split apart Terrain and Imagery providers.
Apr 3, 2017
c72d320
Added tests for GoogleEarthEnterpriseMetadata and fixed an issue or 2…
Apr 3, 2017
06b5ab4
Added tests for GoogleEarthEnterpriseMetadata.
Apr 4, 2017
999155c
Added GEE terrain tests.
Apr 4, 2017
c4498fd
More GEE test fixes. Almost done imagery provider tests.
Apr 4, 2017
0b5e4fb
Added imagery tests and fixed a few small issues.
Apr 5, 2017
7bdbaa7
Added tests for interpolateHeight.
Apr 5, 2017
470b028
Fixed interpolation tests.
Apr 6, 2017
ce8c212
Cleanup.
Apr 6, 2017
f60b1af
Got terrain mostly working well.
Apr 6, 2017
5f563bb
Added handling for throttling requests even if promise was returned.
Apr 7, 2017
1b3da6a
Cleanup.
Apr 7, 2017
63bda07
Updated sandcastle example and fixed GEE terrain with Mercator imagery.
Apr 7, 2017
309eb11
Fixed skirts.
Apr 7, 2017
09f7543
Fixed issue where 2 skirt triangles weren't being drawn.
Apr 7, 2017
44aed82
Merge remote-tracking branch 'origin' into gee-terrain
Apr 7, 2017
22e8fda
Tweak.
Apr 7, 2017
541e2db
Updated CHANGES.md
Apr 7, 2017
26722e7
Tweaks from PR comments.
Apr 10, 2017
195ced5
jshint fix.
Apr 10, 2017
679c435
More tweaks from PR comments.
Apr 10, 2017
812bb87
Updated test data.
Apr 10, 2017
4bff168
Added code to cleanup terrain cache for unloaded tiles.
Apr 10, 2017
2d304a0
Sped up GEE by throttling metadata requests and offloading terrain de…
Apr 11, 2017
d212c9b
Fixed tests.
Apr 11, 2017
209951a
Moved metadata decoding to WebWorker.
Apr 11, 2017
a48edc8
Merged in master.
Apr 11, 2017
ba52867
Rearchitected terrain to be a little cleaner.
Apr 12, 2017
698964e
Imagery cleanup.
Apr 12, 2017
c274947
Fixed tests.
Apr 12, 2017
057dff5
Fixed more tests.
Apr 12, 2017
14ba59d
Tweak.
Apr 12, 2017
dc737af
Auto format and jshint fix.
Apr 12, 2017
82f3ed0
Removed unneeded promise return value.
Apr 12, 2017
3675c14
Cleanup.
Apr 12, 2017
b10c0d1
Cleanup.
Apr 12, 2017
6b75e4d
Cleanup.
Apr 12, 2017
498a044
Cleanup
Apr 20, 2017
f40a74c
Fixed issue where we were returning the ellipsoid after a terrain til…
Apr 20, 2017
afd66e8
Fixed jshint and changed error checking to use Check class.
Apr 24, 2017
08c6b42
Cleanup from PR comments.
Apr 24, 2017
0740d61
Fixed requesting some non-existant tiles.
Apr 24, 2017
79347a3
Fixed double parsing of terrain buffer.
Apr 24, 2017
768d770
Merge remote-tracking branch 'origin/master' into gee-terrain
mramato Apr 28, 2017
30afaff
Remove unnecessary if check.
mramato Apr 28, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions Apps/Sandcastle/gallery/Google Earth Enterprise.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Add imagery from a Web Map Service (WMS) server.">
<meta name="cesium-sandcastle-labels" content="Beginner">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
require.config({
baseUrl : '../../../Source',
waitSeconds : 60
});
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
<style>
@import url(../templates/bucket.css);
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
var geeMetadata = new Cesium.GoogleEarthEnterpriseMetadata({
url : 'http://www.earthenterprise.org/3d',
proxy : new Cesium.DefaultProxy('/proxy/')
});

var viewer = new Cesium.Viewer('cesiumContainer', {
imageryProvider : new Cesium.GoogleEarthEnterpriseImageryProvider({
metadata : geeMetadata
}),
terrainProvider : new Cesium.GoogleEarthEnterpriseTerrainProvider({
metadata : geeMetadata
}),
baseLayerPicker : false
});

// Start off looking at San Francisco.
viewer.camera.setView({
destination: Cesium.Rectangle.fromDegrees(-123.0, 36.0, -121.7, 39.0)
});
//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>
</body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Change Log
### 1.33 - 2017-05-01

* Added `disableDepthTestDistance` to billboards, points and labels. This sets the distance to the camera where the depth test will be disabled. Setting it to zero (the default) will alwasy enable the depth test. Setting it to `Number.POSITVE_INFINITY` will never enabled the depth test. Also added `scene.minimumDisableDepthTestDistance` to change the default value from zero. [#5166](https://github.com/AnalyticalGraphicsInc/cesium/pull/5166)
* Added `GoogleEarthEnterpriseTerrainProvider` and `GoogleEarthEnterpriseImageryProvider` to read data from Google Earth Enterprise servers. `GoogleEarthEnterpriseMeta` was also added so providers can share metadata requests.

### 1.32 - 2017-04-03

Expand Down
Loading