Rename batch to replay

This commit is contained in:
Tom Payne
2013-11-10 22:54:16 +01:00
parent df70731e0c
commit a0aad87adf
4 changed files with 140 additions and 136 deletions

View File

@@ -7,140 +7,141 @@ goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.render.IReplayBatchGroup');
goog.require('ol.render.IReplayReplayGroup');
goog.require('ol.style.Style');
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.Feature} feature Feature.
* @param {ol.style.Style} style Style.
*/
ol.renderer.vector.renderFeature = function(batchGroup, feature, style) {
ol.renderer.vector.renderFeature = function(replayGroup, feature, style) {
var geometry = feature.getGeometry();
var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[geometry.getType()];
goog.asserts.assert(goog.isDef(geometryRenderer));
geometryRenderer(batchGroup, geometry, style);
geometryRenderer(replayGroup, geometry, style);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderLineStringGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.stroke)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.LineString);
var lineStringGeometry = /** @type {ol.geom.LineString} */ (geometry);
var batch = batchGroup.getBatch(
style.zIndex, ol.render.BatchType.LINE_STRING);
batch.setFillStrokeStyle(null, style.stroke);
batch.drawLineStringGeometry(lineStringGeometry);
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, style.stroke);
replay.drawLineStringGeometry(lineStringGeometry);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderMultiLineStringGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.stroke)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.MultiLineString);
var multiLineStringGeometry = /** @type {ol.geom.MultiLineString} */
(geometry);
var batch = batchGroup.getBatch(
style.zIndex, ol.render.BatchType.LINE_STRING);
batch.setFillStrokeStyle(null, style.stroke);
batch.drawMultiLineStringGeometry(multiLineStringGeometry);
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, style.stroke);
replay.drawMultiLineStringGeometry(multiLineStringGeometry);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderMultiPolygonGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.stroke) && goog.isNull(style.fill)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.MultiPolygon);
var multiPolygonGeometry = /** @type {ol.geom.MultiPolygon} */
(geometry);
var batch = batchGroup.getBatch(
style.zIndex, ol.render.BatchType.POLYGON);
batch.setFillStrokeStyle(style.fill, style.stroke);
batch.drawMultiPolygonGeometry(multiPolygonGeometry);
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(style.fill, style.stroke);
replay.drawMultiPolygonGeometry(multiPolygonGeometry);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderPointGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.image)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.Point);
var pointGeometry = /** @type {ol.geom.Point} */ (geometry);
var batch = batchGroup.getBatch(style.zIndex, ol.render.BatchType.IMAGE);
batch.setImageStyle(style.image);
batch.drawPointGeometry(pointGeometry);
var replay = replayGroup.getReplay(style.zIndex, ol.render.ReplayType.IMAGE);
replay.setImageStyle(style.image);
replay.drawPointGeometry(pointGeometry);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderMultiPointGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.image)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.MultiPoint);
var multiPointGeometry = /** @type {ol.geom.MultiPoint} */ (geometry);
var batch = batchGroup.getBatch(style.zIndex, ol.render.BatchType.IMAGE);
batch.setImageStyle(style.image);
batch.drawMultiPointGeometry(multiPointGeometry);
var replay = replayGroup.getReplay(style.zIndex, ol.render.ReplayType.IMAGE);
replay.setImageStyle(style.image);
replay.drawMultiPointGeometry(multiPointGeometry);
};
/**
* @param {ol.render.IReplayBatchGroup} batchGroup Batch group.
* @param {ol.render.IReplayReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @private
*/
ol.renderer.vector.renderPolygonGeometry_ =
function(batchGroup, geometry, style) {
function(replayGroup, geometry, style) {
if (goog.isNull(style.fill) && goog.isNull(style.stroke)) {
return;
}
goog.asserts.assert(geometry instanceof ol.geom.Polygon);
var polygonGeometry = /** @type {ol.geom.Polygon} */ (geometry);
var batch = batchGroup.getBatch(style.zIndex, ol.render.BatchType.POLYGON);
batch.setFillStrokeStyle(style.fill, style.stroke);
batch.drawPolygonGeometry(polygonGeometry);
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(style.fill, style.stroke);
replay.drawPolygonGeometry(polygonGeometry);
};
@@ -148,7 +149,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
* @const
* @private
* @type {Object.<ol.geom.GeometryType,
* function(ol.render.IReplayBatchGroup, ol.geom.Geometry,
* function(ol.render.IReplayReplayGroup, ol.geom.Geometry,
* ol.style.Style)>}
*/
ol.renderer.vector.GEOMETRY_RENDERERS_ = {