diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 671dfd9642..8c3f672bb5 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -5,7 +5,7 @@ goog.require('goog.asserts'); goog.require('goog.object'); goog.require('ol.extent'); goog.require('ol.render'); -goog.require('ol.render.IReplayBatch'); +goog.require('ol.render.IRender'); goog.require('ol.render.IReplayBatchGroup'); goog.require('ol.style.fill'); goog.require('ol.style.stroke'); @@ -29,7 +29,7 @@ ol.render.canvas.Instruction = { /** * @constructor - * @implements {ol.render.IReplayBatch} + * @implements {ol.render.IRender} * @protected */ ol.render.canvas.Batch = function() { diff --git a/src/ol/render/irender.js b/src/ol/render/irender.js new file mode 100644 index 0000000000..88eae96ba6 --- /dev/null +++ b/src/ol/render/irender.js @@ -0,0 +1,73 @@ +goog.provide('ol.render.IRender'); + + + +/** + * @interface + */ +ol.render.IRender = function() { +}; + + +/** + * @param {ol.geom.Point} pointGeometry Point geometry. + */ +ol.render.IRender.prototype.drawPointGeometry = function(pointGeometry) { +}; + + +/** + * @param {ol.geom.LineString} lineStringGeometry Line string geometry. + */ +ol.render.IRender.prototype.drawLineStringGeometry = + function(lineStringGeometry) { +}; + + +/** + * @param {ol.geom.MultiLineString} multiLineStringGeometry + * Multi line string geometry. + */ +ol.render.IRender.prototype.drawMultiLineStringGeometry = + function(multiLineStringGeometry) { +}; + + +/** + * @param {ol.geom.MultiPoint} multiPointGeometry MultiPoint geometry. + */ +ol.render.IRender.prototype.drawMultiPointGeometry = + function(multiPointGeometry) { +}; + + +/** + * @param {ol.geom.MultiPolygon} multiPolygonGeometry Multi polygon geometry. + */ +ol.render.IRender.prototype.drawMultiPolygonGeometry = + function(multiPolygonGeometry) { +}; + + +/** + * @param {ol.geom.Polygon} polygonGeometry Polygon geometry. + */ +ol.render.IRender.prototype.drawPolygonGeometry = + function(polygonGeometry) { +}; + + +/** + * @param {?ol.style.Fill} fillStyle Fill style. + * @param {?ol.style.Stroke} strokeStyle Stroke style. + */ +ol.render.IRender.prototype.setFillStrokeStyle = + function(fillStyle, strokeStyle) { +}; + + +/** + * @param {?ol.style.Image} imageStyle Image style. + */ +ol.render.IRender.prototype.setImageStyle = function(imageStyle) { +}; diff --git a/src/ol/render/ireplay.js b/src/ol/render/ireplay.js index a16d12a3f8..723ae309b2 100644 --- a/src/ol/render/ireplay.js +++ b/src/ol/render/ireplay.js @@ -1,7 +1,7 @@ -goog.provide('ol.render.IReplayBatch'); goog.provide('ol.render.IReplayBatchGroup'); goog.require('goog.functions'); +goog.require('ol.render.IRender'); /** @@ -15,78 +15,6 @@ ol.render.BatchType = { -/** - * @interface - */ -ol.render.IReplayBatch = function() { -}; - - -/** - * @param {ol.geom.Point} pointGeometry Point geometry. - */ -ol.render.IReplayBatch.prototype.drawPointGeometry = function(pointGeometry) { -}; - - -/** - * @param {ol.geom.LineString} lineStringGeometry Line string geometry. - */ -ol.render.IReplayBatch.prototype.drawLineStringGeometry = - function(lineStringGeometry) { -}; - - -/** - * @param {ol.geom.MultiLineString} multiLineStringGeometry - * Multi line string geometry. - */ -ol.render.IReplayBatch.prototype.drawMultiLineStringGeometry = - function(multiLineStringGeometry) { -}; - - -/** - * @param {ol.geom.MultiPoint} multiPointGeometry MultiPoint geometry. - */ -ol.render.IReplayBatch.prototype.drawMultiPointGeometry = - function(multiPointGeometry) { -}; - - -/** - * @param {ol.geom.MultiPolygon} multiPolygonGeometry Multi polygon geometry. - */ -ol.render.IReplayBatch.prototype.drawMultiPolygonGeometry = - function(multiPolygonGeometry) { -}; - - -/** - * @param {ol.geom.Polygon} polygonGeometry Polygon geometry. - */ -ol.render.IReplayBatch.prototype.drawPolygonGeometry = - function(polygonGeometry) { -}; - - -/** - * @param {?ol.style.Fill} fillStyle Fill style. - * @param {?ol.style.Stroke} strokeStyle Stroke style. - */ -ol.render.IReplayBatch.prototype.setFillStrokeStyle = - function(fillStyle, strokeStyle) { -}; - - -/** - * @param {?ol.style.Image} imageStyle Image style. - */ -ol.render.IReplayBatch.prototype.setImageStyle = function(imageStyle) { -}; - - - /** * @interface */ @@ -104,7 +32,7 @@ ol.render.IReplayBatchGroup.prototype.finish = function() { /** * @param {number|undefined} zIndex Z index. * @param {ol.render.BatchType} batchType Batch type. - * @return {ol.render.IReplayBatch} Batch. + * @return {ol.render.IRender} Batch. */ ol.render.IReplayBatchGroup.prototype.getBatch = function(zIndex, batchType) { };