diff --git a/CHANGES.md b/CHANGES.md index e7b898f25..81554cf85 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,10 @@ # Changelog -## v1.11 +## v1.11 - 2015-12-23 * Changes * Port to Cesium 1.16. - * Port to OL 3.12.0 + * Port to OL 3.12.1 ## v1.10 - 2015-11-30 diff --git a/Cesium.externs.js b/Cesium.externs.js index fbdf717b5..f311f5f5d 100644 --- a/Cesium.externs.js +++ b/Cesium.externs.js @@ -38,6 +38,11 @@ Cesium.Color.unpack = function(color) {}; */ Cesium.Color.byteToFloat = function(component) {}; +/** + * @type {!Cesium.Color} + */ +Cesium.Color.WHITE; + /** * @constructor * @param {string} text @@ -962,6 +967,12 @@ Cesium.Globe = function(ellipsoid) {}; Cesium.Globe.prototype.ellipsoid; +/** + * @type {!Cesium.Color} + */ +Cesium.Globe.prototype.baseColor; + + /** * @type {boolean} */ @@ -2407,6 +2418,12 @@ Cesium.Scene = function(opt_opts) {}; Cesium.Scene.prototype.canvas; +/** + * @type {!Cesium.Color} + */ +Cesium.Scene.prototype.backgroundColor; + + /** * @type {!Cesium.Context} */ diff --git a/ol3 b/ol3 index 5d64762bc..863cc1bae 160000 --- a/ol3 +++ b/ol3 @@ -1 +1 @@ -Subproject commit 5d64762bcb676d7fccd5bb3c12c055d51d50c9f2 +Subproject commit 863cc1bae3be1a5a7d9d99f26dfc8a5c6450e3e6 diff --git a/package.json b/package.json index 5046db89c..7363fd00b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "type": "git", "url": "git://github.com/openlayers/ol3-cesium.git" }, - "license": "BSD", + "license": "BSD-2-Clause", "bugs": { "url": "https://github.com/openlayers/ol3-cesium/issues" }, diff --git a/src/ol3cesium.js b/src/ol3cesium.js index 4a1f5a7f7..58ff1b247 100644 --- a/src/ol3cesium.js +++ b/src/ol3cesium.js @@ -148,6 +148,7 @@ olcs.OLCesium = function(options) { * @private */ this.globe_ = new Cesium.Globe(Cesium.Ellipsoid.WGS84); + this.globe_.baseColor = Cesium.Color.WHITE; this.scene_.globe = this.globe_; this.scene_.skyAtmosphere = new Cesium.SkyAtmosphere();