Merge branch 'master' into spector-editor

.concierge/templates/pullRequestOpened.hbs

@@ -1,7 +1,7 @@
 {{#if askAboutContributors}}
 Thank you so much for the pull request @{{ userName }}! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!
 
-The [Pull Request Guidelines](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
+The [Pull Request Guidelines](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
 
 * :x: Missing `CONTRIBUTORS.md` entry.
     * Please add yourself to the [contributors]({{ contributorsUrl }}) file!
@@ -10,15 +10,15 @@ Thanks for the pull request @{{ userName }}!
 {{/if}}
 {{#if claEnabled}}
 {{#if errorCla}}
-* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
+* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
     * Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
     ```
     {{ errorCla }}
     ```
 {{else}}
 {{#if askForCla}}
 * :x: Missing CLA.
-    * Please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
+    * Please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
 {{else}}
 * :heavy_check_mark: Signed CLA found.
 {{/if}}
@@ -34,7 +34,7 @@ Thanks for the pull request @{{ userName }}!
 {{/if}}
 {{#if askAboutTests}}
 * :grey_question: Unit tests were not updated.
-    * Make sure you've [updated tests](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
+    * Make sure you've [updated tests](https://github.com/CesiumGS/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
 {{/if}}
 
 Reviewers, don't forget to make sure that:

.eslintrc.json

@@ -9,8 +9,8 @@
     "overrides": [
         {
             "files": [
-                "index.js",
-                "server.js",
+                "index.cjs",
+                "server.cjs",
                 "gulpfile.js",
                 "Source/Workers/transferTypedArrayTest.js"
             ],

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,25 +4,25 @@ about: Let us know so we can fix it!
 ---
 
 <!--
-Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens. 
+Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens.
 
 Creating a Sandcastle example (https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
---> 
+-->
 
-Sandcastle example: 
+Sandcastle example:
 
 Browser:
 
 Operating System:
 
-<!-- 
+<!--
 
-If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users. 
+If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users.
 
-Check out the contributor guide to get started: 
+Check out the contributor guide to get started:
 
-https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
+https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md
 
 Just let us know you're working on it and we'd be happy to provide advice and feedback.
 
--->
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,12 +3,12 @@ name: Request a feature
 about: New ideas & improvements to Cesium are always welcome.
 ---
 
-<!-- 
-Thanks for helping make Cesium better! 
+<!--
+Thanks for helping make Cesium better!
 
-When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized. 
+When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
 
-The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started: 
+The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started:
 
-https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
---> 
+https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md
+-->

.gulp.json

@@ -0,0 +1,5 @@
+{
+    "flags": {
+        "gulpfile": "gulpfile.cjs"
+    }
+}

.npmignore

@@ -23,7 +23,7 @@
 /index.html
 /index.release.html
 /launches
-/server.js
+/server.cjs
 /Source/copyrightHeader.js
 /Specs
 /ThirdParty

.travis.yml

@@ -26,7 +26,7 @@ script:
 
 # Various Node.js smoke-screen tests
   - node -e "const Cesium = require('./');"
-  - NODE_ENV=development node index.js
-  - NODE_ENV=production node index.js
+  - NODE_ENV=development node index.cjs
+  - NODE_ENV=production node index.cjs
 
   - npm --silent run cloc

.vscode/launch.json

@@ -1,5 +1,5 @@
 {
-    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Use IntelliSense to learn about possible attributes.
     // Hover to view descriptions of existing attributes.
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
@@ -8,14 +8,10 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "program": "${workspaceRoot}\\server.js",
-            "cwd": "${workspaceRoot}"
-        },
-        {
-            "type": "node",
-            "request": "attach",
-            "name": "Attach to Process",
-            "port": 5858
+            "cwd": "${workspaceFolder}",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": ["run-script", "start"],
+            "noDebug": true
         }
     ]
-}
+}

Apps/.jshintrc

@@ -21,7 +21,6 @@
   "boss": false,
   "debug": false,
   "eqnull": false,
-  "esnext": false,
   "moz": false,
   "evil": false,
   "expr": false,

Apps/Sandcastle/.jshintrc

@@ -1,6 +1,7 @@
 {
   "extends": "../.jshintrc",
   "unused": false,
+  "esversion": 10,
   "predef": [
     "JSON",
     "require",

Apps/Sandcastle/CesiumSandcastle.js

@@ -15,7 +15,7 @@ require({
         location: '../Apps/Sandcastle'
     }, {
         name: 'CodeMirror',
-        location: '../ThirdParty/codemirror-4.6'
+        location: '../ThirdParty/codemirror-5.52.0'
     }, {
         name: 'ThirdParty',
         location: '../Apps/Sandcastle/ThirdParty'
@@ -1057,7 +1057,7 @@ require({
         });
     }
 
-    // Work around Chrome 79 bug: https://github.com/AnalyticalGraphicsInc/cesium/issues/8460
+    // Work around Chrome 79 bug: https://github.com/CesiumGS/cesium/issues/8460
     function waitForDoc(doc, test) {
         var deferred = new Deferred();
         if (test()) {

Apps/Sandcastle/Sandcastle-header.js

@@ -100,7 +100,7 @@
 
     if (window.location.protocol === 'file:') {
         if (window.confirm("You must host this app on a web server.\nSee contributor's guide for more info?")) {
-            window.location = 'https://github.com/AnalyticalGraphicsInc/cesium/wiki/Contributor%27s-Guide';
+            window.location = 'https://github.com/CesiumGS/cesium/wiki/Contributor%27s-Guide';
         }
     }
 }());

Apps/Sandcastle/gallery/3D Tiles BIM.html

@@ -84,7 +84,7 @@
 
 // In this tileset every feature has an "element" property which is a global ID.
 // This property is used to associate features across different tiles and LODs.
-// Workaround until 3D Tiles has the concept of global batch ids: https://github.com/AnalyticalGraphicsInc/3d-tiles/issues/265
+// Workaround until 3D Tiles has the concept of global batch ids: https://github.com/CesiumGS/3d-tiles/issues/265
 var elementMap = {}; // Build a map of elements to features.
 var hiddenElements = [112001, 113180, 131136, 113167, 71309, 109652, 111178, 113156, 113170, 124846, 114076, 131122, 113179, 114325, 131134, 113164, 113153, 113179, 109656, 114095, 114093, 39225, 39267, 113149, 113071, 112003, 39229, 113160, 39227, 39234, 113985, 39230, 112004, 39223];
 

Apps/Sandcastle/gallery/3D Tiles Feature Picking.html

@@ -40,7 +40,7 @@
 });
 
 // Load the NYC buildings tileset
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(75343) });
 viewer.scene.primitives.add(tileset);
 
 // HTML overlay for showing feature name on mouseover
@@ -99,10 +99,7 @@
         nameOverlay.style.display = 'block';
         nameOverlay.style.bottom = viewer.canvas.clientHeight - movement.endPosition.y + 'px';
         nameOverlay.style.left = movement.endPosition.x + 'px';
-        var name = pickedFeature.getProperty('name');
-        if (!Cesium.defined(name)) {
-            name = pickedFeature.getProperty('id');
-        }
+        var name = pickedFeature.getProperty('BIN');
         nameOverlay.textContent = name;
 
         // Highlight the feature if it's not already selected.

Apps/Sandcastle/gallery/3D Tiles Feature Styling.html

@@ -23,7 +23,7 @@
     'use strict';
 //Sandcastle_Begin
 // A demo of interactive 3D Tiles styling
-// Styling language Documentation: https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification/Styling
+// Styling language Documentation: https://github.com/CesiumGS/3d-tiles/tree/master/specification/Styling
 // Building data courtesy of NYC OpenData portal: http://www1.nyc.gov/site/doitt/initiatives/3d-building.page
 var viewer = new Cesium.Viewer('cesiumContainer', {
     terrainProvider: Cesium.createWorldTerrain()
@@ -41,21 +41,21 @@
 });
 
 // Load the NYC buildings tileset.
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(75343) });
 viewer.scene.primitives.add(tileset);
 
 // Color buildings based on their height.
 function colorByHeight() {
     tileset.style = new Cesium.Cesium3DTileStyle({
         color: {
             conditions: [
-                ['${height} >= 300', 'rgba(45, 0, 75, 0.5)'],
-                ['${height} >= 200', 'rgb(102, 71, 151)'],
-                ['${height} >= 100', 'rgb(170, 162, 204)'],
-                ['${height} >= 50', 'rgb(224, 226, 238)'],
-                ['${height} >= 25', 'rgb(252, 230, 200)'],
-                ['${height} >= 10', 'rgb(248, 176, 87)'],
-                ['${height} >= 5', 'rgb(198, 106, 11)'],
+                ['${Height} >= 300', 'rgba(45, 0, 75, 0.5)'],
+                ['${Height} >= 200', 'rgb(102, 71, 151)'],
+                ['${Height} >= 100', 'rgb(170, 162, 204)'],
+                ['${Height} >= 50', 'rgb(224, 226, 238)'],
+                ['${Height} >= 25', 'rgb(252, 230, 200)'],
+                ['${Height} >= 10', 'rgb(248, 176, 87)'],
+                ['${Height} >= 5', 'rgb(198, 106, 11)'],
                 ['true', 'rgb(127, 59, 8)']
             ]
         }
@@ -66,7 +66,7 @@
 function colorByLatitude() {
     tileset.style = new Cesium.Cesium3DTileStyle({
         defines: {
-            latitudeRadians: 'radians(${latitude})'
+            latitudeRadians: 'radians(${Latitude})'
         },
         color: {
             conditions: [
@@ -86,7 +86,7 @@
 function colorByDistance() {
     tileset.style = new Cesium.Cesium3DTileStyle({
         defines : {
-            distance : 'distance(vec2(radians(${longitude}), radians(${latitude})), vec2(-1.291777521, 0.7105706624))'
+            distance : 'distance(vec2(radians(${Longitude}), radians(${Latitude})), vec2(-1.291777521, 0.7105706624))'
         },
         color : {
             conditions : [
@@ -100,17 +100,17 @@
     });
 }
 
-// Color buildings with a '3' in their name.
-function colorByNameRegex() {
+// Color buildings with a '3' in their BIN property.
+function colorByStringRegex() {
     tileset.style = new Cesium.Cesium3DTileStyle({
-        color : "(regExp('3').test(String(${name}))) ? color('cyan', 0.9) : color('purple', 0.1)"
+        color : "(regExp('3').test(String(${BIN}))) ? color('cyan', 0.9) : color('purple', 0.1)"
     });
 }
 
 // Show only buildings greater than 200 meters in height.
 function hideByHeight() {
     tileset.style = new Cesium.Cesium3DTileStyle({
-        show : '${height} > 200'
+        show : '${Height} > 200'
     });
 }
 
@@ -132,7 +132,7 @@
 }, {
     text : 'Color By Name Regex',
     onselect : function() {
-        colorByNameRegex();
+        colorByStringRegex();
     }
 }, {
     text : 'Hide By Height',

Apps/Sandcastle/gallery/3D Tiles Inspector.html

@@ -32,7 +32,7 @@
 viewer.extend(Cesium.viewerCesium3DTilesInspectorMixin);
 var inspectorViewModel = viewer.cesium3DTilesInspector.viewModel;
 
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(75343) });
 viewer.scene.primitives.add(tileset);
 
 tileset.readyPromise.then(function(){

Apps/Sandcastle/gallery/3D Tiles Interactivity.html

@@ -72,11 +72,11 @@
 });
 
 // Load the NYC buildings tileset.
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5741) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(75343) });
 scene.primitives.add(tileset);
 tileset.style = new Cesium.Cesium3DTileStyle({
     meta: {
-        description: "'Building id ${id} has height ${height}.'"
+        description: "'Building ${BIN} has height ${Height}.'"
     }
 });
 
@@ -144,9 +144,9 @@
 }
 
 function zoom(movement, feature) {
-    var longitude = Cesium.Math.toRadians(feature.getProperty('longitude'));
-    var latitude = Cesium.Math.toRadians(feature.getProperty('latitude'));
-    var height = feature.getProperty('height');
+    var longitude = Cesium.Math.toRadians(feature.getProperty('Longitude'));
+    var latitude = Cesium.Math.toRadians(feature.getProperty('Latitude'));
+    var height = feature.getProperty('Height');
 
     var positionCartographic = new Cesium.Cartographic(longitude, latitude, height * 0.5);
     var position = scene.globe.ellipsoid.cartographicToCartesian(positionCartographic);

Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html

@@ -35,7 +35,7 @@
 
 // Geometry Tiles are experimental and the format is subject to change in the future.
 // For more details, see:
-//    https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/3d-tiles-next/TileFormats/Geometry
+//    https://github.com/CesiumGS/3d-tiles/tree/3d-tiles-next/TileFormats/Geometry
 var classificationTileset = new Cesium.Cesium3DTileset({
     url: '../../SampleData/Cesium3DTiles/Classification/PointCloud/tileset.json',
     classificationType: Cesium.ClassificationType.CESIUM_3D_TILE

Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html

@@ -33,7 +33,7 @@
 
 // Vector 3D Tiles are experimental and the format is subject to change in the future.
 // For more details, see:
-//    https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/3d-tiles-next/TileFormats/VectorData
+//    https://github.com/CesiumGS/3d-tiles/tree/3d-tiles-next/TileFormats/VectorData
 var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(5737) });
 viewer.scene.primitives.add(tileset);
 

Apps/Sandcastle/gallery/Clustering.html

@@ -149,7 +149,7 @@
         var pickedLabel = viewer.scene.pick(movement.position);
         if (Cesium.defined(pickedLabel)) {
             var ids = pickedLabel.id;
-            if (Cesium.isArray(ids)) {
+            if (Array.isArray(ids)) {
                 for (var i = 0; i < ids.length; ++i) {
                     ids[i].billboard.color = Cesium.Color.RED;
                 }

Apps/Sandcastle/gallery/FXAA.html

@@ -33,7 +33,7 @@
 });
 
 viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
-    url: Cesium.IonResource.fromAssetId(5741)
+    url: Cesium.IonResource.fromAssetId(75343)
 }));
 
 viewer.scene.postProcessStages.fxaa.enabled = true;

Apps/Sandcastle/gallery/Offline.html

@@ -25,7 +25,7 @@
 // This is an example of using Cesium "Offline", meaning disconnected from the
 // external Internet.  It must still be served from a local web server, but
 // does not rely on any outside resources or services.  For more info, see:
-// https://github.com/AnalyticalGraphicsInc/cesium/wiki/Offline-Guide
+// https://github.com/CesiumGS/cesium/wiki/Offline-Guide
 
 var viewer = new Cesium.Viewer('cesiumContainer', {
     imageryProvider : new Cesium.TileMapServiceImageryProvider({