Merge branch 'master' into master

Author: Tom Fili

Apps/Sandcastle/gallery/Custom Geocoder.html

@@ -51,7 +51,7 @@
  * @returns {Promise<GeocoderResult[]>}
  */
 OpenStreetMapNominatimGeocoder.prototype.geocode = function (input) {
-    var endpoint = 'http://nominatim.openstreetmap.org/search?';
+    var endpoint = 'https://nominatim.openstreetmap.org/search?';
     var query = 'format=json&q=' + input;
     var requestString = endpoint + query;
     return Cesium.loadJson(requestString)

CHANGES.md

@@ -4,6 +4,7 @@ Change Log
 
 * Added function that inserts missing namespace declarations into KML files. [#5860](https://github.com/AnalyticalGraphicsInc/cesium/pull/5860)
 * Added support for the layer.json `parentUrl` property in `CesiumTerrainProvider` to allow for compositing of tilesets.
+* Fixed a bug that caused KML ground overlays to appear distorted when rotation was applied. [#5914](https://github.com/AnalyticalGraphicsInc/cesium/issues/5914)
 
 ### 1.38 - 2017-10-02
 

CONTRIBUTING.md

@@ -55,7 +55,7 @@ Before we can merge a pull request, we require a signed Contributor License Agre
 * [individuals](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt) and
 * [corporations](Documentation/Contributors/CLAs/corporate-cla-agi-v1.0.txt).
 
-This only needs to be completed once.  The CLA ensures you retain copyright to your contributions, and we have the right to use them and incorporate them into Cesium using the [Apache 2.0 License](LICENSE.md).
+This only needs to be completed once, and enables contributions to all of the projects under the [Analytical Graphics Inc](https://github.com/AnalyticalGraphicsInc) organization, including Cesium.  The CLA ensures you retain copyright to your contributions, and provides us the right to use, modify, and redistribute your contributions using the [Apache 2.0 License](LICENSE.md).
 
 Please email a completed CLA with all fields filled in to [cla@agi.com](mailto:cla@agi.com).  Related questions are also welcome.
 

CONTRIBUTORS.md

@@ -94,6 +94,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Florent Cayré](https://github.com/fcayre/)
 * [Novetta](http://www.novetta.com/)
    * [Natanael Rivera](https://github.com/nrivera-Novetta/)
+   * [Justin Burr](https://github.com/jburr-nc/)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
 * [Victor Berchet](https://github.com/vicb)

Source/DataSources/KmlDataSource.js

@@ -1869,7 +1869,9 @@ define([
 
                 var rotation = queryNumericValue(latLonBox, 'rotation', namespaces.kml);
                 if (defined(rotation)) {
-                    geometry.rotation = CesiumMath.toRadians(rotation);
+                    var rotationRadians = CesiumMath.toRadians(rotation);
+                    geometry.rotation = rotationRadians;
+                    geometry.stRotation = rotationRadians;
                 }
             }
         }

Source/DataSources/PolylineGraphics.js

@@ -30,6 +30,7 @@ define([
      * @param {Property} [options.width=1.0] A numeric Property specifying the width in pixels.
      * @param {Property} [options.show=true] A boolean Property specifying the visibility of the polyline.
      * @param {MaterialProperty} [options.material=Color.WHITE] A Property specifying the material used to draw the polyline.
+     * @param {MaterialProperty} [options.depthFailMaterial] A property specifiying the material to used to draw the polyline when it is below the terrain.
      * @param {Property} [options.granularity=Cesium.Math.RADIANS_PER_DEGREE] A numeric Property specifying the angular distance between each latitude and longitude if followSurface is true.
      * @param {Property} [options.shadows=ShadowMode.DISABLED] An enum Property specifying whether the polyline casts or receives shadows from each light source.
      * @param {Property} [options.distanceDisplayCondition] A Property specifying at what distance from the camera that this polyline will be displayed.
@@ -98,6 +99,7 @@ define([
          * Requires the EXT_frag_depth WebGL extension to render properly. If the extension is not supported,
          * there may be artifacts.
          * </p>
+         * @memberof PolylineGraphics.prototype
          * @type {MaterialProperty}
          * @default undefined
          */

Source/Scene/GroundPrimitive.js

@@ -597,7 +597,7 @@ define([
         var boundingVolumes;
         if (frameState.mode === SceneMode.SCENE3D) {
             boundingVolumes = groundPrimitive._boundingVolumes;
-        } else if (frameState.mode !== SceneMode.SCENE3D && defined(groundPrimitive._boundingVolumes2D)) {
+        } else {
             boundingVolumes = groundPrimitive._boundingVolumes2D;
         }
 

Source/Scene/Model.js

@@ -2306,16 +2306,16 @@ define([
                     sampler : sampler,
                     flipY : false
                 });
-            }
-            // GLTF_SPEC: Support TEXTURE_CUBE_MAP.  https://github.com/KhronosGroup/glTF/issues/40
-
-            if (mipmap) {
-                tx.generateMipmap();
+                // GLTF_SPEC: Support TEXTURE_CUBE_MAP.  https://github.com/KhronosGroup/glTF/issues/40
+                if (mipmap) {
+                    tx.generateMipmap();
+                }
             }
         }
-
-        model._rendererResources.textures[gltfTexture.id] = tx;
-        model._texturesByteLength += tx.sizeInBytes;
+        if (defined(tx)) {
+            model._rendererResources.textures[gltfTexture.id] = tx;
+            model._texturesByteLength += tx.sizeInBytes;
+        }
     }
 
     var scratchCreateTextureJob = new CreateTextureJob();

Source/Scene/PrimitivePipeline.js

@@ -272,19 +272,18 @@ define([
         var attributeLocations;
         var instances = parameters.instances;
         var length = instances.length;
+        var pickOffsets;
 
         if (length > 0) {
             geometries = geometryPipeline(parameters);
             if (geometries.length > 0) {
                 attributeLocations = GeometryPipeline.createAttributeLocations(geometries[0]);
+                if (parameters.createPickOffsets) {
+                    pickOffsets = createInstancePickOffsets(instances, geometries);
+                }
             }
         }
 
-        var pickOffsets;
-        if (parameters.createPickOffsets && geometries.length > 0) {
-            pickOffsets = createInstancePickOffsets(instances, geometries);
-        }
-
         var boundingSpheres = new Array(length);
         var boundingSpheresCV = new Array(length);
         for (var i = 0; i < length; ++i) {

Specs/DataSources/KmlDataSourceSpec.js

@@ -816,6 +816,7 @@ defineSuite([
             expect(entity.polygon).toBeUndefined();
             expect(entity.rectangle.coordinates.getValue()).toEqualEpsilon(Rectangle.fromDegrees(3, 1, 4, 2), CesiumMath.EPSILON14);
             expect(entity.rectangle.rotation.getValue()).toEqual(Math.PI / 4);
+            expect(entity.rectangle.stRotation.getValue()).toEqual(Math.PI / 4);
         });
     });