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
This commit is contained in:
@@ -68,6 +68,13 @@ OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
|
|||||||
*/
|
*/
|
||||||
style: null,
|
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
|
* Property: renderIntent
|
||||||
* {String} rendering intent currently being used
|
* {String} rendering intent currently being used
|
||||||
|
|||||||
@@ -166,6 +166,9 @@ OpenLayers.Strategy.Save = OpenLayers.Class(OpenLayers.Strategy, {
|
|||||||
clone = orig.clone();
|
clone = orig.clone();
|
||||||
clone.fid = orig.fid;
|
clone.fid = orig.fid;
|
||||||
clone.state = orig.state;
|
clone.state = orig.state;
|
||||||
|
if(orig.url) {
|
||||||
|
clone.url = orig.url;
|
||||||
|
}
|
||||||
clone._original = orig;
|
clone._original = orig;
|
||||||
clone.geometry.transform(local, remote);
|
clone.geometry.transform(local, remote);
|
||||||
clones[i] = clone;
|
clones[i] = clone;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function test_save(t) {
|
function test_save(t) {
|
||||||
t.plan(5);
|
t.plan(9);
|
||||||
|
|
||||||
var strategy = new OpenLayers.Strategy.Save();
|
var strategy = new OpenLayers.Strategy.Save();
|
||||||
|
|
||||||
@@ -54,6 +54,9 @@
|
|||||||
response.reqFeatures = features;
|
response.reqFeatures = features;
|
||||||
response.insertIds = [];
|
response.insertIds = [];
|
||||||
for(var i=0; i<features.length; ++i) {
|
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) {
|
if(features[i].state == OpenLayers.State.INSERT) {
|
||||||
response.insertIds.push("new_" + i);
|
response.insertIds.push("new_" + i);
|
||||||
}
|
}
|
||||||
@@ -66,22 +69,39 @@
|
|||||||
var layer = new OpenLayers.Layer.Vector(null, {
|
var layer = new OpenLayers.Layer.Vector(null, {
|
||||||
isBaseLayer: true,
|
isBaseLayer: true,
|
||||||
protocol: protocol,
|
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.addLayer(layer);
|
||||||
map.zoomToMaxExtent();
|
map.zoomToMaxExtent();
|
||||||
|
|
||||||
// give the layer some features
|
// give the layer some features
|
||||||
var features = [
|
var features = [
|
||||||
new OpenLayers.Feature.Vector(), // insert
|
new OpenLayers.Feature.Vector(
|
||||||
new OpenLayers.Feature.Vector(), // delete
|
new OpenLayers.Geometry.Point(5, 45)
|
||||||
new OpenLayers.Feature.Vector(), // update
|
), // insert
|
||||||
new OpenLayers.Feature.Vector() // nothing
|
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].state = OpenLayers.State.INSERT;
|
||||||
|
features[0].url = "url0";
|
||||||
features[1].state = OpenLayers.State.DELETE;
|
features[1].state = OpenLayers.State.DELETE;
|
||||||
|
features[1].url = "url1";
|
||||||
features[2].state = OpenLayers.State.UPDATE;
|
features[2].state = OpenLayers.State.UPDATE;
|
||||||
|
features[2].url = "url2";
|
||||||
|
features[3].url = "url3";
|
||||||
layer.addFeatures(features);
|
layer.addFeatures(features);
|
||||||
|
|
||||||
// save feature modifications
|
// save feature modifications
|
||||||
@@ -97,7 +117,6 @@
|
|||||||
|
|
||||||
// confirm that updated feature no longer has update state
|
// confirm that updated feature no longer has update state
|
||||||
t.ok(features[2].state == null, "updated feature no longer update state");
|
t.ok(features[2].state == null, "updated feature no longer update state");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user