merged master into feature/more-tolerant-kml-processing

CesiumGS · Jun 8, 2016 · 2048441 · 2048441
2 parents ba5a2d9 + 6959c80
commit 2048441
Show file tree

Hide file tree

Showing 56 changed files with 4,472 additions and 4,046 deletions.
diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js
@@ -20,6 +20,10 @@ require({
         location : '../ThirdParty/codemirror-4.6'
     }]
 }, [
+        "dijit/Dialog",
+        "dijit/form/Button",
+        "dijit/form/Form",
+        "dijit/form/Textarea",
         'CodeMirror/lib/codemirror',
         'dijit/layout/ContentPane',
         'dijit/popup',
@@ -38,10 +42,6 @@ require({
         'dojo/query',
         'dojo/when',
         'Sandcastle/LinkButton',
-        "dijit/Dialog",
-        "dijit/form/Form",
-        "dijit/form/Textarea",
-        "dijit/form/Button",
         'Source/Cesium',
         'CodeMirror/addon/hint/show-hint',
         'CodeMirror/addon/hint/javascript-hint',
@@ -63,6 +63,10 @@ require({
         'dijit/ToolbarSeparator',
         'dojo/domReady!'
     ], function(
+        Dialog,
+        Button,
+        Form,
+        TextArea,
         CodeMirror,
         ContentPane,
         popup,
@@ -81,10 +85,6 @@ require({
         query,
         when,
         LinkButton,
-        Dialog,
-        Form,
-        TextArea,
-        Button,
         Cesium) {
     'use strict';
 

diff --git a/Apps/Sandcastle/gallery/CZML Billboard and Label.html b/Apps/Sandcastle/gallery/CZML Billboard and Label.html
@@ -26,54 +26,52 @@
 
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
-  'use strict';
-  //Sandcastle_Begin
-var czml = [
-  {
+    'use strict';
+//Sandcastle_Begin
+var czml = [{
     "id" : "document",
     "name" : "Basic CZML billboard and label",
     "version" : "1.0"
-  }, {
+}, {
     "id" : "some-unique-id",
     "name" : "AGI",
     "description" : "<p><a href='http://www.agi.com' target='_blank'>Analytical Graphics, Inc.</a> (AGI) founded Cesium.</p>",
     "billboard" : {
-      "image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACvSURBVDhPrZDRDcMgDAU9GqN0lIzijw6SUbJJygUeNQgSqepJTyHG91LVVpwDdfxM3T9TSl1EXZvDwii471fivK73cBFFQNTT/d2KoGpfGOpSIkhUpgUMxq9DFEsWv4IXhlyCnhBFnZcFEEuYqbiUlNwWgMTdrZ3JbQFoEVG53rd8ztG9aPJMnBUQf/VFraBJeWnLS0RfjbKyLJA8FkT5seDYS1Qwyv8t0B/5C2ZmH2/eTGNNBgMmAAAAAElFTkSuQmCC",
-      "scale" : 1.5
+        "image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACvSURBVDhPrZDRDcMgDAU9GqN0lIzijw6SUbJJygUeNQgSqepJTyHG91LVVpwDdfxM3T9TSl1EXZvDwii471fivK73cBFFQNTT/d2KoGpfGOpSIkhUpgUMxq9DFEsWv4IXhlyCnhBFnZcFEEuYqbiUlNwWgMTdrZ3JbQFoEVG53rd8ztG9aPJMnBUQf/VFraBJeWnLS0RfjbKyLJA8FkT5seDYS1Qwyv8t0B/5C2ZmH2/eTGNNBgMmAAAAAElFTkSuQmCC",
+        "scale" : 1.5
     },
     "label" : {
-      "fillColor" : {
-        "rgba" : [0, 255, 255, 255]
-      },
-      "font" : "11pt Lucida Console",
-      "horizontalOrigin" : "LEFT",
-      "outlineColor" : {
-        "rgba":[0, 0, 0, 255]
-      },
-      "outlineWidth" : 2,
-      "pixelOffset" : {
-        "cartesian2" : [12, 0]
-      },
-      "style" : "FILL_AND_OUTLINE",
-      "text" : "AGI"
+        "fillColor" : {
+            "rgba" : [0, 255, 255, 255]
+        },
+        "font" : "11pt Lucida Console",
+        "horizontalOrigin" : "LEFT",
+        "outlineColor" : {
+            "rgba":[0, 0, 0, 255]
+        },
+        "outlineWidth" : 2,
+        "pixelOffset" : {
+            "cartesian2" : [12, 0]
+        },
+        "style" : "FILL_AND_OUTLINE",
+        "text" : "AGI"
     },
     "position" : {
-      "cartesian" : [
-        1216469.9357990976, -4736121.71856379, 4081386.8856866374
-      ]
+        "cartesian":[
+            1216361.4096947117, -4736253.175342511, 4081267.4865667094
+        ]
     }
-  }
-];
+}];
 
 var viewer = new Cesium.Viewer('cesiumContainer');
 viewer.dataSources.add(Cesium.CzmlDataSource.load(czml));
   //Sandcastle_End
-  Sandcastle.finishedLoading();
+    Sandcastle.finishedLoading();
 }
 if (typeof Cesium !== "undefined") {
-  startup(Cesium);
+    startup(Cesium);
 } else if (typeof require === "function") {
-  require(["Cesium"], startup);
+    require(["Cesium"], startup);
 }
 </script>
 </body>

diff --git a/Apps/Sandcastle/gallery/CZML Box.html b/Apps/Sandcastle/gallery/CZML Box.html
@@ -0,0 +1,108 @@
+<!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="CZML Circles and Ellipses">
+    <meta name="cesium-sandcastle-labels" content="CZML">
+    <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 czml = [{
+    "id" : "document",
+    "name" : "box",
+    "version" : "1.0"
+}, {
+    "id" : "shape1",
+    "name" : "Blue box",
+    "position" : {
+        "cartographicDegrees" : [-114.0, 40.0, 300000.0]
+    },
+    "box" : {
+        "dimensions" : {
+            "cartesian": [400000.0, 300000.0, 500000.0]
+        },
+        "material" : {
+            "solidColor" : {
+                "color" : {
+                    "rgba" : [0, 0, 255, 255]
+                }
+            }
+        }
+    }
+}, {
+    "id" : "shape2",
+    "name" : "Red box with black outline",
+    "position" : {
+        "cartographicDegrees" : [-107.0, 40.0, 300000.0]
+    },
+    "box" : {
+        "dimensions" : {
+            "cartesian": [400000.0, 300000.0, 500000.0]
+        },
+        "material" : {
+            "solidColor" : {
+                "color" : {
+                    "rgba" : [255, 0, 0, 128]
+                }
+            }
+        },
+        "outline" : true,
+        "outlineColor" : {
+            "rgba" : [0, 0, 0, 255]
+        }
+    }    
+}, {
+    "id" : "shape3",
+    "name" : "Yellow box outline",
+    "position" : {
+        "cartographicDegrees" : [-100.0, 40.0, 300000.0]
+    },
+    "box" : {
+        "dimensions" : {
+            "cartesian": [400000.0, 300000.0, 500000.0]
+        },
+        "fill" : false,
+        "outline" : true,
+        "outlineColor" : {
+            "rgba" : [255, 255, 0, 255]
+        }
+    } 
+}];
+
+var viewer = new Cesium.Viewer('cesiumContainer');
+var dataSource = Cesium.CzmlDataSource.load(czml);
+viewer.dataSources.add(dataSource);
+viewer.zoomTo(dataSource);
+
+  //Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/CZML Box.jpg b/Apps/Sandcastle/gallery/CZML Box.jpg