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

Merge pull request #1423 from twpayne/vector-api-null-geometries

Browse Source 
[vector-api] Handle features with null geometries
This commit is contained in:
Tom Payne
2013-12-20 06:17:54 -08:00
parent be55ea5f88 8a7ae264e1
commit 6532d6e8f8
4 changed files with 76 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,7 +242,8 @@ ol.render.canvas.Immediate.prototype.drawRings_ =
*/
ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
var geometry = feature.getGeometry();
if (!ol.extent.intersects(this.extent_, geometry.getExtent())) {
if (goog.isNull(geometry) ||
!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return;
}
this.setFillStrokeStyle(style.getFill(), style.getStroke());

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

@@ -21,11 +21,15 @@ goog.require('ol.style.Style');
*/
ol.renderer.vector.renderFeature = function(
replayGroup, feature, style, squaredTolerance, data) {
var geometry = feature.getGeometry().getSimplifiedGeometry(squaredTolerance);
var geometry = feature.getGeometry();
if (goog.isNull(geometry)) {
return;
}
var simplifiedGeometry = geometry.getSimplifiedGeometry(squaredTolerance);
var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[geometry.getType()];
ol.renderer.vector.GEOMETRY_RENDERERS_[simplifiedGeometry.getType()];
goog.asserts.assert(goog.isDef(geometryRenderer));
geometryRenderer(replayGroup, geometry, style, data);
geometryRenderer(replayGroup, simplifiedGeometry, style, data);
};

21
src/ol/source/vectorsource.js
View File

@@ -160,7 +160,9 @@ ol.source.Vector.prototype.forEachFeatureAtCoordinate =
function(coordinate, f, opt_obj) {
var extent = [coordinate[0], coordinate[1], coordinate[0], coordinate[1]];
return this.forEachFeatureInExtent(extent, function(feature) {
if (feature.getGeometry().containsCoordinate(coordinate)) {
var geometry = feature.getGeometry();
goog.asserts.assert(!goog.isNull(geometry));
if (geometry.containsCoordinate(coordinate)) {
return f.call(opt_obj, feature);
} else {
return undefined;
@@ -277,7 +279,22 @@ ol.source.Vector.prototype.getExtent = function() {
*/
ol.source.Vector.prototype.handleFeatureChange_ = function(event) {
var feature = /** @type {ol.Feature} */ (event.target);
this.rBush_.update(feature.getGeometry().getExtent(), feature);
var featureKey = goog.getUid(feature).toString();
var geometry = feature.getGeometry();
if (goog.isNull(geometry)) {
if (!(featureKey in this.nullGeometryFeatures_)) {
this.rBush_.remove(feature);
this.nullGeometryFeatures_[featureKey] = feature;
}
} else {
var extent = geometry.getExtent();
if (featureKey in this.nullGeometryFeatures_) {
delete this.nullGeometryFeatures_[featureKey];
this.rBush_.insert(extent, feature);
} else {
this.rBush_.update(extent, feature);
}
}
this.dispatchChangeEvent();
};