[OpenLayers-Commits] r11777 - in sandbox/cmoullet/openlayers/tests: Format Layer

Wed Mar 30 08:10:23 EDT 2011

Author: cmoullet
Date: 2011-03-30 05:10:23 -0700 (Wed, 30 Mar 2011)
New Revision: 11777

Modified:
   sandbox/cmoullet/openlayers/tests/Format/WMSGetFeatureInfo.html
   sandbox/cmoullet/openlayers/tests/Layer/GML.html
Log:
Merge with trunk


Modified: sandbox/cmoullet/openlayers/tests/Format/WMSGetFeatureInfo.html
===================================================================

--- sandbox/cmoullet/openlayers/tests/Format/WMSGetFeatureInfo.html	2011-03-30 12:00:55 UTC (rev 11776)
+++ sandbox/cmoullet/openlayers/tests/Format/WMSGetFeatureInfo.html	2011-03-30 12:10:23 UTC (rev 11777)
@@ -1,15 +1,15 @@
-<html>
-<head>
+<html> 
+<head> 
     <script src="../OLLoader.js"></script>
     <script type="text/javascript">
-
+    
     function test_read_FeatureInfoResponse(t) {
         t.plan(7);
-
+        
         var parser = new OpenLayers.Format.WMSGetFeatureInfo();
 
         // read empty response
-        var text =
+        var text = 
             '<?xml version="1.0" encoding="UTF-8" ?>' +
             '<FeatureInfoResponse>' +
             '</FeatureInfoResponse>';
@@ -19,7 +19,7 @@
              "Parsing empty FeatureInfoResponse response succesfull");
 
         // read 1 feature
-        text =
+        text = 
             '<?xml version="1.0" encoding="UTF-8" ?>' +
             '<FeatureInfoResponse>' +
             '  <FIELDS OBJECTID="1188" HECTARES="1819.734" ZONENR="5854" NULZONES=" " AREA="18197340.1426" PERIMETER="19177.4073627" SHAPE="NULL" SE_ANNO_CAD_DATA="NULL" SHAPE.AREA="0" SHAPE.LEN="0"/>' +
@@ -33,7 +33,7 @@
              "Attribute OBJECTID contains the right value");
 
         // read multiple features
-        text =
+        text = 
             '<?xml version="1.0" encoding="UTF-8" ?>' +
             '<FeatureInfoResponse>' +
             '  <FIELDS OBJECTID="551" Shape="NULL" NAME="Carbon" STATE_NAME="Wyoming" AREA="7999.91062" POP2000="15639" POP00_SQMI="2" Shape_Length="6.61737274334215" Shape_Area="2.23938983524154"/>' +
@@ -72,11 +72,11 @@
 
     function test_read_msGMLOutput(t) {
         t.plan(13);
-
+        
         var parser = new OpenLayers.Format.WMSGetFeatureInfo();
 
         // read empty response
-        var text =
+        var text = 
             '<?xml version="1.0" encoding="ISO-8859-1"?>' +
             '<msGMLOutput ' +
             '	 xmlns:gml="http://www.opengis.net/gml"' +
@@ -111,7 +111,7 @@
         t.eq((features[0].attributes.EMPTY === null), true, "Empty attribute is parsed as null");
 
         // read 1 feature from 1 layer
-        text =
+        text = 
             '<?xml version="1.0" encoding="ISO-8859-1"?>' +
             '<msGMLOutput ' +
             '	 xmlns:gml="http://www.opengis.net/gml"' +
@@ -155,7 +155,7 @@
         t.eq(bounds.top.toFixed(3), "480609.250", "Bounds top parsed correctly");
 
         // read 2 features from 2 layers
-        text =
+        text = 
             '<?xml version="1.0" encoding="ISO-8859-1"?>' +
             '<msGMLOutput ' +
             '	 xmlns:gml="http://www.opengis.net/gml"' +
@@ -248,14 +248,14 @@
 
     function test_read_GMLFeatureInfoResponse(t) {
         t.plan(4);
-
+        
         var parser = new OpenLayers.Format.WMSGetFeatureInfo();
 
         // read Ionic response, see if parser falls back to GML format
         // url used:
         /* http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA?service=WMS&request=GetFeatureInfo&layers=roads&version=1.1.1&bbox=-71.1,42.25,-71.05,42.3&width=500&height=500&format=image/png&SRS=EPSG:4326&styles=&x=174&y=252&query_layers=roads&info_format=application/vnd.ogc.gml */
-        var text =
-            "<?xml version='1.0' encoding='utf-8' ?>" +
+        var text = 
+            "<?xml version='1.0' encoding='utf-8' ?>" + 
             '  <ogcwfs:FeatureCollection xsi:schemaLocation="http://www.ionicsoft.com/wfs http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA?REQUEST=DescribeAllFeatureType&amp;SERVICE=WFS http://www.opengis.net/wfs http://webservices.ionicsoft.com/ionicweb/wfs/BOSTON_ORA/REQUEST/get/DATA/LPR/wfs/1.0.0/WFS-basic.xsd" xmlns:wfs="http://www.ionicsoft.com/wfs" xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ogcwfs="http://www.opengis.net/wfs">' +
             '    <gml:boundedBy>' +
             '      <gml:Box srsName="EPSG:4326">' +
@@ -311,9 +311,9 @@
              "Attribute cat contains the right value");
 
     }
-
-    </script>
-</head>
+    
+    </script> 
+</head> 
 <body>
-</body>
-</html>
+</body> 
+</html> 

Modified: sandbox/cmoullet/openlayers/tests/Layer/GML.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Layer/GML.html	2011-03-30 12:00:55 UTC (rev 11776)
+++ sandbox/cmoullet/openlayers/tests/Layer/GML.html	2011-03-30 12:10:23 UTC (rev 11777)
@@ -37,7 +37,7 @@
         var map = new OpenLayers.Map("map");
         map.addLayer(layer);
         map.zoomToMaxExtent();
-        t.delay_call(3, function() {
+        t.delay_call(3, function() { 
             t.ok(true, "waited for 3s"); 
         });
 

