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.

Sign up for GitHub

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

Replaces DeveloperError(s) with Check(s) in Ellipsoid #5425

Merged
merged 5 commits into from
Jun 9, 2017
+17 −31
Merged

Replaces DeveloperError(s) with Check(s) in Ellipsoid #5425

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08e2702
Replaces DeveloperError(s) with Check(s) in Ellipsoid
AnimatedRNG Jun 5, 2017
a6d90ad
Fixes similar to the ones in Color
AnimatedRNG Jun 5, 2017
f32928f
Checks are now in debug areas; commented code removed
AnimatedRNG Jun 6, 2017
b572487
Deletes more commented code
AnimatedRNG Jun 7, 2017
b25fbc2
Cleans up remaining commented code and other fixes
AnimatedRNG Jun 9, 2017
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
48 changes: 17 additions & 31 deletions Source/Core/Ellipsoid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*global define*/
define([
'./Check',
'./Cartesian3',
'./Cartographic',
'./defaultValue',
Expand All @@ -10,6 +11,7 @@ define([
'./Math',
'./scaleToGeodeticSurface'
], function(
Check,
Cartesian3,
Cartographic,
defaultValue,
Expand All @@ -27,9 +29,9 @@ define([
z = defaultValue(z, 0.0);

//>>includeStart('debug', pragmas.debug);
if (x < 0.0 || y < 0.0 || z < 0.0) {
throw new DeveloperError('All radii components must be greater than or equal to zero.');
}
Check.typeOf.number.greaterThanOrEquals('x', x, 0.0);
Check.typeOf.number.greaterThanOrEquals('y', y, 0.0);
Check.typeOf.number.greaterThanOrEquals('z', z, 0.0);
//>>includeEnd('debug');

ellipsoid._radii = new Cartesian3(x, y, z);
Expand Down Expand Up @@ -283,12 +285,8 @@ define([
*/
Ellipsoid.pack = function(value, array, startingIndex) {
//>>includeStart('debug', pragmas.debug);
if (!defined(value)) {
throw new DeveloperError('value is required');
}
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.typeOf.object('value', value);
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand All @@ -308,9 +306,7 @@ define([
*/
Ellipsoid.unpack = function(array, startingIndex, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(array)) {
throw new DeveloperError('array is required');
}
Check.defined('array', array);
//>>includeEnd('debug');

startingIndex = defaultValue(startingIndex, 0);
Expand Down Expand Up @@ -338,9 +334,7 @@ define([
*/
Ellipsoid.prototype.geodeticSurfaceNormalCartographic = function(cartographic, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(cartographic)) {
throw new DeveloperError('cartographic is required.');
}
Check.typeOf.object('cartographic', cartographic);
//>>includeEnd('debug');

var longitude = cartographic.longitude;
Expand Down Expand Up @@ -422,10 +416,8 @@ define([
*/
Ellipsoid.prototype.cartographicArrayToCartesianArray = function(cartographics, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(cartographics)) {
throw new DeveloperError('cartographics is required.');
}
//>>includeEnd('debug');
Check.defined('cartographics', cartographics);
//>>includeEnd('debug')

var length = cartographics.length;
if (!defined(result)) {
Expand Down Expand Up @@ -496,9 +488,7 @@ define([
*/
Ellipsoid.prototype.cartesianArrayToCartographicArray = function(cartesians, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(cartesians)) {
throw new DeveloperError('cartesians is required.');
}
Check.defined('cartesians', cartesians);
//>>includeEnd('debug');

var length = cartesians.length;
Expand Down Expand Up @@ -536,9 +526,7 @@ define([
*/
Ellipsoid.prototype.scaleToGeocentricSurface = function(cartesian, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(cartesian)) {
throw new DeveloperError('cartesian is required.');
}
Check.typeOf.object('cartesian', cartesian);
//>>includeEnd('debug');

if (!defined(result)) {
Expand Down Expand Up @@ -633,15 +621,13 @@ define([
*/
Ellipsoid.prototype.getSurfaceNormalIntersectionWithZAxis = function(position, buffer, result) {
//>>includeStart('debug', pragmas.debug);
if (!defined(position)) {
throw new DeveloperError('position is required.');
}
Check.typeOf.object('position', position);

if (!CesiumMath.equalsEpsilon(this._radii.x, this._radii.y, CesiumMath.EPSILON15)) {
throw new DeveloperError('Ellipsoid must be an ellipsoid of revolution (radii.x == radii.y)');
}
if (this._radii.z === 0) {
throw new DeveloperError('Ellipsoid.radii.z must be greater than 0');
}

Check.typeOf.number.greaterThan('Ellipsoid.radii.z', this._radii.z, 0);
//>>includeEnd('debug');

buffer = defaultValue(buffer, 0.0);
Expand Down