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

Ensure functions are always called with the same number of args

Browse Source
This commit is contained in:
Andreas Hocevar
2015-04-21 08:21:31 +02:00
parent 8fd4e2c7c5
commit 4f8dca92ba
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

@@ -127,7 +127,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
var layer = this.getLayer();
if (layer.hasListener(type)) {
var transform = goog.isDef(opt_transform) ?
opt_transform : this.getTransform(frameState);
opt_transform : this.getTransform(frameState, 0);
var render = new ol.render.canvas.Immediate(
context, frameState.pixelRatio, frameState.extent, transform,
frameState.viewState.rotation);
@@ -192,15 +192,14 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod;
/**
* @param {olx.FrameState} frameState Frame state.
* @param {number=} opt_offsetX Offset on the x-axis in view coordinates.
* @param {number} offsetX Offset on the x-axis in view coordinates.
* @protected
* @return {!goog.vec.Mat4.Number} Transform.
*/
ol.renderer.canvas.Layer.prototype.getTransform =
function(frameState, opt_offsetX) {
function(frameState, offsetX) {
var viewState = frameState.viewState;
var pixelRatio = frameState.pixelRatio;
var offsetX = goog.isDef(opt_offsetX) ? opt_offsetX : 0;
return ol.vec.Mat4.makeTransform2D(this.transform_,
pixelRatio * frameState.size[0] / 2,
pixelRatio * frameState.size[1] / 2,