[OpenLayers-Commits] r11956 - in sandbox/august/trunk:
lib/OpenLayers/Format/WPSCommon lib/OpenLayers/Layer
playground playground/wmts playground/wps
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Fri May 6 20:45:03 EDT 2011
Author: augusttown
Date: 2011-05-06 17:45:02 -0700 (Fri, 06 May 2011)
New Revision: 11956
Modified:
sandbox/august/trunk/lib/OpenLayers/Format/WPSCommon/v1_0_0.js
sandbox/august/trunk/lib/OpenLayers/Layer/Process.js
sandbox/august/trunk/playground/index.html
sandbox/august/trunk/playground/wmts/wmts-ags-customized-tilingschema.js
sandbox/august/trunk/playground/wmts/wmts-ags-epsg3857.js
sandbox/august/trunk/playground/wmts/wmts-ags-wgs84.js
sandbox/august/trunk/playground/wps/wps-process-ags.js
Log:
update wmts samples;
update WPSCommon format and Process layer.
Modified: sandbox/august/trunk/lib/OpenLayers/Format/WPSCommon/v1_0_0.js
===================================================================
--- sandbox/august/trunk/lib/OpenLayers/Format/WPSCommon/v1_0_0.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/lib/OpenLayers/Format/WPSCommon/v1_0_0.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -1031,6 +1031,7 @@
}
// inject inputObj.identifier into inputObj.options.identifier
inputObj.options.identifier = inputObj.identifier;
+ // TODO: if already exists, must replace existing one
this.inputs.push(inputObj);
},
/**
Modified: sandbox/august/trunk/lib/OpenLayers/Layer/Process.js
===================================================================
--- sandbox/august/trunk/lib/OpenLayers/Layer/Process.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/lib/OpenLayers/Layer/Process.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -47,6 +47,16 @@
*
*/
processIdentifier: null,
+
+ /**
+ *
+ */
+ process: null,
+
+ /**
+ * APIProperty: autoLoad
+ */
+ autoLoad: false,
/**
* Constructor: OpenLayers.Layer.Process
Modified: sandbox/august/trunk/playground/index.html
===================================================================
--- sandbox/august/trunk/playground/index.html 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/playground/index.html 2011-05-07 00:45:02 UTC (rev 11956)
@@ -32,9 +32,12 @@
<tr><td><a href="wmts/wmts-geowebcache-wgs84.html"><b>wmts/wmts-geowebcache-wgs84.html</b></a></td></tr>
<tr><td><a href="wmts/wmts-geowebcache-customized-tilingschema.html"><b>wmts/wmts-geowebcache-customized-tilingschema.html</b></a></td></tr>
<tr><td><a href="wmts/jsapi-wmts-wgs84.html"><b>wmts/jsapi-wmts-wgs84.html</b></a></td></tr>
+ <tr><td><a href="wmts/jsapi-wmts-ags-wgs84.html"><b>wmts/jsapi-wmts-ags-wgs84.html</b></a></td></tr>
<tr><td><a href="wmts/jsapi-wmts-epsg3857.html"><b>wmts/jsapi-wmts-epsg3857.html</b></a></td></tr>
+ <tr><td><a href="wmts/jsapi-wmts-ags-epsg3857.html"><b>wmts/jsapi-wmts-ags-epsg3857.html</b></a></td></tr>
<tr><td><a href="wmts/jsapi-wmts-epsg3857-opengeo.html"><b>wmts/jsapi-wmts-epsg3857-opengeo.html</b></a></td></tr>
<tr><td><a href="wmts/jsapi-wmts-customized-tilingschema.html"><b>wmts/jsapi-wmts-customized-tilingschema.html</b></a></td></tr>
+ <tr><td><a href="wmts/jsapi-wmts-ags-customized-tilingschema.html"><b>wmts/jsapi-wmts-ags-customized-tilingschema.html</b></a></td></tr>
<tr><td><a href="wmts/jsapi-wmts-customized-tilingschema-swiss.html"><b>wmts/jsapi-wmts-customized-tilingschema-swiss.html</b></a></td></tr>
<tr><td><a href="wmts/wmts2tileinfo.html"><b>wmts/wmts2tileinfo.html</b></a></td></tr>
<tr><td><a href="../examples/wmts.html"><b>examples/wmts.html</b></a></td></tr>
Modified: sandbox/august/trunk/playground/wmts/wmts-ags-customized-tilingschema.js
===================================================================
--- sandbox/august/trunk/playground/wmts/wmts-ags-customized-tilingschema.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/playground/wmts/wmts-ags-customized-tilingschema.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -33,7 +33,7 @@
};
map = new OpenLayers.Map('map', options);
- var url = "http://alexandertown0:6080/wmts/services/portland/MapServer/WMTS/tile";
+ var url = "http://sazabiii:6080/arcgis/rest/services/portland_wmts/MapServer/WMTS/tile";
// add a WMTS by manually configure the tileMatrixSet and matrixIds
// in this case you don't need to load and parse capabilities file
Modified: sandbox/august/trunk/playground/wmts/wmts-ags-epsg3857.js
===================================================================
--- sandbox/august/trunk/playground/wmts/wmts-ags-epsg3857.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/playground/wmts/wmts-ags-epsg3857.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -99,7 +99,8 @@
var agsWorldWmtsLayer = new OpenLayers.Layer.WMTS({
// general Grid layer options
name: "world wmts",
- url: "http://alexandertown0:6080/wmts/services/world/MapServer/WMTS/tile",
+ //url: "http://sazabiii:6080/arcgis/rest/services/world_wmts/MapServer/WMTS/tile",
+ url: "http://ki:6080/arcgis/rest/services/world/MapServer/WMTS/tile",
isBaseLayer: false,
singleTile: false,
layer: "Layers",
@@ -120,7 +121,7 @@
var agsSfWmtsLayer = new OpenLayers.Layer.WMTS({
// general Grid layer options
name: "sf wmts",
- url: "http://alexandertown0:6080/wmts/services/sanfrancisco/MapServer/WMTS/tile",
+ url: "http://sazabiii:6080/arcgis/rest/services/sanfrancisco_wmts/MapServer/WMTS/tile",
isBaseLayer: false,
singleTile: false,
layer: "Layers",
Modified: sandbox/august/trunk/playground/wmts/wmts-ags-wgs84.js
===================================================================
--- sandbox/august/trunk/playground/wmts/wmts-ags-wgs84.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/playground/wmts/wmts-ags-wgs84.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -50,7 +50,7 @@
);
map.addLayer(base_layer);
- var url = "http://alexandertown0:6080/wmts/services/bluemarble/MapServer/WMTS/tile";
+ var url = "http://sazabiii:6080/arcgis/rest/services/bluemarble_wmts/MapServer/WMTS/tile";
// add a WMTS by manually configure the tileMatrixSet and matrixIds
// in this case you don't need to load and parse capabilities file
Modified: sandbox/august/trunk/playground/wps/wps-process-ags.js
===================================================================
--- sandbox/august/trunk/playground/wps/wps-process-ags.js 2011-05-05 16:55:27 UTC (rev 11955)
+++ sandbox/august/trunk/playground/wps/wps-process-ags.js 2011-05-07 00:45:02 UTC (rev 11956)
@@ -256,8 +256,8 @@
},
this
);
- //map.addControl(draw_control);
- //draw_control.activate();
+ map.addControl(draw_control);
+ draw_control.activate();
select_control = new OpenLayers.Control.SelectFeature(
wfs_layer_point,
@@ -277,8 +277,8 @@
}
}
);
- map.addControl(select_control);
- select_control.activate();
+ //map.addControl(select_control);
+ //select_control.activate();
result_layer = new OpenLayers.Layer.Vector(
"__wps_results__",
@@ -316,7 +316,8 @@
if(!process) {
process = new OpenLayers.Process.WPS({
map: map,
- url: "http://sazabiii:6080/arcgis/services/regression.advanced.services/GPServer/WPSServer?",
+ //url: "http://sazabiii:6080/arcgis/services/regression.advanced.services/GPServer/WPSServer?",
+ url: "http://ki:6080/arcgis/services/clip/GPServer/WPSServer?",
identifier: "buffer"
// TODO: more settings
});
@@ -498,7 +499,8 @@
if(!clip_process) {
clip_process = new OpenLayers.Process.WPS({
map: map,
- url: "http://sazabiii:6080/arcgis/services/regression.advanced.services/GPServer/WPSServer?",
+ //url: "http://sazabiii:6080/arcgis/services/regression.advanced.services/GPServer/WPSServer?",
+ url: "http://bi:6080/arcgis/services/clip/GPServer/WPSServer?",
identifier: "clip"
// TODO: more settings
});
More information about the Commits
mailing list