From cfa3353d426c739ffe38dfa0c421ad6f02115f0d Mon Sep 17 00:00:00 2001 From: crschmidt Date: Wed, 1 Sep 2010 19:12:41 +0000 Subject: [PATCH] Change the remaining examples that reference MetaCarta Labs server to point to the newly set up TileCache service on the OSGeo projects server. git-svn-id: http://svn.openlayers.org/trunk/openlayers@10709 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- examples/attribution.html | 2 +- examples/multiserver.html | 4 ++-- examples/strategy-cluster-threshold.html | 6 +++--- examples/tilecache.html | 10 +++++----- examples/tms.html | 6 +++--- examples/wfs-states.js | 2 +- examples/wrapDateLine.html | 5 ----- 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/examples/attribution.html b/examples/attribution.html index 96ef851312..1fbd97f8d7 100644 --- a/examples/attribution.html +++ b/examples/attribution.html @@ -12,7 +12,7 @@ var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}, - {'attribution': 'Provided by MetaCarta'}); + {'attribution': 'Provided by OSGeo'}); var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic", "http://t1.hypercube.telascience.org/cgi-bin/landsat7", diff --git a/examples/multiserver.html b/examples/multiserver.html index 1368910a53..4ec707284f 100644 --- a/examples/multiserver.html +++ b/examples/multiserver.html @@ -13,8 +13,8 @@ function init(){ map = new OpenLayers.Map( 'map' ); - var urlArray = ["http://t1.labs.metacarta.com/wms-c/Basic.py", - "http://t2.labs.metacarta.com/wms-c/Basic.py"]; + var urlArray = ["http://tilecache.osgeo.org/wms-c/Basic.py", + "http://tilecache.osgeo.org/wms-c/Basic.py"]; layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", urlArray, {layers: 'basic'} ); diff --git a/examples/strategy-cluster-threshold.html b/examples/strategy-cluster-threshold.html index cd9e308ea7..41444597c2 100644 --- a/examples/strategy-cluster-threshold.html +++ b/examples/strategy-cluster-threshold.html @@ -34,9 +34,9 @@ function init() { map = new OpenLayers.Map('map'); var base = new OpenLayers.Layer.WMS("OpenLayers WMS", - ["http://t3.labs.metacarta.com/wms-c/Basic.py", - "http://t2.labs.metacarta.com/wms-c/Basic.py", - "http://t1.labs.metacarta.com/wms-c/Basic.py"], + ["http://t3.tilecache.osgeo.org/wms-c/Basic.py", + "http://t2.tilecache.osgeo.org/wms-c/Basic.py", + "http://t1.tilecache.osgeo.org/wms-c/Basic.py"], {layers: 'satellite'} ); diff --git a/examples/tilecache.html b/examples/tilecache.html index 7ff4f1d54a..0db39aa1bd 100644 --- a/examples/tilecache.html +++ b/examples/tilecache.html @@ -11,11 +11,11 @@ resolutions: [0.087890625, 0.0439453125, 0.02197265625, 0.010986328125] }); layer = new OpenLayers.Layer.TileCache("TileCache Layer", - ["http://c0.labs.metacarta.com/wms-c/cache/", - "http://c1.labs.metacarta.com/wms-c/cache/", - "http://c2.labs.metacarta.com/wms-c/cache/", - "http://c3.labs.metacarta.com/wms-c/cache/", - "http://c4.labs.metacarta.com/wms-c/cache/"], + ["http://c0.tilecache.osgeo.org/wms-c/cache/", + "http://c1.tilecache.osgeo.org/wms-c/cache/", + "http://c2.tilecache.osgeo.org/wms-c/cache/", + "http://c3.tilecache.osgeo.org/wms-c/cache/", + "http://c4.tilecache.osgeo.org/wms-c/cache/"], "basic", { serverResolutions: [0.703125, 0.3515625, 0.17578125, 0.087890625, diff --git a/examples/tms.html b/examples/tms.html index 4dd19e946a..d1e4678e21 100644 --- a/examples/tms.html +++ b/examples/tms.html @@ -13,7 +13,7 @@ function init(){ map = new OpenLayers.Map( 'map', {maxResolution:1.40625/2} ); layer = new OpenLayers.Layer.TMS( "TMS", - "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png'} ); + "http://tilecache.osgeo.org/wms-c/Basic.py/", {layername: 'basic', type:'png'} ); map.addLayer(layer); map.addControl(new OpenLayers.Control.LayerSwitcher()); map.setCenter(new OpenLayers.LonLat(lon, lat), zoom); @@ -43,9 +43,9 @@
- URL of TMS (Should end in /): layer_name
+ URL of TMS (Should end in /): layer_name

- Example: http://labs.metacarta.com/wms-c/Basic.py/, satellite, jpg
+ Example: http://tilecache.osgeo.org/wms-c/Basic.py/, basic, jpg
The first input must be an HTTP URL pointing to a TMS instance. The second input must be a layer name available from that instance, and the third must be the output format used by that layer. (Any other behavior will result in diff --git a/examples/wfs-states.js b/examples/wfs-states.js index 70c189fdd9..e8f183f538 100644 --- a/examples/wfs-states.js +++ b/examples/wfs-states.js @@ -5,7 +5,7 @@ function init() { map = new OpenLayers.Map("map"); var base = new OpenLayers.Layer.WMS("OpenLayers WMS", - "http://labs.metacarta.com/wms-c/Basic.py", + "http://tilecache.osgeo.org/wms-c/Basic.py", {layers: "basic"} ); map.addLayer(base); diff --git a/examples/wrapDateLine.html b/examples/wrapDateLine.html index fb365ffa6b..f93e080fb9 100644 --- a/examples/wrapDateLine.html +++ b/examples/wrapDateLine.html @@ -25,11 +25,6 @@ transparent: "true", format: "image/png"}, {wrapDateLine: true, reproject: false}); - /* TMS is broken, too */ - tms = new OpenLayers.Layer.TMS( "OpenStreetMap", - "http://labs.metacarta.com/wms-c/Basic.py/", - {layername: 'osm-map', type:'png', wrapDateLine: true} ); - /* WW doesn't quite work yet */ ww = new OpenLayers.Layer.WorldWind( "LANDSAT", "http://worldwind25.arc.nasa.gov/tile/tile.aspx", 2.25, 4,