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

Move detection of map procjection to merge function, check for successful response and fix tests.

Browse Source
This commit is contained in:
friedjoff
2013-01-08 14:49:42 +01:00
parent bbc73a21d8
commit 88e184e7e5
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
* full list of contributors). Published under the 2-clause BSD license.
* See license.txt in the OpenLayers distribution or repository for the
* full text of the license. */
@@ -42,7 +42,8 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
* the strategy was already active.
*/
activate: function() {
if(OpenLayers.Strategy.prototype.activate.apply(this, arguments)) {
var activated = OpenLayers.Strategy.prototype.activate.call(this);
if(activated) {
this.layer.events.on({
"refresh": this.load,
scope: this
@@ -55,9 +56,8 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
scope: this
});
}
return true;
}
return false;
return activated;
},
/**
@@ -87,14 +87,13 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
* options - {Object} options to pass to protocol read.
*/
load: function(options) {
var layer = this.layer;
layer.events.triggerEvent("loadstart", {filter: layer.filter});
layer.protocol.read(OpenLayers.Util.applyDefaults({
callback: OpenLayers.Function.bind(this.merge, this,
layer.map.getProjectionObject()),
filter: layer.filter
this.layer.events.triggerEvent("loadstart", {filter: this.layer.filter});
this.layer.protocol.read(OpenLayers.Util.applyDefaults({
callback: this.merge,
filter: this.layer.filter,
scope: this
}, options));
layer.events.un({
this.layer.events.un({
"visibilitychanged": this.load,
scope: this
});
@@ -103,29 +102,33 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
/**
* Method: merge
* Add all features to the layer.
* If the layer projection differs from the map projection, features
* will be transformed from the layer projection to the map projection.
*
* Parameters:
* mapProjection - {<OpenLayers.Projection>} the map projection
* resp - {<OpenLayers.Protocol.Response>} The response object passed
* by the protocol.
*/
merge: function(mapProjection, resp) {
var layer = this.layer;
layer.destroyFeatures();
var features = resp.features;
if (features && features.length > 0) {
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(layer.projection, mapProjection);
merge: function(resp) {
this.layer.destroyFeatures();
if (resp.success()) {
var features = resp.features;
if (features && features.length > 0) {
var remote = this.layer.projection;
var local = this.layer.map.getProjectionObject();
if(!local.equals(remote)) {
var geom;
for(var i=0, len=features.length; i<len; ++i) {
geom = features[i].geometry;
if(geom) {
geom.transform(remote, local);
}
}
}
this.layer.addFeatures(features);
}
layer.addFeatures(features);
}
layer.events.triggerEvent("loadend", {response: resp});
this.layer.events.triggerEvent("loadend", {response: resp});
},
CLASS_NAME: "OpenLayers.Strategy.Fixed"