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

The iRender draw functions are passed a data object

Browse Source
This commit is contained in:
Éric Lemoine
2013-12-02 12:43:58 +01:00
parent 2c40daea22
commit e358321b92
6 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dynamic-data.js
View File

@@ -45,7 +45,7 @@ map.on('postcompose', function(event) {
coordinates.push([x, y]);
}
render.setImageStyle(imageStyle);
render.drawMultiPointGeometry(new ol.geom.MultiPoint(coordinates));
render.drawMultiPointGeometry(new ol.geom.MultiPoint(coordinates), null);
map.requestRenderFrame();
});
map.requestRenderFrame();

17
src/ol/render/canvas/canvasimmediate.js
View File

@@ -215,7 +215,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
var renderGeometry =
ol.render.canvas.Immediate.GEOMETRY_RENDERES_[geometry.getType()];
goog.asserts.assert(goog.isDef(renderGeometry));
renderGeometry.call(this, geometry);
renderGeometry.call(this, geometry, null);
};
@@ -223,7 +223,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawPointGeometry =
function(pointGeometry) {
function(pointGeometry, data) {
this.drawImages_(pointGeometry);
this.drawText_(pointGeometry);
};
@@ -233,7 +233,7 @@ ol.render.canvas.Immediate.prototype.drawPointGeometry =
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawMultiPointGeometry =
function(multiPointGeometry) {
function(multiPointGeometry, data) {
this.drawImages_(multiPointGeometry);
this.drawText_(multiPointGeometry);
};
@@ -243,7 +243,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPointGeometry =
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawLineStringGeometry =
function(lineStringGeometry) {
function(lineStringGeometry, data) {
if (!ol.extent.intersects(this.extent_, lineStringGeometry.getExtent()) ||
!goog.isDef(this.state_.strokeStyle)) {
return;
@@ -262,7 +262,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry =
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry =
function(multiLineStringGeometry) {
function(multiLineStringGeometry, data) {
var geometryExtent = multiLineStringGeometry.getExtent();
if (!ol.extent.intersects(this.extent_, geometryExtent) ||
!goog.isDef(this.state_.strokeStyle)) {
@@ -287,7 +287,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry =
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawPolygonGeometry =
function(polygonGeometry) {
function(polygonGeometry, data) {
if (!ol.extent.intersects(this.extent_, polygonGeometry.getExtent())) {
return;
}
@@ -316,7 +316,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry =
* @inheritDoc
*/
ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry =
function(multiPolygonGeometry) {
function(multiPolygonGeometry, data) {
if (!ol.extent.intersects(this.extent_, multiPolygonGeometry.getExtent())) {
return;
}
@@ -467,7 +467,8 @@ ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) {
* @const
* @private
* @type {Object.<ol.geom.Type,
* function(this: ol.render.canvas.Immediate, ol.geom.Geometry)>}
* function(this: ol.render.canvas.Immediate, ol.geom.Geometry,
* Object)>}
*/
ol.render.canvas.Immediate.GEOMETRY_RENDERES_ = {
'Point': ol.render.canvas.Immediate.prototype.drawPointGeometry,

12
src/ol/render/canvas/canvasreplay.js
View File

@@ -372,7 +372,7 @@ ol.render.canvas.ImageReplay.prototype.drawCoordinates_ =
* @inheritDoc
*/
ol.render.canvas.ImageReplay.prototype.drawPointGeometry =
function(pointGeometry) {
function(pointGeometry, data) {
if (goog.isNull(this.image_)) {
return;
}
@@ -399,7 +399,7 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry =
* @inheritDoc
*/
ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry =
function(multiPointGeometry) {
function(multiPointGeometry, data) {
if (goog.isNull(this.image_)) {
return;
}
@@ -561,7 +561,7 @@ ol.render.canvas.LineStringReplay.prototype.setStrokeStyle_ = function() {
* @inheritDoc
*/
ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry =
function(lineStringGeometry) {
function(lineStringGeometry, data) {
var state = this.state_;
goog.asserts.assert(!goog.isNull(state));
var strokeStyle = state.strokeStyle;
@@ -584,7 +584,7 @@ ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry =
* @inheritDoc
*/
ol.render.canvas.LineStringReplay.prototype.drawMultiLineStringGeometry =
function(multiLineStringGeometry) {
function(multiLineStringGeometry, data) {
var state = this.state_;
goog.asserts.assert(!goog.isNull(state));
var strokeStyle = state.strokeStyle;
@@ -731,7 +731,7 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ =
* @inheritDoc
*/
ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry =
function(polygonGeometry) {
function(polygonGeometry, data) {
var state = this.state_;
goog.asserts.assert(!goog.isNull(state));
var fillStyle = state.fillStyle;
@@ -757,7 +757,7 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry =
* @inheritDoc
*/
ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry =
function(multiPolygonGeometry) {
function(multiPolygonGeometry, data) {
var state = this.state_;
goog.asserts.assert(!goog.isNull(state));
var fillStyle = state.fillStyle;

2
src/ol/render/dragbox.js
View File

@@ -97,7 +97,7 @@ ol.render.DragBox.prototype.handleMapPostCompose_ = function(event) {
var geometry = new ol.geom.Polygon(coordinates);
var style = this.style_;
render.setFillStrokeStyle(style.fill, style.stroke);
render.drawPolygonGeometry(geometry);
render.drawPolygonGeometry(geometry, null);
};

18
src/ol/render/irender.js
View File

@@ -19,49 +19,55 @@ ol.render.IRender.prototype.drawFeature = function(feature, style) {
/**
* @param {ol.geom.Point} pointGeometry Point geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawPointGeometry = function(pointGeometry) {
ol.render.IRender.prototype.drawPointGeometry = function(pointGeometry, data) {
};
/**
* @param {ol.geom.LineString} lineStringGeometry Line string geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawLineStringGeometry =
function(lineStringGeometry) {
function(lineStringGeometry, data) {
};
/**
* @param {ol.geom.MultiLineString} multiLineStringGeometry
* MultiLineString geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawMultiLineStringGeometry =
function(multiLineStringGeometry) {
function(multiLineStringGeometry, data) {
};
/**
* @param {ol.geom.MultiPoint} multiPointGeometry MultiPoint geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawMultiPointGeometry =
function(multiPointGeometry) {
function(multiPointGeometry, data) {
};
/**
* @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawMultiPolygonGeometry =
function(multiPolygonGeometry) {
function(multiPolygonGeometry, data) {
};
/**
* @param {ol.geom.Polygon} polygonGeometry Polygon geometry.
* @param {Object} data Opaque data object.
*/
ol.render.IRender.prototype.drawPolygonGeometry =
function(polygonGeometry) {
function(polygonGeometry, data) {
};

37
src/ol/render/vector.js
View File

@@ -15,13 +15,14 @@ goog.require('ol.style.Style');
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.Feature} feature Feature.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
*/
ol.renderer.vector.renderFeature = function(replayGroup, feature, style) {
ol.renderer.vector.renderFeature = function(replayGroup, feature, style, data) {
var geometry = feature.getGeometry();
var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[geometry.getType()];
goog.asserts.assert(goog.isDef(geometryRenderer));
geometryRenderer(replayGroup, geometry, style);
geometryRenderer(replayGroup, geometry, style, data);
};
@@ -29,10 +30,11 @@ ol.renderer.vector.renderFeature = function(replayGroup, feature, style) {
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderLineStringGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.stroke)) {
return;
}
@@ -41,7 +43,7 @@ ol.renderer.vector.renderLineStringGeometry_ =
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, style.stroke);
replay.drawLineStringGeometry(lineStringGeometry);
replay.drawLineStringGeometry(lineStringGeometry, data);
};
@@ -49,10 +51,11 @@ ol.renderer.vector.renderLineStringGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderMultiLineStringGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.stroke)) {
return;
}
@@ -62,7 +65,7 @@ ol.renderer.vector.renderMultiLineStringGeometry_ =
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.LINE_STRING);
replay.setFillStrokeStyle(null, style.stroke);
replay.drawMultiLineStringGeometry(multiLineStringGeometry);
replay.drawMultiLineStringGeometry(multiLineStringGeometry, data);
};
@@ -70,10 +73,11 @@ ol.renderer.vector.renderMultiLineStringGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderMultiPolygonGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.stroke) && goog.isNull(style.fill)) {
return;
}
@@ -83,7 +87,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(style.fill, style.stroke);
replay.drawMultiPolygonGeometry(multiPolygonGeometry);
replay.drawMultiPolygonGeometry(multiPolygonGeometry, data);
};
@@ -91,10 +95,11 @@ ol.renderer.vector.renderMultiPolygonGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderPointGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.image)) {
return;
}
@@ -102,7 +107,7 @@ ol.renderer.vector.renderPointGeometry_ =
var pointGeometry = /** @type {ol.geom.Point} */ (geometry);
var replay = replayGroup.getReplay(style.zIndex, ol.render.ReplayType.IMAGE);
replay.setImageStyle(style.image);
replay.drawPointGeometry(pointGeometry);
replay.drawPointGeometry(pointGeometry, data);
};
@@ -110,10 +115,11 @@ ol.renderer.vector.renderPointGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderMultiPointGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.image)) {
return;
}
@@ -121,7 +127,7 @@ ol.renderer.vector.renderMultiPointGeometry_ =
var multiPointGeometry = /** @type {ol.geom.MultiPoint} */ (geometry);
var replay = replayGroup.getReplay(style.zIndex, ol.render.ReplayType.IMAGE);
replay.setImageStyle(style.image);
replay.drawMultiPointGeometry(multiPointGeometry);
replay.drawMultiPointGeometry(multiPointGeometry, data);
};
@@ -129,10 +135,11 @@ ol.renderer.vector.renderMultiPointGeometry_ =
* @param {ol.render.IReplayGroup} replayGroup Replay group.
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {Object} data Opaque data object.
* @private
*/
ol.renderer.vector.renderPolygonGeometry_ =
function(replayGroup, geometry, style) {
function(replayGroup, geometry, style, data) {
if (goog.isNull(style.fill) && goog.isNull(style.stroke)) {
return;
}
@@ -141,7 +148,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
var replay = replayGroup.getReplay(
style.zIndex, ol.render.ReplayType.POLYGON);
replay.setFillStrokeStyle(style.fill, style.stroke);
replay.drawPolygonGeometry(polygonGeometry);
replay.drawPolygonGeometry(polygonGeometry, data);
};
@@ -150,7 +157,7 @@ ol.renderer.vector.renderPolygonGeometry_ =
* @private
* @type {Object.<ol.geom.Type,
* function(ol.render.IReplayGroup, ol.geom.Geometry,
* ol.style.Style)>}
* ol.style.Style, Object)>}
*/
ol.renderer.vector.GEOMETRY_RENDERERS_ = {
'Point': ol.renderer.vector.renderPointGeometry_,