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

adding a feature.modified property, making the ModifyFeature control set it and the WFST format check for it so only modified attributes and a modified geometry need to be included in an Update transaction. r=bartvde (closes #3400)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@12149 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2011-07-04 08:37:55 +00:00
parent 3f2bd6ddc2
commit 2293987d57
5 changed files with 140 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Control/ModifyFeature.html
+24 -2
View File
@@ -736,8 +736,30 @@
map.destroy();
}
function test_setFeatureState(t) {
t.plan(4);
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.Vector("vector", {isBaseLayer: true});
map.addLayer(layer);
var feature = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(1,2));
layer.addFeatures([feature]);
var control = new OpenLayers.Control.ModifyFeature(layer, {standalone: true});
map.addControl(control);
control.selectFeature(feature);
var originalGeometry = feature.geometry;
t.ok(control._originalGeometry, "original geometry stored for later use in setFeatureState");
feature.geometry = new OpenLayers.Geometry.Point(2,3);
control.modified = true;
control.setFeatureState();
t.eq(feature.state, OpenLayers.State.UPDATE, "feature state set to UPDATE");
t.geom_eq(feature.modified.geometry, originalGeometry, "original geometry stored on the modified property");
t.eq(control._originalGeometry, undefined, "original geometry deleted once it is set on the modified property");
}
</script>
</head>
tests/Format/WFST/v1.html
+47 -1
View File
@@ -45,7 +45,7 @@
deleteFeature.state = OpenLayers.State.DELETE;
deleteFeature.fid = "fid.37";
t.plan(5);
t.plan(7);
var snippets = {
"GetFeature": {maxFeatures: 1, outputFormat: 'json'},
"Transaction": null,
@@ -61,6 +61,19 @@
var got = format.writers["wfs"][snippet].apply(format, [arg]);
t.xml_eq(got, expected, snippet + " request created correctly");
}
updateFeature.modified = {geometry: updateFeature.geometry.clone()};
updateFeature.geometry = new OpenLayers.Geometry.Point(2,3);
var expected = readXML("UpdateModified");
var got = format.writers["wfs"]["Update"].apply(format, [updateFeature]);
t.xml_eq(got, expected, "Update request for feature with modified geometry created correctly");
updateFeature.modified.attributes = {foo: "bar"};
updateFeature.attributes.foo = "baz";
delete updateFeature.modified.geometry;
var expected = readXML("UpdateModifiedNoGeometry");
var got = format.writers["wfs"]["Update"].apply(format, [updateFeature]);
t.xml_eq(got, expected, "Update request for feature with no modified geometry but modified attributes created correctly");
}
function test_writeNative(t) {
@@ -264,6 +277,39 @@
</ogc:Filter>
</wfs:Update>
--></div>
<div id="UpdateModified"><!--
<wfs:Update xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
<wfs:Property>
<wfs:Name>the_geom</wfs:Name>
<wfs:Value>
<gml:Point xmlns:gml="http://www.opengis.net/gml">
<gml:coordinates decimal="." cs="," ts=" ">2,3</gml:coordinates>
</gml:Point>
</wfs:Value>
</wfs:Property>
<wfs:Property>
<wfs:Name>foo</wfs:Name>
<wfs:Value>bar</wfs:Value>
</wfs:Property>
<wfs:Property>
<wfs:Name>nul</wfs:Name>
</wfs:Property>
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<ogc:FeatureId fid="fid.42"/>
</ogc:Filter>
</wfs:Update>
--></div>
<div id="UpdateModifiedNoGeometry"><!--
<wfs:Update xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
<wfs:Property>
<wfs:Name>foo</wfs:Name>
<wfs:Value>baz</wfs:Value>
</wfs:Property>
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<ogc:FeatureId fid="fid.42"/>
</ogc:Filter>
</wfs:Update>
--></div>
<div id="Delete"><!--
<wfs:Delete xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">