Merge pull request #827 from geops/fixed-strategy

Improved Fixed Strategy

lib/OpenLayers/Strategy/Fixed.js

@@ -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.apply(this, arguments);
+        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;
     },
     
     /**
@@ -90,9 +90,9 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
         var layer = this.layer;
         layer.events.triggerEvent("loadstart", {filter: layer.filter});
         layer.protocol.read(OpenLayers.Util.applyDefaults({
-            callback: OpenLayers.Function.bind(this.merge, this,
+            callback: this.merge,
-                layer.map.getProjectionObject()),
+            filter: layer.filter,
-            filter: layer.filter
+            scope: this
         }, options));
         layer.events.un({
             "visibilitychanged": this.load,
@@ -103,23 +103,26 @@ 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) {
+    merge: function(resp) {
         var layer = this.layer;
         layer.destroyFeatures();
         var features = resp.features;
         if (features && features.length > 0) {
-            if(!mapProjection.equals(layer.projection)) {
+            var remote = layer.projection;
+            var local = 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(layer.projection, mapProjection);
+                        geom.transform(remote, local);
                     }
                 }
             }

tests/Strategy/Fixed.html

@@ -10,7 +10,10 @@
         // a fake protocol
         var protocol = {
             read: function(options) {
-                options.callback.call(options.scope, {features: featureList});
+                options.callback.call(options.scope, {
+                    features: featureList, 
+                    success: OpenLayers.Function.True
+                });
             }
         };
         
@@ -162,7 +165,7 @@
         ];
 
         // call merge with a mocked up response
-        strategy.merge(new OpenLayers.Projection("EPSG:900913"), {features: features});
+        strategy.merge({features: features, success: OpenLayers.Function.True});
         
         // confirm that the original features were destroyed
         t.eq(layer.features.length, 2, "old features destroyed");
@@ -186,7 +189,7 @@
         ];
         
         // call merge again with mocked up response
-        strategy.merge(new OpenLayers.Projection("EPSG:900913"), {features: features});
+        strategy.merge({features: features, success: OpenLayers.Function.True});
 
         // test that feature geometries have not been transformed
         t.geom_eq(layer.features[0].geometry, features[0].geometry, "[same proj] feature 0 geometry not transformed");
@@ -195,7 +198,7 @@
     }
 
     function test_load(t) {
-        t.plan(4);
+        t.plan(3);
 
         // set up
 
@@ -210,8 +213,8 @@
         var response = new OpenLayers.Protocol.Response();
 
         var strategy = new OpenLayers.Strategy.Fixed({
-            merge: function(p, r) {
+            merge: function(r) {
-                log = {scope: this, projection: p, response: r};
+                log = {scope: this, response: r};
             }
         });
 
@@ -235,8 +238,6 @@
              "merge was called");
         t.ok(log.scope == strategy,
              "merge called with expected scope");
-        t.eq(log.projection.getCode(), map.getProjectionObject().getCode(),
-             "merge called the map projection as the first arg");
         t.ok(log.response == response,
              "merge called with response as the first arg");