ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefer if/else to switch

Browse Source
This commit is contained in:
Tim Schaub
2013-06-26 17:01:27 -06:00
parent 4e5ef05e5e
commit 71153d26d1
1 changed files with 33 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/expr/expressions.js
+18 -32
View File
@@ -175,38 +175,29 @@ ol.expr.Comparison.isValidOp = (function() {
/** /**
* @inheritDoc * @inheritDoc
*/ */
ol.expr.Comparison.prototype.evaluate = function(opt_scope, opt_fns, ol.expr.Comparison.prototype.evaluate = function(opt_scope, opt_fns, opt_this) {
opt_this) {
var result; var result;
var rightVal = this.right_.evaluate(opt_scope, opt_fns, opt_this); var rightVal = this.right_.evaluate(opt_scope, opt_fns, opt_this);
var leftVal = this.left_.evaluate(opt_scope, opt_fns, opt_this); var leftVal = this.left_.evaluate(opt_scope, opt_fns, opt_this);
switch (this.operator_) { var op = this.operator_;
case ol.expr.ComparisonOp.EQ: if (op === ol.expr.ComparisonOp.EQ) {
result = leftVal == rightVal; result = leftVal == rightVal;
break; } else if (op === ol.expr.ComparisonOp.NEQ) {
case ol.expr.ComparisonOp.NEQ:
result = leftVal != rightVal; result = leftVal != rightVal;
break; } else if (op === ol.expr.ComparisonOp.STRICT_EQ) {
case ol.expr.ComparisonOp.STRICT_EQ:
result = leftVal === rightVal; result = leftVal === rightVal;
break; } else if (op === ol.expr.ComparisonOp.STRICT_NEQ) {
case ol.expr.ComparisonOp.STRICT_NEQ:
result = leftVal !== rightVal; result = leftVal !== rightVal;
break; } else if (op === ol.expr.ComparisonOp.GT) {
case ol.expr.ComparisonOp.GT:
result = leftVal > rightVal; result = leftVal > rightVal;
break; } else if (op === ol.expr.ComparisonOp.LT) {
case ol.expr.ComparisonOp.LT:
result = leftVal < rightVal; result = leftVal < rightVal;
break; } else if (op === ol.expr.ComparisonOp.GTE) {
case ol.expr.ComparisonOp.GTE:
result = leftVal >= rightVal; result = leftVal >= rightVal;
break; } else if (op === ol.expr.ComparisonOp.LTE) {
case ol.expr.ComparisonOp.LTE:
result = leftVal <= rightVal; result = leftVal <= rightVal;
break; } else {
default:
throw new Error('Unsupported comparison operator: ' + this.operator_); throw new Error('Unsupported comparison operator: ' + this.operator_);
} }
return result; return result;
@@ -498,23 +489,18 @@ ol.expr.Math.prototype.evaluate = function(opt_scope, opt_fns, opt_this) {
* math functions where available elsewhere * math functions where available elsewhere
*/ */
switch (this.operator_) { var op = this.operator_;
case ol.expr.MathOp.ADD: if (op === ol.expr.MathOp.ADD) {
result = leftVal + rightVal; result = leftVal + rightVal;
break; } else if (op === ol.expr.MathOp.SUBTRACT) {
case ol.expr.MathOp.SUBTRACT:
result = Number(leftVal) - Number(rightVal); result = Number(leftVal) - Number(rightVal);
break; } else if (op === ol.expr.MathOp.MULTIPLY) {
case ol.expr.MathOp.MULTIPLY:
result = Number(leftVal) * Number(rightVal); result = Number(leftVal) * Number(rightVal);
break; } else if (op === ol.expr.MathOp.DIVIDE) {
case ol.expr.MathOp.DIVIDE:
result = Number(leftVal) / Number(rightVal); result = Number(leftVal) / Number(rightVal);
break; } else if (op === ol.expr.MathOp.MOD) {
case ol.expr.MathOp.MOD:
result = Number(leftVal) % Number(rightVal); result = Number(leftVal) % Number(rightVal);
break; } else {
default:
throw new Error('Unsupported math operator: ' + this.operator_); throw new Error('Unsupported math operator: ' + this.operator_);
} }
return result; return result;