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

making Protocol.WFS work with just featureType and featurePrefix configured. r=bartvde (closes #3368)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@12129 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
ahocevar
2011-06-29 09:53:37 +00:00
parent 058008864e
commit eb7cc04254
12 changed files with 148 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/Format/Filter/v1_0_0.html
View File

@@ -78,6 +78,31 @@
t.xml_eq(node, out, "bbox correctly written");
}
function test_BBOX_noGeometryName(t) {
t.plan(1);
// WFS 1.0.0 does not allow BBOX filters without property, but
// GeoServer accepts them.
var filter = new OpenLayers.Filter.Spatial({
type: OpenLayers.Filter.Spatial.BBOX,
value: new OpenLayers.Bounds(-180, -90, 180, 90),
projection: "EPSG:4326"
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<ogc:BBOX>' +
'<gml:Box xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">' +
'<gml:coordinates decimal="." cs="," ts=" ">-180,-90 180,90</gml:coordinates>' +
'</gml:Box>' +
'</ogc:BBOX>' +
'</ogc:Filter>';
var parser = new OpenLayers.Format.Filter.v1_0_0();
var node = parser.write(filter);
t.xml_eq(node, out, "bbox correctly written");
}
function test_DWithin(t) {
t.plan(6);

25
tests/Format/Filter/v1_1_0.html
View File

@@ -167,6 +167,31 @@
t.xml_eq(node, out, "bbox correctly written");
}
function test_BBOX_noGeometryName(t) {
t.plan(1);
var filter = new OpenLayers.Filter.Spatial({
type: OpenLayers.Filter.Spatial.BBOX,
value: new OpenLayers.Bounds(-180, -90, 180, 90),
projection: "EPSG:4326"
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<ogc:BBOX>' +
'<gml:Envelope xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">' +
'<gml:lowerCorner>-180 -90</gml:lowerCorner>' +
'<gml:upperCorner>180 90</gml:upperCorner>' +
'</gml:Envelope>' +
'</ogc:BBOX>' +
'</ogc:Filter>';
var parser = new OpenLayers.Format.Filter.v1_1_0();
var node = parser.write(filter);
t.xml_eq(node, out, "bbox correctly written");
}
function test_Intersects(t) {
t.plan(4);

13
tests/Format/GML/v3.html
View File

@@ -50,6 +50,19 @@
}
function test_read_setGeometryName(t) {
t.plan(1);
var doc = readXML("v3/topp-states-gml.xml");
var format = new OpenLayers.Format.GML.v3({
featureType: "states",
featureNS: "http://www.openplans.org/topp",
geometryName: null
});
var features = format.read(doc.documentElement);
t.eq(format.geometryName, "the_geom", "geometryName set when parsing features");
}
function test_readNode_bounds(t) {
var files = ["v3/envelope.xml"];

11
tests/Format/WFST/v1_0_0.html
View File

@@ -67,6 +67,17 @@
}
}
function test_write_poorconfig(t) {
t.plan(1);
var format = new OpenLayers.Format.WFST.v1_0_0({
featureType: "states",
featurePrefix: "topp"
});
var exp = "topp:states";
var got = format.writeNode("wfs:Query").getAttribute("typeName");
t.eq(got, exp, "Query without featureNS but with featurePrefix queries for the correct featureType");
}
var xmlFormat = new OpenLayers.Format.XML();
function readXML(id) {

11
tests/Format/WFST/v1_1_0.html
View File

@@ -95,6 +95,17 @@
}
}
function test_write_poorconfig(t) {
t.plan(1);
var format = new OpenLayers.Format.WFST.v1_1_0({
featureType: "states",
featurePrefix: "topp"
});
var exp = "topp:states";
var got = format.writeNode("wfs:Query").getAttribute("typeName");
t.eq(got, exp, "Query without featureNS but with featurePrefix queries for the correct featureType");
}
var xmlFormat = new OpenLayers.Format.XML();
function readXML(id) {
var xml = document.getElementById(id).firstChild.nodeValue;

19
tests/Protocol/WFS.html
View File

@@ -104,6 +104,20 @@
OpenLayers.Request.POST = _POST;
}
function test_parseResponse_poorconfig(t) {
t.plan(2);
var protocol = new OpenLayers.Protocol.WFS({
url: "http://some.url.org",
featurePrefix: "topp",
featureType: "tasmania_roads"
});
protocol.parseResponse({responseText: document.getElementById("query_response").firstChild.nodeValue});
t.eq(protocol.geometryName, "geom", "geometryName configured correctly");
t.eq(protocol.featureNS, "http://www.openplans.org/topp", "featureNS configured correctly");
}
function test_exception(t) {
t.plan(8);
@@ -439,7 +453,6 @@
<wfs:Delete typeName="feature:type" xmlns:feature="http://namespace.org">
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<ogc:BBOX>
<ogc:PropertyName/>
<gml:Box xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
<gml:coordinates decimal="." cs="," ts=" ">-5,-5 5,5</gml:coordinates>
</gml:Box>
@@ -448,5 +461,9 @@
</wfs:Delete>
</wfs:Transaction>
--></div>
<div id="query_response"><!--
<?xml version="1.0" encoding="UTF-8"?>
<wfs:FeatureCollection xmlns:ogc="http://www.opengis.net/ogc" xmlns:wfs="http://www.opengis.net/wfs" xmlns:topp="http://www.openplans.org/topp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"><gml:boundedBy><gml:Envelope srsDimension="2" srsName="urn:x-ogc:def:crs:EPSG:4326"><gml:lowerCorner>5450000.0 500000.0</gml:lowerCorner><gml:upperCorner>5450000.0 540000.0</gml:upperCorner></gml:Envelope></gml:boundedBy><gml:featureMembers><topp:tasmania_roads gml:id="tasmania_roads.1"><gml:boundedBy><gml:Envelope srsDimension="2" srsName="urn:x-ogc:def:crs:EPSG:4326"><gml:lowerCorner>5450000.0 500000.0</gml:lowerCorner><gml:upperCorner>5450000.0 540000.0</gml:upperCorner></gml:Envelope></gml:boundedBy><topp:geom><gml:MultiLineString srsDimension="2" srsName="urn:x-ogc:def:crs:EPSG:4326"><gml:lineStringMember><gml:LineString><gml:posList>5450000.0 500000.0 5450000.0 540000.0</gml:posList></gml:LineString></gml:lineStringMember></gml:MultiLineString></topp:geom><topp:TYPE>street</topp:TYPE></topp:tasmania_roads></gml:featureMembers></wfs:FeatureCollection>
--></div>
</body>
</html>