Merge branch 'master' into fix-wmts-sandcastle

.travis.yml

@@ -1,14 +1,9 @@
 language: node_js
 node_js:
-  - "8"
-sudo: false
+  - "10"
 addons:
   chrome: stable
   firefox: latest
-services:
-  - xvfb
-before_script:
-  - export DISPLAY=:99.0
 script:
   - npm --silent run deploy-set-version -- --buildVersion $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
   - npm --silent run deploy-status -- --status pending --message 'Waiting for build'

Apps/Sandcastle/CesiumSandcastle.js

@@ -42,6 +42,7 @@ require({
         'dojo/promise/all',
         'dojo/query',
         'dojo/when',
+        'dojo/Deferred',
         'dojo/request/script',
         'Sandcastle/LinkButton',
         'ThirdParty/clipboard.min',
@@ -87,6 +88,7 @@ require({
         all,
         query,
         when,
+        Deferred,
         dojoscript,
         LinkButton,
         ClipboardJS,
@@ -739,6 +741,10 @@ require({
                 var parser = new DOMParser();
                 var doc = parser.parseFromString(demo.code, 'text/html');
 
+                return waitForDoc(doc, function(){
+                    return doc.querySelector('script[id="cesium_sandcastle_script"]');
+                }).then(function(){
+
                 var script = doc.querySelector('script[id="cesium_sandcastle_script"]');
                 if (!script) {
                     appendConsole('consoleError', 'Error reading source file: ' + demo.name, true);
@@ -763,6 +769,7 @@ require({
                 htmlText = htmlText.replace(/^\s+/, '');
 
                 applyLoadedDemo(scriptCode, htmlText);
+                });
             }
         });
     }
@@ -1050,6 +1057,22 @@ require({
         });
     }
 
+    // Work around Chrome 79 bug: https://github.com/AnalyticalGraphicsInc/cesium/issues/8460
+    function waitForDoc(doc, test) {
+        var deferred = new Deferred();
+        if (test()) {
+            deferred.resolve(doc);
+        } else {
+            var counter = 1;
+            setTimeout(function() {
+                if (test() || counter++ > 10) {
+                    deferred.resolve(doc);
+                }
+            }, 100 * counter);
+        }
+        return deferred.promise;
+    }
+
     var newInLabel = 'New in ' + VERSION;
     function loadDemoFromFile(demo) {
         return requestDemo(demo.name).then(function(value) {
@@ -1058,6 +1081,10 @@ require({
 
             var parser = new DOMParser();
             var doc = parser.parseFromString(value, 'text/html');
+            return waitForDoc(doc, function(){
+                return doc.body.getAttribute('data-sandcastle-bucket');
+            });
+        }).then(function(doc) {
 
             var bucket = doc.body.getAttribute('data-sandcastle-bucket');
             demo.bucket = bucket ? bucket : 'bucket-requirejs.html';

Apps/Sandcastle/gallery/Particle System Weather.html

@@ -42,7 +42,7 @@
 resetCameraFunction();
 
 // snow
-var snowParticleSize = scene.drawingBufferWidth / 100.0;
+var snowParticleSize = 12.0;
 var snowRadius = 100000.0;
 var minimumSnowImageSize = new Cesium.Cartesian2(snowParticleSize, snowParticleSize);
 var maximumSnowImageSize = new Cesium.Cartesian2(snowParticleSize * 2.0, snowParticleSize * 2.0);
@@ -81,7 +81,7 @@
 scene.primitives.add(snowSystem);
 
 // rain
-var rainParticleSize = scene.drawingBufferWidth / 80.0;
+var rainParticleSize = 15.0;
 var rainRadius = 100000.0;
 var rainImageSize = new Cesium.Cartesian2(rainParticleSize, rainParticleSize * 2.0);
 

Apps/Sandcastle/gallery/Shadows.html

@@ -33,7 +33,7 @@
 });
 
 var shadowMap = viewer.shadowMap;
-shadowMap.maxmimumDistance = 10000.0;
+shadowMap.maximumDistance = 10000.0;
 
 var cesiumAir = viewer.entities.add({
     name : 'Cesium Air',

CHANGES.md

@@ -1,6 +1,25 @@
 Change Log
 ==========
 
+### 1.65.0 - 2019-01-02
+
+##### Fixes :wrench:
+* Fixed Geocoder auto-complete suggestions when hosted inside Web Components. [#8425](https://github.com/AnalyticalGraphicsInc/cesium/pull/8425)
+* Fixed terrain tile culling problems when under ellipsoid. [#8397](https://github.com/AnalyticalGraphicsInc/cesium/pull/8397)
+* Fixed primitive culling when below the ellipsoid but above terrain. [#8398](https://github.com/AnalyticalGraphicsInc/cesium/pull/8398)
+
+### 1.64.0 - 2019-12-02
+
+##### Fixes :wrench:
+* Fixed an issue in image based lighting where an invalid environment map would silently fail. [#8303](https://github.com/AnalyticalGraphicsInc/cesium/pull/8303)
+* Various small internal improvements
+
+### 1.63.1 - 2019-11-06
+
+##### Fixes :wrench:
+* Fixed regression in 1.63 where ground atmosphere and labels rendered incorrectly on displays with `window.devicePixelRatio` greater than 1.0. [#8351](https://github.com/AnalyticalGraphicsInc/cesium/pull/8351)
+* Fixed regression in 1.63 where some primitives would show through the globe when log depth is disabled. [#8368](https://github.com/AnalyticalGraphicsInc/cesium/pull/8368)
+
 ### 1.63 - 2019-11-01
 
 ##### Major Announcements :loudspeaker:

CONTRIBUTORS.md

@@ -67,7 +67,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Evax Software](https://github.com/evax)
 * [Aviture](http://aviture.us.com)
    * [Mike Macaulay](https://github.com/mmacaula)
-   * [Nathan Schulte](https://github.com/nmschulte)
+   * [Nathan Schulte](https://github.com/nmschulte-aviture)
    * [Jed Fong](https://github.com/jedfong)
    * [Brandon McAllister](https://github.com/bmcallis)
    * [Eric Strabala](https://github.com/emstrabala)
@@ -238,3 +238,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Chris Wingler](https://github.com/chriswingler)
 * [Tinco Andringa](https://github.com/tinco)
 * [André Borud](https://github.com/andreborud)
+* [Nathan Schulte](https://github.com/nmschulte)

LICENSE.md

@@ -202,9 +202,9 @@ Copyright 2011-2019 CesiumJS Contributors
    See the License for the specific language governing permissions and
    limitations under the License.
 
-Patents 9153063 9865085
+Patents US9153063B2 US9865085B1
 
-Patents pending 15/829,786 62/701,099 62/837,358 62/837,381
+Patents pending US15/829,786 US16/516,997 US62/837,358 US62/837,381
 
 Third-Party Code
 ================