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

we get a js error in the Fixed strategy when the layer is removed from the map right after strategy.load is called, p=fvanderbiest, r=me (closes #2851)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10791 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2010-09-27 10:13:00 +00:00
parent 0dc5793834
commit 059b83a52f
2 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/OpenLayers/Strategy/Fixed.js
View File

@@ -98,13 +98,14 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
* options - {Object} options to pass to protocol read.
*/
load: function(options) {
this.layer.events.triggerEvent("loadstart");
this.layer.protocol.read(OpenLayers.Util.applyDefaults({
callback: this.merge,
filter: this.layer.filter,
scope: this
var layer = this.layer;
layer.events.triggerEvent("loadstart");
layer.protocol.read(OpenLayers.Util.applyDefaults({
callback: OpenLayers.Function.bind(this.merge, this,
layer.map.getProjectionObject()),
filter: layer.filter
}, options));
this.layer.events.un({
layer.events.un({
"visibilitychanged": this.load,
scope: this
});
@@ -113,25 +114,28 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
/**
* Method: merge
* Add all features to the layer.
*
* Parameters:
* mapProjection - {OpenLayers.Projection} the map projection
* resp - {Object} options to pass to protocol read.
*/
merge: function(resp) {
this.layer.destroyFeatures();
merge: function(mapProjection, resp) {
var layer = this.layer;
layer.destroyFeatures();
var features = resp.features;
if (features && features.length > 0) {
var remote = this.layer.projection;
var local = this.layer.map.getProjectionObject();
if(!local.equals(remote)) {
if(!mapProjection.equals(layer.projection)) {
var geom;
for(var i=0, len=features.length; i<len; ++i) {
geom = features[i].geometry;
if(geom) {
geom.transform(remote, local);
geom.transform(layer.projection, mapProjection);
}
}
}
this.layer.addFeatures(features);
layer.addFeatures(features);
}
this.layer.events.triggerEvent("loadend");
layer.events.triggerEvent("loadend");
},
CLASS_NAME: "OpenLayers.Strategy.Fixed"