Merge pull request #1026 from TerriaJS/upgradeCesium

Update to terriajs-cesium 1.15.1.
TerriaJS · Nov 5, 2015 · 2ea0ff1 · 2ea0ff1
2 parents d3a47a1 + b9efe40
commit 2ea0ff1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,11 @@ Change Log
 ### 1.0.47
 
 * The `name` of a feature from a CSV file is now taken from a `name` or `title` column, if it exists.  Previously the name was always "Site Data".
+* Updated to [Cesium](http://cesiumjs.org) 1.15.  Significant changes relevant to TerriaJS users include:
+  * Added support for the [glTF 1.0](https://github.com/KhronosGroup/glTF/blob/master/specification/README.md) draft specification.
+  * Added support for the glTF extensions [KHR_binary_glTF](https://github.com/KhronosGroup/glTF/tree/master/extensions/Khronos/KHR_binary_glTF) and [KHR_materials_common](https://github.com/KhronosGroup/glTF/tree/KHR_materials_common/extensions/Khronos/KHR_materials_common).
+  * `ImageryLayerFeatureInfo` now has an `imageryLayer` property, indicating the layer that contains the feature.
+  * Make KML invalid coordinate processing match Google Earth behavior. [#3124](https://github.com/AnalyticalGraphicsInc/cesium/pull/3124)
 
 ### 1.0.46
 
@@ -40,6 +45,12 @@ Change Log
 * Added `WfsFeaturesCatalogGroup`.  This group is populated with a catalog item for each feature queried from a WFS server.
 * The Feature Info panel now shows all selected features in an accordion control.  Previously it only showed the first one.
 * Added `featureInfoTemplate` property to `CatalogItem`.  It is used to provide a custom Markdown or HTML template to display when a feature in the catalog item is clicked.  The template is parameterized on the properties of the feature.
+* Updated to [Cesium](http://cesiumjs.org) 1.14.  Significant changes relevant to TerriaJS users include:
+  * Fixed issues causing the terrain and sky to disappear when the camera is near the surface. [#2415](https://github.com/AnalyticalGraphicsInc/cesium/issues/2415) and [#2271](https://github.com/AnalyticalGraphicsInc/cesium/issues/2271)
+  * Fixed issues causing the terrain and sky to disappear when the camera is near the surface. [#2415](https://github.com/AnalyticalGraphicsInc/cesium/issues/2415) and [#2271](https://github.com/AnalyticalGraphicsInc/cesium/issues/2271)
+  * Provided a workaround for Safari 9 where WebGL constants can't be accessed through `WebGLRenderingContext`. Now constants are hard-coded in `WebGLConstants`. [#2989](https://github.com/AnalyticalGraphicsInc/cesium/issues/2989)
+  * Added a workaround for Chrome 45, where the first character in a label with a small font size would not appear. [#3011](https://github.com/AnalyticalGraphicsInc/cesium/pull/3011)
+  * Fixed an issue with drill picking at low frame rates that would cause a crash. [#3010](https://github.com/AnalyticalGraphicsInc/cesium/pull/3010)
 
 ### 1.0.44
 

diff --git a/lib/ViewModels/BingMapsSearchProviderViewModel.js b/lib/ViewModels/BingMapsSearchProviderViewModel.js
@@ -10,15 +10,15 @@ var CesiumMath = require('terriajs-cesium/Source/Core/Math');
 var defaultValue = require('terriajs-cesium/Source/Core/defaultValue');
 var defined = require('terriajs-cesium/Source/Core/defined');
 var Ellipsoid = require('terriajs-cesium/Source/Core/Ellipsoid');
-var jsonp = require('terriajs-cesium/Source/Core/jsonp');
+var loadJsonp = require('terriajs-cesium/Source/Core/loadJsonp');
 var Rectangle = require('terriajs-cesium/Source/Core/Rectangle');
 
 var BingMapsSearchProviderViewModel = function(options) {
     SearchProviderViewModel.call(this);
 
     options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
-     this.terria = options.terria;
+    this.terria = options.terria;
     this._geocodeInProgress = undefined;
 
     this.name = 'Locations';
@@ -68,7 +68,7 @@ BingMapsSearchProviderViewModel.prototype.search = function(searchText) {
         latitudeDegrees = center.lat;
     }
 
-    var promise = jsonp(this.url + 'REST/v1/Locations?culture=' + this.culture + '&userLocation=' + latitudeDegrees + ',' + longitudeDegrees , {
+    var promise = loadJsonp(this.url + 'REST/v1/Locations?culture=' + this.culture + '&userLocation=' + latitudeDegrees + ',' + longitudeDegrees , {
         parameters : {
             query : searchText,
             key : this.key

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "proj4": "^2.3.6",
     "resolve": "^1.1.6",
     "sanitize-caja": "^0.1.3",
-    "terriajs-cesium": "1.14.1",
+    "terriajs-cesium": "1.15.1",
     "togeojson": "^0.9.0",
     "hammerjs": "^2.0.4"
   },