(x - 1) * -1 == 1 - x

This commit is contained in:
Tim Schaub
2014-10-12 18:21:27 -06:00
parent dc0ff2eee8
commit 164407bc83
+9 -12
View File
@@ -236,34 +236,31 @@ ol.control.ZoomSlider.prototype.amountDragged_ = function(x, y) {
/** /**
* Calculates the corresponding resolution of the thumb by the amount it has * Calculates the corresponding resolution of the thumb given its relative
* been dragged from its minimum. * position (where 0 is the minimum and 1 is the maximum).
* *
* @param {number} amount The amount the thumb has been dragged. * @param {number} amount The amount the thumb has been dragged.
* @return {number} The corresponding resolution. * @return {number} The corresponding resolution.
* @private * @private
*/ */
ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) { ol.control.ZoomSlider.prototype.resolutionForAmount_ = function(amount) {
// FIXME do we really need this affine transform?
amount = (goog.math.clamp(amount, 0, 1) - 1) * -1;
var fn = this.getMap().getView().getResolutionForValueFunction(); var fn = this.getMap().getView().getResolutionForValueFunction();
return fn(amount); return fn(1 - goog.math.clamp(amount, 0, 1));
}; };
/** /**
* Determines an amount of dragging relative to this minimum position by the * Determines the relative position of the slider for the given resolution. A
* given resolution. * relative position of 0 corresponds to the minimum view resolution. A
* relative position of 1 corresponds to the maximum view resolution.
* *
* @param {number} res The resolution to get the amount for. * @param {number} res The resolution.
* @return {number} The corresponding value (between 0 and 1). * @return {number} The relative position value (between 0 and 1).
* @private * @private
*/ */
ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) { ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
var fn = this.getMap().getView().getValueForResolutionFunction(); var fn = this.getMap().getView().getValueForResolutionFunction();
var value = fn(res); return 1 - fn(res);
// FIXME do we really need this affine transform?
return (value - 1) * -1;
}; };