diff --git a/src/ol/color/color.js b/src/ol/color/color.js index 55bfe3f30d..765cc22614 100644 --- a/src/ol/color/color.js +++ b/src/ol/color/color.js @@ -318,7 +318,7 @@ ol.color.toString = function(color) { /** * @param {ol.Color} color Color. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {ol.Color=} opt_color Color. * @return {ol.Color} Transformed color. */ diff --git a/src/ol/geom/flatgeom.js b/src/ol/geom/flatgeom.js index fdc9f8f24b..14f129081f 100644 --- a/src/ol/geom/flatgeom.js +++ b/src/ol/geom/flatgeom.js @@ -736,7 +736,7 @@ ol.geom.flat.squaredDistance = function(x1, y1, x2, y2) { /** * @param {Array.} flatCoordinates Flat coordinates. * @param {number} stride Stride. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed coordinates. */ diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 29a92f6b97..2f24d9d28f 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -230,7 +230,7 @@ ol.geom.SimpleGeometry.prototype.transform = function(transformFn) { /** * @param {ol.geom.SimpleGeometry} simpleGeometry Simple geometry. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed flat coordinates. */ diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index d3c96591bf..7576e1d6ca 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -21,7 +21,7 @@ goog.require('ol.vec.Mat4'); * @param {CanvasRenderingContext2D} context Context. * @param {number} pixelRatio Pixel ratio. * @param {ol.Extent} extent Extent. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @struct */ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) { @@ -46,7 +46,7 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) { /** * @private - * @type {goog.vec.Mat4.AnyType} + * @type {goog.vec.Mat4.Number} */ this.transform_ = transform; diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 9b69bb1c55..81fe9ede56 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -160,7 +160,7 @@ ol.render.canvas.Replay.prototype.beginGeometry = function(geometry) { /** * @private * @param {CanvasRenderingContext2D} context Context. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @param {Array.<*>} instructions Instructions array. @@ -305,7 +305,7 @@ ol.render.canvas.Replay.prototype.replay_ = /** * @param {CanvasRenderingContext2D} context Context. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @return {T|undefined} Callback result. @@ -321,7 +321,7 @@ ol.render.canvas.Replay.prototype.replay = /** * @param {CanvasRenderingContext2D} context Context. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @param {function(ol.geom.Geometry, Object): T=} opt_geometryCallback @@ -1231,7 +1231,7 @@ ol.render.canvas.ReplayGroup = function(pixelRatio, tolerance) { /** * @param {CanvasRenderingContext2D} context Context. * @param {ol.Extent} extent Extent. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @return {T|undefined} Callback result. @@ -1252,7 +1252,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(context, extent, * @param {Array.} zs Z-indices array. * @param {CanvasRenderingContext2D} context Context. * @param {ol.Extent} extent Extent. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @param {function(ol.geom.Geometry, Object): T} geometryCallback Geometry @@ -1286,7 +1286,7 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = * @param {Array.} zs Z-indices array. * @param {CanvasRenderingContext2D} context Context. * @param {ol.Extent} extent Extent. - * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {goog.vec.Mat4.Number} transform Transform. * @param {function(ol.geom.Geometry): boolean} renderGeometryFunction Render * geometry function. * @return {T|undefined} Callback result. diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index f3a0366338..e590979ff0 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -76,7 +76,7 @@ ol.renderer.canvas.Layer.prototype.composeFrame = * @param {ol.render.EventType} type Event type. * @param {CanvasRenderingContext2D} context Context. * @param {ol.FrameState} frameState Frame state. - * @param {goog.vec.Mat4.AnyType=} opt_transform Transform. + * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @private */ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ = @@ -97,7 +97,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ = /** * @param {CanvasRenderingContext2D} context Context. * @param {ol.FrameState} frameState Frame state. - * @param {goog.vec.Mat4.AnyType=} opt_transform Transform. + * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @protected */ ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent = @@ -110,7 +110,7 @@ ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent = /** * @param {CanvasRenderingContext2D} context Context. * @param {ol.FrameState} frameState Frame state. - * @param {goog.vec.Mat4.AnyType=} opt_transform Transform. + * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @protected */ ol.renderer.canvas.Layer.prototype.dispatchPreComposeEvent = diff --git a/src/ol/vec/mat4.js b/src/ol/vec/mat4.js index 0f024243c4..54e7df7e71 100644 --- a/src/ol/vec/mat4.js +++ b/src/ol/vec/mat4.js @@ -35,8 +35,8 @@ ol.vec.Mat4.makeTransform2D = function(mat, translateX1, translateY1, /** * Returns true if mat1 and mat2 represent the same 2D transformation. - * @param {goog.vec.Mat4.AnyType} mat1 Matrix 1. - * @param {goog.vec.Mat4.AnyType} mat2 Matrix 2. + * @param {goog.vec.Mat4.Number} mat1 Matrix 1. + * @param {goog.vec.Mat4.Number} mat2 Matrix 2. * @return {boolean} Equal 2D. */ ol.vec.Mat4.equals2D = function(mat1, mat2) {