[OpenLayers-Commits] r12428 - in sandbox/august/trunk: lib/OpenLayers/Format/OWSCommon lib/OpenLayers/Test util

[commits-20090109 at openlayers.org]

Author: augusttown
Date: 2011-10-06 15:43:01 -0700 (Thu, 06 Oct 2011)
New Revision: 12428

Modified:
   sandbox/august/trunk/lib/OpenLayers/Format/OWSCommon/v1.js
   sandbox/august/trunk/lib/OpenLayers/Test/AgsOgcRegression.js
   sandbox/august/trunk/util/ags-proxy.jsp
Log:
Small change on Test/AgsOgcRegression.js;
Small change on util/ags-proxy.jsp.

Modified: sandbox/august/trunk/lib/OpenLayers/Format/OWSCommon/v1.js
===================================================================
--- sandbox/august/trunk/lib/OpenLayers/Format/OWSCommon/v1.js	2011-10-06 22:42:05 UTC (rev 12427)
+++ sandbox/august/trunk/lib/OpenLayers/Format/OWSCommon/v1.js	2011-10-06 22:43:01 UTC (rev 12428)
@@ -171,8 +171,13 @@
                 this.readChildNodes(node, dcp.http);
             },
             "Get": function(node, http) {
-                http.get = this.getAttributeNS(node, 
+                /*
+            	http.get = this.getAttributeNS(node, 
                     this.namespaces.xlink, "href");
+            	*/
+            	// deal with multiple get url, e.g. WMTS REST/KVP/SOAP etc.
+            	http.get = [];            	
+            	http.get.push(this.getAttributeNS(node, this.namespaces.xlink, "href"));            	
             },
             "Post": function(node, http) {
                 http.post = this.getAttributeNS(node, 
@@ -196,8 +201,8 @@
             "WGS84BoundingBox": function(node, obj) {
                 var boundingBox = {};
                 boundingBox.crs = node.getAttribute("crs");
-                if (obj.BoundingBox) {
-                    obj.BoundingBox.push(boundingBox);
+                if (obj.boundingBox) {
+                    obj.boundingBox.push(boundingBox);
                 } else {
                     obj.projection = boundingBox.crs;
                     boundingBox = obj;

Modified: sandbox/august/trunk/lib/OpenLayers/Test/AgsOgcRegression.js
===================================================================
--- sandbox/august/trunk/lib/OpenLayers/Test/AgsOgcRegression.js	2011-10-06 22:42:05 UTC (rev 12427)
+++ sandbox/august/trunk/lib/OpenLayers/Test/AgsOgcRegression.js	2011-10-06 22:43:01 UTC (rev 12428)
@@ -44,10 +44,10 @@
 		});
 	},
 	
-	_run_get_mimeType: function(reqParams, refMimeType, t) {		
-		var caller = this;		
+	_run_get_mimeType: function(reqParams, refMimeType, t, optReqUrl) {		
+		var caller = this;			
 		OpenLayers.Request.GET({
-			url: this.url,
+			url: optReqUrl || this.url,
 			params: reqParams,
 			success: function(response) {				
 				if(response.statusText=="OK" && response.status==200) {

Modified: sandbox/august/trunk/util/ags-proxy.jsp
===================================================================
--- sandbox/august/trunk/util/ags-proxy.jsp	2011-10-06 22:42:05 UTC (rev 12427)
+++ sandbox/august/trunk/util/ags-proxy.jsp	2011-10-06 22:43:01 UTC (rev 12428)
@@ -7,7 +7,8 @@
   //For ex. (non-secured server): "http://sampleserver1.arcgisonline.com/arcgis/rest/services"
   "http://sampleserver1.arcgisonline.com/arcgis/rest/services",
   "http://sampleserver2.arcgisonline.com/arcgis/rest/services",
-  "http://sazabi:8399/arcgis/rest/services"	 //NOTE - no comma after the last item
+  "http://ais3:6080/arcgis/rest/services",
+  "http://sazabiii:6080/arcgis/rest/services"	 //NOTE - no comma after the last item
 };
 %>
 <%