[mapserver-commits] r12083 - in branches/branch-6-0/docs: _static en

[svn at osgeo.org]

Author: jmckenna
Date: 2011-08-21 13:20:21 -0700 (Sun, 21 Aug 2011)
New Revision: 12083

Modified:
   branches/branch-6-0/docs/_static/ol.js
   branches/branch-6-0/docs/en/index.txt
Log:
enable use of mod_geocache for the OL viewer - thanks Mike and Jeff

Modified: branches/branch-6-0/docs/_static/ol.js
===================================================================
--- branches/branch-6-0/docs/_static/ol.js	2011-08-21 19:42:34 UTC (rev 12082)
+++ branches/branch-6-0/docs/_static/ol.js	2011-08-21 20:20:21 UTC (rev 12083)
@@ -58,7 +58,10 @@
      
         map = new OpenLayers.Map( 'map' );
 
-        var wms = new OpenLayers.Layer.WMS( "WMS","http://demo.mapserver.org/cgi-bin/foss4g?",
+        //use mod_geocache
+        var wms = new OpenLayers.Layer.WMS( "WMS","http://demo.mapserver.org:8081/geocache?",
+        
+        //var wms = new OpenLayers.Layer.WMS( "WMS","http://demo.mapserver.org/cgi-bin/foss4g?",
         {
         /*
         var wms = new OpenLayers.Layer.WMS( "WMS",
@@ -67,8 +70,8 @@
                 {map: 'D:/ms4w/apps/osm/map/osm.map',*/
 
 
-        layers: 'default',
-        format: 'aggpng24',
+        layers: 'osm-denver',
+        format: 'png',
         transparent: 'off'},
         {maxExtent: new OpenLayers.Bounds(-105.208290,39.542378,-104.769779,39.980889),
         scales: [5000,10000,25000,50000,100000,250000,500000,
@@ -78,7 +81,6 @@
         ratio:1,
         wrapDateLine: true,
         isBaselayer:true,
-        singleTile:true,
         transitionEffect:'resize'} );     
 
         map.addLayers([wms]);

Modified: branches/branch-6-0/docs/en/index.txt
===================================================================
--- branches/branch-6-0/docs/en/index.txt	2011-08-21 19:42:34 UTC (rev 12082)
+++ branches/branch-6-0/docs/en/index.txt	2011-08-21 20:20:21 UTC (rev 12083)
@@ -28,18 +28,16 @@
 
 .. raw:: html
 
-    <!--
     <script src="_static/openlayers/OpenLayers.js"></script>
     <script src="_static/ol.js"></script>
     <table style="height:450px;width:100%"><tr>
     <td id="olmaptd" width="100%" style="width:100%;height:100%;padding-top:25px;text-align:right;">
     <div id="map" style="width:100%;height:100%;margin:0px;"></div>
     <span style="width:100%;text-align:right;font-size:x-small;">
-    Denver, USA.  Home of <a href="http://2011.foss4g.org/">FOSS4G 2011</a>. Map data by <a href="http://openstreetmap.org">openstreetmap</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)
+    Denver, USA.  Home of <a href="http://2011.foss4g.org/">FOSS4G 2011</a>. Map data by <a href="http://openstreetmap.org">openstreetmap</a> Caching by <a href="http://mapserver.org/development/rfc/ms-rfc-71.html">Mod-Geocache</a> (<a href="http://trac.osgeo.org/mapserver/wiki/RenderingOsmData">more&hellip;</a>)
     </span>
     </td>
     </tr></table>
-    -->
 
 Announcements
 -------------------------------------------------------------------------------