Changeset 9249
- Timestamp:
- 04/08/09 19:15:48 (1 year ago)
- Files:
-
- trunk/openlayers/examples/arcims-thematic.html (added)
- trunk/openlayers/examples/arcims.html (added)
- trunk/openlayers/examples/proxy.cgi (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers.js (modified) (2 diffs)
- trunk/openlayers/lib/OpenLayers/Format/ArcXML (added)
- trunk/openlayers/lib/OpenLayers/Format/ArcXML.js (added)
- trunk/openlayers/lib/OpenLayers/Format/ArcXML/Features.js (added)
- trunk/openlayers/lib/OpenLayers/Layer/ArcIMS.js (added)
- trunk/openlayers/lib/OpenLayers/Tile/Image.js (modified) (2 diffs)
- trunk/openlayers/tests/Format/ArcXML (added)
- trunk/openlayers/tests/Format/ArcXML.html (added)
- trunk/openlayers/tests/Format/ArcXML/Features.html (added)
- trunk/openlayers/tests/Layer/ArcIMS.html (added)
- trunk/openlayers/tests/list-tests.html (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/examples/proxy.cgi
r8895 r9249 20 20 'prototype.openmnnd.org', 'geo.openplans.org', 21 21 'sigma.openplans.org', 'demo.opengeo.org', 22 'www.openstreetmap.org' ]22 'www.openstreetmap.org', 'sample.avencia.com'] 23 23 24 24 method = os.environ["REQUEST_METHOD"] trunk/openlayers/lib/OpenLayers.js
r9240 r9249 114 114 "OpenLayers/Layer/WMS.js", 115 115 "OpenLayers/Layer/WMS/Untiled.js", 116 "OpenLayers/Layer/ArcIMS.js", 116 117 "OpenLayers/Layer/GeoRSS.js", 117 118 "OpenLayers/Layer/Boxes.js", … … 212 213 "OpenLayers/Format.js", 213 214 "OpenLayers/Format/XML.js", 215 "OpenLayers/Format/ArcXML.js", 216 "OpenLayers/Format/ArcXML/Features.js", 214 217 "OpenLayers/Format/GML.js", 215 218 "OpenLayers/Format/GML/Base.js", trunk/openlayers/lib/OpenLayers/Tile/Image.js
r9115 r9249 285 285 this.imgDiv.viewRequestID = this.layer.map.viewRequestID; 286 286 287 // needed for changing to a different serve for onload error 288 if (this.layer.url instanceof Array) { 289 this.imgDiv.urls = this.layer.url.slice(); 290 } 291 292 this.url = this.layer.getURL(this.bounds); 287 if (this.layer.async) { 288 // Asyncronous image requests call the asynchronous getURL method 289 // on the layer to fetch an image that covers 'this.bounds', in the scope of 290 // 'this', setting the 'url' property of the layer itself, and running 291 // the callback 'positionFrame' when the image request returns. 292 this.layer.getURLasync(this.bounds, this, "url", this.positionImage); 293 } else { 294 // syncronous image requests get the url and position the frame immediately, 295 // and don't wait for an image request to come back. 296 297 // needed for changing to a different server for onload error 298 if (this.layer.url instanceof Array) { 299 this.imgDiv.urls = this.layer.url.slice(); 300 } 301 302 this.url = this.layer.getURL(this.bounds); 303 304 // position the frame immediately 305 this.positionImage(); 306 } 307 return true; 308 }, 309 310 /** 311 * Method: positionImage 312 * Using the properties currenty set on the layer, position the tile correctly. 313 * This method is used both by the async and non-async versions of the Tile.Image 314 * code. 315 */ 316 positionImage: function() { 317 // if the this layer doesn't exist at the point the image is 318 // returned, do not attempt to use it for size computation 319 if ( this.layer == null ) 320 return; 321 293 322 // position the frame 294 323 OpenLayers.Util.modifyDOMElement(this.frame, 295 null, this.position, this.size);324 null, this.position, this.size); 296 325 297 326 if (this.layerAlphaHack) { … … 303 332 this.imgDiv.src = this.url; 304 333 } 305 return true;306 334 }, 307 335 trunk/openlayers/tests/list-tests.html
r9240 r9249 46 46 <li>Filter/Spatial.html</li> 47 47 <li>Format.html</li> 48 <li>Format/ArcXML.html</li> 49 <li>Format/ArcXML/Features.html</li> 48 50 <li>Format/GeoJSON.html</li> 49 51 <li>Format/GeoRSS.html</li> … … 104 106 <li>Lang.html</li> 105 107 <li>Layer.html</li> 108 <li>Layer/ArcIMS.html</li> 106 109 <li>Layer/ArcGIS93Rest.html</li> 107 110 <li>Layer/EventPane.html</li>
