[mapserver-commits] r10563 - branches/branch-5-6/docs/en/ogc

svn at osgeo.org svn at osgeo.org
Fri Oct 1 09:21:59 EDT 2010 

Author: jmckenna
Date: 2010-10-01 13:21:59 +0000 (Fri, 01 Oct 2010)
New Revision: 10563

Modified:
   branches/branch-5-6/docs/en/ogc/wms_client.txt
   branches/branch-5-6/docs/en/ogc/wms_server.txt
Log:
use cgi wrapper in demo.mapserver.org examples

Modified: branches/branch-5-6/docs/en/ogc/wms_client.txt
===================================================================
--- branches/branch-5-6/docs/en/ogc/wms_client.txt	2010-09-30 19:59:55 UTC (rev 10562)
+++ branches/branch-5-6/docs/en/ogc/wms_client.txt	2010-10-01 13:21:59 UTC (rev 10563)
@@ -185,7 +185,7 @@
       NAME "country_bounds"
       TYPE RASTER
       STATUS ON
-      CONNECTION "http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map"
+      CONNECTION "http://demo.mapserver.org/cgi-bin/wms?"
       CONNECTIONTYPE WMS
       METADATA
         "wms_srs"             "EPSG:4326"
@@ -449,7 +449,7 @@
      TYPE RASTER
      STATUS ON
      CONNECTIONTYPE WMS
-     CONNECTION "http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&VERSION=1.1.0&LAYERS=bluemarble&FORMAT=image/png"
+     CONNECTION "http://demo.mapserver.org/cgi-bin/wms?VERSION=1.1.0&LAYERS=bluemarble&FORMAT=image/png"
      PROJECTION
        "init=epsg:4326"
      END

Modified: branches/branch-5-6/docs/en/ogc/wms_server.txt
===================================================================
--- branches/branch-5-6/docs/en/ogc/wms_server.txt	2010-09-30 19:59:55 UTC (rev 10562)
+++ branches/branch-5-6/docs/en/ogc/wms_server.txt	2010-10-01 13:21:59 UTC (rev 10563)
@@ -327,7 +327,7 @@
 Here is a working GetCapabilities request (note that the SERVICE parameter is 
 required for all GetCapabilities requests):
 
-http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities
+http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities
 
 This should return a document of MIME type application/vnd.ogc.wms_xml, so your 
 browser is likely going to prompt you to save the file. Save it and open it in a 
@@ -625,10 +625,10 @@
 -------------------
 
 Users can use the CRS:84 coordinate system and order the BBOX coordinates as long/lat: 
-- ...&CRS=CRS:84&BBOX=-180.0,-90.0,180.0,90.0&... `(example request) <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-180,-90,180,90&CRS=CRS:84&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=,&FORMAT=image/png&DPI=96&TRANSPARENT=true>`__
+- ...&CRS=CRS:84&BBOX=-180.0,-90.0,180.0,90.0&... `(example request) <http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-180,-90,180,90&CRS=CRS:84&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=,&FORMAT=image/png&DPI=96&TRANSPARENT=true>`__
 
 Users can also use the ESPG:4326 coordinates and use the axis odering of lat/long:
-- ...&EPSG:4326&BBOX=-90.0,-180.0,90,180.0&... `(example request) <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-90,-180,90,180&CRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=,&FORMAT=image/png&DPI=96&TRANSPARENT=true>`__
+- ...&EPSG:4326&BBOX=-90.0,-180.0,90,180.0&... `(example request) <http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-90,-180,90,180&CRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=,&FORMAT=image/png&DPI=96&TRANSPARENT=true>`__
 
 
 Other notable changes
@@ -1344,9 +1344,9 @@
 .. _`owsview`: http://devgeo.cciw.ca/owsview
 .. _`uDig`: http://udig.refractions.net/
 .. _`WMS 1.1.1 section 6.2.2`: http://portal.opengeospatial.org/files/?artifact_id=1081&version=1&format=pdf
-.. _`valid request`: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=-180,-90,180,90&SRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=&FORMAT=image/png&TRANSPARENT=true
-.. _`text/plain`: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=text/plain&X=229&Y=280
-.. _`text/html`: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=text/html&X=229&Y=280
-.. _`gml`: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/ogc-demos/map/wms.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=gml&X=229&Y=280
+.. _`valid request`: http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=-180,-90,180,90&SRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,cities&STYLES=&FORMAT=image/png&TRANSPARENT=true
+.. _`text/plain`: http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=text/plain&X=229&Y=280
+.. _`text/html`: http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=text/html&X=229&Y=280
+.. _`gml`: http://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetFeatureInfo&BBOX=-11.332970,24.121208,47.584718,57.965035&SRS=EPSG:4326&WIDTH=1001&HEIGHT=575&LAYERS=cities&STYLES=&FORMAT=image/png&TRANSPARENT=true&QUERY_LAYERS=cities&INFO_FORMAT=gml&X=229&Y=280
 .. _`Styled Layer Descriptor profile of the Web Map Service Implementation Specification`: http://portal.opengeospatial.org/files/index.php?artifact_id=22364
 .. _`Symbology Encoding Implementation Specification`: http://portal.opengeospatial.org/files/index.php?artifact_id=16700

More information about the mapserver-commits mailing list