From 6e508f5cd63edc8a1d3915e2b2e9048def8c22ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@camptocamp.com>
Date: Sat, 24 Oct 2009 01:55:55 +0000
Subject: [PATCH] Save strategy should preserve feature.url when transforming,
 p=pwr,me, r=me (closes #2215)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@9752 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Feature/Vector.js |  7 +++++++
 lib/OpenLayers/Strategy/Save.js  |  3 +++
 tests/Strategy/Save.html         | 35 ++++++++++++++++++++++++--------
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js
index d8064bdc30..a4cc11dd44 100644
--- a/lib/OpenLayers/Feature/Vector.js
+++ b/lib/OpenLayers/Feature/Vector.js
@@ -67,6 +67,13 @@ OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
      * {Object} 
      */
     style: null,
+
+    /**
+     * APIProperty: url
+     * {String} If this property is set it will be taken into account by
+     *     {<OpenLayers.HTTP>} when upadting or deleting the feature.
+     */
+    url: null,
     
     /**
      * Property: renderIntent
diff --git a/lib/OpenLayers/Strategy/Save.js b/lib/OpenLayers/Strategy/Save.js
index 640f76026c..2fb7e397d9 100644
--- a/lib/OpenLayers/Strategy/Save.js
+++ b/lib/OpenLayers/Strategy/Save.js
@@ -166,6 +166,9 @@ OpenLayers.Strategy.Save = OpenLayers.Class(OpenLayers.Strategy, {
                 clone = orig.clone();
                 clone.fid = orig.fid;
                 clone.state = orig.state;
+                if(orig.url) {
+                    clone.url = orig.url;
+                }
                 clone._original = orig;
                 clone.geometry.transform(local, remote);
                 clones[i] = clone;
diff --git a/tests/Strategy/Save.html b/tests/Strategy/Save.html
index 655fce8cba..bbab07f59e 100644
--- a/tests/Strategy/Save.html
+++ b/tests/Strategy/Save.html
@@ -43,7 +43,7 @@
     }
     
     function test_save(t) {
-        t.plan(5);
+        t.plan(9);
 
         var strategy = new OpenLayers.Strategy.Save();
         
@@ -54,6 +54,9 @@
                 response.reqFeatures = features;
                 response.insertIds = [];
                 for(var i=0; i<features.length; ++i) {
+                    // test feature.url first
+                    t.eq(features[i].url, "url" + i,
+                         "feature.url correctly set (url" + i + ")");
                     if(features[i].state == OpenLayers.State.INSERT) {
                         response.insertIds.push("new_" + i);
                     }
@@ -66,22 +69,39 @@
         var layer = new OpenLayers.Layer.Vector(null, {
             isBaseLayer: true,
             protocol: protocol,
-            strategies: [strategy]
+            strategies: [strategy],
+            projection: "EPSG:4326"
         });
-        var map = new OpenLayers.Map("map");
+        var map = new OpenLayers.Map("map", {
+            getProjectionObject: function() {
+                return new OpenLayers.Projection("EPSG:900913");
+            }
+        })
         map.addLayer(layer);
         map.zoomToMaxExtent();
         
         // give the layer some features
         var features = [
-            new OpenLayers.Feature.Vector(), // insert
-            new OpenLayers.Feature.Vector(), // delete
-            new OpenLayers.Feature.Vector(), // update
-            new OpenLayers.Feature.Vector()  // nothing
+            new OpenLayers.Feature.Vector(
+                new OpenLayers.Geometry.Point(5, 45)
+            ), // insert
+            new OpenLayers.Feature.Vector(
+                new OpenLayers.Geometry.Point(6, 46)
+            ), // delete
+            new OpenLayers.Feature.Vector(
+                new OpenLayers.Geometry.Point(7, 47)
+            ), // update
+            new OpenLayers.Feature.Vector(
+                new OpenLayers.Geometry.Point(8, 48)
+            )  // nothing
         ];
         features[0].state = OpenLayers.State.INSERT;
+        features[0].url = "url0";
         features[1].state = OpenLayers.State.DELETE;
+        features[1].url = "url1";
         features[2].state = OpenLayers.State.UPDATE;
+        features[2].url = "url2";
+        features[3].url = "url3";
         layer.addFeatures(features);
         
         // save feature modifications
@@ -97,7 +117,6 @@
         
         // confirm that updated feature no longer has update state
         t.ok(features[2].state == null, "updated feature no longer update state");
-        
     }
 
   </script>