Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cesium to 1.17 #313

Merged
merged 5 commits into from
Jan 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

## v1.12

* Breaking changes
* Remove dragbox functionality due to the removal of the Cesium.RectanglePrimitive
by upstream. See the commit message for hints about how to reimplement it.
* Remove Cesium.RectanglePrimitive, Cesium.PerspectiveFrustrum.getPixelSize,
Cesium.OpenStreetMapImageryProvider from Cesium externs.
* Changes
* Port to OL 3.13.0.
* Port to Cesium 1.17.

## v1.11 - 2015-12-23

Expand Down
58 changes: 5 additions & 53 deletions Cesium.externs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2081,33 +2081,6 @@ Cesium.Rectangle.fromDegrees = function(west, south, east, north, opt_result) {}
Cesium.Rectangle.fromCartographicArray = function(cartographics, opt_result) {};


/**
* @typedef {{asynchronous: (boolean|undefined),
* height: (number|undefined),
* rectangle: (Cesium.Rectangle|undefined),
* material: (Cesium.Material|undefined)}}
*/
Cesium.RectanglePrimitiveOptions;

/**
* @constructor
* @param {Cesium.RectanglePrimitiveOptions} options .
* @extends {Cesium.Primitive}
*/
Cesium.RectanglePrimitive = function(options) {};


/**
* @type {!Cesium.Material} material .
*/
Cesium.RectanglePrimitive.prototype.material;

/**
* @type {!Cesium.Rectangle} rectangle .
*/
Cesium.RectanglePrimitive.prototype.rectangle;


/**
* @constructor
*/
Expand Down Expand Up @@ -2346,12 +2319,13 @@ Cesium.PerspectiveFrustrum.prototype.projectionMatrix;


/**
* @param {!Cesium.Cartesian2} canvasDim .
* @param {number=} opt_dist .
* @param {!number} drawingBufferWidth
* @param {!number} drawingBufferHeight
* @param {!number} dist
* @param {!Cesium.Cartesian2} result
* @return {!Cesium.Cartesian2}
*/
Cesium.PerspectiveFrustrum.prototype.getPixelSize = function(canvasDim, opt_dist) {};

Cesium.PerspectiveFrustrum.prototype.getPixelDimensions = function(drawingBufferWidth, drawingBufferHeight, dist, result) {};


/**
Expand Down Expand Up @@ -3134,28 +3108,6 @@ Cesium.UrlTemplateImageryProvider = function(options) {};
Cesium.UrlTemplateImageryProviderOptions;



/**
* @typedef {{
* url: (string|undefined),
* fileExtension: (string|undefined),
* proxy: (Object|undefined),
* rectangle: (Cesium.Rectangle|undefined),
* minimumLevel: (number|undefined),
* maximumLevel: (number|undefined),
* credit: (Cesium.Credit|string|undefined)
* }}
*/
Cesium.OpenStreetMapImageryProviderOptions;

/**
* @constructor
* @param {Cesium.OpenStreetMapImageryProviderOptions=} opt_opts
* @extends {Cesium.ImageryProvider}
*/
Cesium.OpenStreetMapImageryProvider = function(opt_opts) {};


/**
* @typedef {{
* url: string,
Expand Down
2 changes: 1 addition & 1 deletion cesium
19 changes: 0 additions & 19 deletions examples/dragbox.html

This file was deleted.

32 changes: 0 additions & 32 deletions examples/dragbox.js

This file was deleted.

7 changes: 3 additions & 4 deletions src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ olcs.core.computePixelSizeAtCoordinate = function(scene, target) {
var camera = scene.camera;
var canvas = scene.canvas;
var frustum = camera.frustum;
var canvasDimensions = new Cesium.Cartesian2(
canvas.clientWidth, canvas.clientHeight);
var distance = Cesium.Cartesian3.magnitude(Cesium.Cartesian3.subtract(
camera.position, target, new Cesium.Cartesian3()));
var pixelSize = frustum.getPixelSize(canvasDimensions, distance);
return pixelSize;
var pixelSize = new Cesium.Cartesian2();
return frustum.getPixelDimensions(canvas.clientWidth, canvas.clientHeight,
distance, pixelSize);
};


Expand Down
222 changes: 0 additions & 222 deletions src/dragbox.js

This file was deleted.