[OpenLayers-Commits] r11784 - in sandbox/cmoullet/openlayers: examples tests/Format/WFST

[commits-20090109 at openlayers.org]

Author: cmoullet
Date: 2011-03-30 06:39:26 -0700 (Wed, 30 Mar 2011)
New Revision: 11784

Modified:
   sandbox/cmoullet/openlayers/examples/openls.html
   sandbox/cmoullet/openlayers/tests/Format/WFST/v1_1_0.html
Log:
Merge with trunk


Modified: sandbox/cmoullet/openlayers/examples/openls.html
===================================================================
--- sandbox/cmoullet/openlayers/examples/openls.html	2011-03-30 13:38:17 UTC (rev 11783)
+++ sandbox/cmoullet/openlayers/examples/openls.html	2011-03-30 13:39:26 UTC (rev 11784)
@@ -39,7 +39,8 @@
             var format = new OpenLayers.Format.XLS();
             var output = format.read(response.responseXML);
             if (output.responseLists[0]) {
-                var foundPosition = new OpenLayers.LonLat(output.responseLists[0].features[0].geometry.x, output.responseLists[0].features[0].geometry.y).transform(
+                var geometry = output.responseLists[0].features[0].geometry;
+                var foundPosition = new OpenLayers.LonLat(geometry.x, geometry.y).transform(
                         new OpenLayers.Projection("EPSG:4326"),
                         map.getProjectionObject()
                         );
@@ -49,7 +50,7 @@
             }
         }
         function requestFailure(response) {
-            alert("no");
+            alert("An error occurred while communicating with the OpenLS service. Please try again.");
         }
 
     </script>

Modified: sandbox/cmoullet/openlayers/tests/Format/WFST/v1_1_0.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Format/WFST/v1_1_0.html	2011-03-30 13:38:17 UTC (rev 11783)
+++ sandbox/cmoullet/openlayers/tests/Format/WFST/v1_1_0.html	2011-03-30 13:39:26 UTC (rev 11784)
@@ -75,6 +75,13 @@
                 resultType: "hits",
                 propertyNames: ["STATE_NAME", "STATE_FIPS", "STATE_ABBR"]
             }
+        }, {
+            id: "getfeature1",
+            writer: "wfs:GetFeature",
+            arg: {
+                count: 10,
+                startIndex: 20
+            }
         }];
         
         t.plan(cases.length);
@@ -150,6 +157,16 @@
     </wfs:Query>
 </wfs:GetFeature>
 --></div>
+<div id="getfeature1"><!--
+<wfs:GetFeature service="WFS" version="1.1.0" startIndex="20" count="10" xmlns:topp="http://www.openplans.org/topp"
+                xmlns:wfs="http://www.opengis.net/wfs"
+                xmlns:ogc="http://www.opengis.net/ogc"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+    <wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" srsName="urn:ogc:def:crs:EPSG::4326" xmlns:topp="http://www.openplans.org/topp">
+    </wfs:Query>
+</wfs:GetFeature>
+--></div>
 <div id="boundedBy"><!--
 <?xml version='1.0' encoding="ISO-8859-1" ?>
 <wfs:FeatureCollection