Pass context instead of canvas when creating ol.renderer.canvas.Vector

This commit is contained in:
Tom Payne
2013-11-04 15:41:17 +01:00
parent 0d84befe83
commit e0ef5fc7ee
3 changed files with 8 additions and 6 deletions

View File

@@ -456,8 +456,10 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
sketchCanvas.width = sketchWidth; sketchCanvas.width = sketchWidth;
sketchCanvas.height = sketchHeight; sketchCanvas.height = sketchHeight;
var sketchContext = /** @type {CanvasRenderingContext2D} */
(sketchCanvas.getContext('2d'));
var sketchCanvasRenderer = new ol.renderer.canvas.Vector( var sketchCanvasRenderer = new ol.renderer.canvas.Vector(
sketchCanvas, sketchTransform, this.requestMapRenderFrame_); sketchContext, sketchTransform, this.requestMapRenderFrame_);
// clear/resize final canvas // clear/resize final canvas
var finalCanvas = this.canvas_; var finalCanvas = this.canvas_;

View File

@@ -150,7 +150,9 @@ ol.renderer.canvas.VectorLayer2.prototype.prepareFrame =
-(origin[0] + halfWidth * viewResolution), -(origin[0] + halfWidth * viewResolution),
-(origin[1] - halfHeight * viewResolution), -(origin[1] - halfHeight * viewResolution),
0); 0);
var renderer = new ol.renderer.canvas.Vector(canvas, coordsTransform, var context = /** @type {CanvasRenderingContext2D} */
(canvas.getContext('2d'));
var renderer = new ol.renderer.canvas.Vector(context, coordsTransform,
this.requestMapRenderFrame_); this.requestMapRenderFrame_);
var groups = vectorLayer.groupFeaturesBySymbolizerLiteral(features, var groups = vectorLayer.groupFeaturesBySymbolizerLiteral(features,

View File

@@ -31,16 +31,14 @@ goog.require('ol.style.TextLiteral');
/** /**
* @constructor * @constructor
* @param {HTMLCanvasElement} canvas Target canvas. * @param {CanvasRenderingContext2D} context Context.
* @param {goog.vec.Mat4.Number} transform Transform. * @param {goog.vec.Mat4.Number} transform Transform.
* @param {function()=} opt_iconLoadedCallback Callback for deferred rendering * @param {function()=} opt_iconLoadedCallback Callback for deferred rendering
* when images need to be loaded before rendering. * when images need to be loaded before rendering.
*/ */
ol.renderer.canvas.Vector = ol.renderer.canvas.Vector =
function(canvas, transform, opt_iconLoadedCallback) { function(context, transform, opt_iconLoadedCallback) {
var context = /** @type {CanvasRenderingContext2D} */
(canvas.getContext('2d'));
/** /**
* @type {goog.vec.Mat4.Number} * @type {goog.vec.Mat4.Number}
* @private * @private