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

Allow geometryFunction to return undefined

Browse Source
This commit is contained in:
Andreas Hocevar
2014-12-16 01:12:08 +01:00
parent 6478454a93
commit af30b88413
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,7 +478,7 @@ ol.render.canvas.Immediate.prototype.drawCircleGeometry =
*/
ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
var geometry = style.getGeometryFunction()(feature);
if (goog.isNull(geometry) ||
if (!goog.isDefAndNotNull(geometry) ||
!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return;
}

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

@@ -124,7 +124,7 @@ ol.renderer.vector.renderFeature = function(
ol.renderer.vector.renderFeature_ = function(
replayGroup, feature, style, squaredTolerance) {
var geometry = style.getGeometryFunction()(feature);
if (goog.isNull(geometry)) {
if (!goog.isDefAndNotNull(geometry)) {
return;
}
var simplifiedGeometry = geometry.getSimplifiedGeometry(squaredTolerance);

2
src/ol/render/webgl/webglimmediate.js
View File

@@ -119,7 +119,7 @@ ol.render.webgl.Immediate.prototype.drawCircleGeometry =
*/
ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) {
var geometry = style.getGeometryFunction()(feature);
if (goog.isNull(geometry) ||
if (!goog.isDefAndNotNull(geometry) ||
!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return;
}