[mapserver-commits] r10529 - branches/branch-5-6/docs/en/tutorial
svn at osgeo.org
svn at osgeo.org
Tue Sep 28 15:19:23 EDT 2010
Author: jmckenna
Date: 2010-09-28 19:19:23 +0000 (Tue, 28 Sep 2010)
New Revision: 10529
Modified:
branches/branch-5-6/docs/en/tutorial/example1-1.txt
branches/branch-5-6/docs/en/tutorial/example1-2.txt
branches/branch-5-6/docs/en/tutorial/example1-3.txt
branches/branch-5-6/docs/en/tutorial/example1-4.txt
branches/branch-5-6/docs/en/tutorial/example1-5.txt
branches/branch-5-6/docs/en/tutorial/example1-6.txt
branches/branch-5-6/docs/en/tutorial/example1-7.txt
branches/branch-5-6/docs/en/tutorial/example1-8.txt
branches/branch-5-6/docs/en/tutorial/section1.txt
branches/branch-5-6/docs/en/tutorial/section2.txt
Log:
update links to new demo.mapserver.org host
Modified: branches/branch-5-6/docs/en/tutorial/example1-1.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-1.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-1.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -7,7 +7,7 @@
Map With A Single Layer
-----------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-1.map&layer=states&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-1.map&layer=states&mode=map
MapServer can create an image and dump it to a local directory or send it directly to the requesting web browser, as in this example. You can view it without the need for an html page, just enter this URL: `<http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-1.map&layer=states&mode=map>`_ (Remember to replace "<insert hostname or IP address here>" with your web server's name, e.g. "localhost", or its IP address, e.g. "127.0.0.1").
Modified: branches/branch-5-6/docs/en/tutorial/example1-2.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-2.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-2.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -6,11 +6,11 @@
Static Map with Two Layers
--------------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-2.map&layer=states_poly&layer=states_line&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-2.map&layer=states_poly&layer=states_line&mode=map
As in the first example, this image was generated by linking the source of the
<img> tag to this URL:
-`<http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-2.map&layer=states_poly&layer=states_line&mode=map>`_.
+`<http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-2.map&layer=states_poly&layer=states_line&mode=map>`_.
This is how most of the examples in this section work.
Anyway, you'll notice that the map here is the same as the first example. Yes,
Modified: branches/branch-5-6/docs/en/tutorial/example1-3.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-3.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-3.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -9,7 +9,7 @@
By using non-spatial attribute information in the data, we can create a map
like this:
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-3.map&layer=states_poly&layer=states_line&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-3.map&layer=states_poly&layer=states_line&mode=map
MapFile Structure
#################
Modified: branches/branch-5-6/docs/en/tutorial/example1-4.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-4.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-4.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -8,7 +8,7 @@
We can also add labels to our map...
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-4.map&layer=states_poly&layer=states_line&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-4.map&layer=states_poly&layer=states_line&mode=map
MapServer has a very flexible labeling engine. It supports native bitmap as
well as truetype fonts. Font scaling is supported with truetype. The labeling
Modified: branches/branch-5-6/docs/en/tutorial/example1-5.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-5.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-5.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -6,7 +6,7 @@
Adding a Raster Layer
---------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-5.map&layer=states&layer=states_line&layer=states_label&layer=modis&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-5.map&layer=states&layer=states_line&layer=states_label&layer=modis&mode=map
In addition to vector data support (point, lines, polygons, and annotations),
MapServer can also display raster data. Through the use of GDAL library, MapServer
Modified: branches/branch-5-6/docs/en/tutorial/example1-6.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-6.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-6.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -6,7 +6,7 @@
Defining Projections and Extents
--------------------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-6.map&layer=states&layer=states_label&layer=modis&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-6.map&layer=states&layer=states_label&layer=modis&mode=map
Whoa! What happened here?
Modified: branches/branch-5-6/docs/en/tutorial/example1-7.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-7.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-7.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -6,7 +6,7 @@
Adding OGC WMS Layers
---------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-7.map&layers=states+states_label+modis_jpl&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-7.map&layers=states+states_label+modis_jpl&mode=map
Another exciting feature of MapServer is its ability to use layers from other
map servers. In this case, a MapServer application becomes a WMS (or WFS)
Modified: branches/branch-5-6/docs/en/tutorial/example1-8.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/example1-8.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/example1-8.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -6,7 +6,7 @@
Changing the Map's Output Format
--------------------------------
-.. image:: http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-8.map&layers=states+states_label+modis&map.imagetype=AGG&mode=map
+.. image:: http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-8.map&layers=states+states_label+modis&map.imagetype=AGG&mode=map
Depending on the format you choose, the image may not display on your browser.
If the link fails to display on your browser, right click on the graphic above
@@ -34,6 +34,6 @@
----
-:ref:`Back to Example 1.7 <example1-7>` | `Proceed to Example 1.9 <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
+:ref:`Back to Example 1.7 <example1-7>` | `Proceed to Example 1.9 <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
----
\ No newline at end of file
Modified: branches/branch-5-6/docs/en/tutorial/section1.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/section1.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/section1.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -28,7 +28,7 @@
- :ref:`Example 1.8 - A different output format <example1-8>`
- MapServer not only generates static maps, it can also create interactive maps...
- - `Example 1.9 - The difference between map and browse mode <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
+ - `Example 1.9 - The difference between map and browse mode <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
----
Modified: branches/branch-5-6/docs/en/tutorial/section2.txt
===================================================================
--- branches/branch-5-6/docs/en/tutorial/section2.txt 2010-09-28 16:15:53 UTC (rev 10528)
+++ branches/branch-5-6/docs/en/tutorial/section2.txt 2010-09-28 19:19:23 UTC (rev 10529)
@@ -44,19 +44,19 @@
So, let's build an interactive interface for our application...
- Users of a web mapping application should be able to pan and zoom on the map:
- `Example 2.1 - Pan and Zoom Controls <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv.exe&map_web=template+example2-1.html>`_
+ `Example 2.1 - Pan and Zoom Controls <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv&map_web=template+example2-1.html>`_
- They also should be able to turn on and off layers on a map:
- `Example 2.2 - Layer Control <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv.exe&map_web=template+example2-2.html>`_
+ `Example 2.2 - Layer Control <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv&map_web=template+example2-2.html>`_
- A map should always include a scalebar.
- `Example 2.3 - Adding a Scalebar <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv.exe&map_web=template+example2-3.html>`_
+ `Example 2.3 - Adding a Scalebar <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv&map_web=template+example2-3.html>`_
- If users are to navigate through the map, a reference map should be provided:
- `Example 2.4 - Adding a Reference Map <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv.exe&map_web=template+example2-4.html>`_
+ `Example 2.4 - Adding a Reference Map <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv&map_web=template+example2-4.html>`_
- The map should include a legend.
- `Example 2.5- Adding a Legend <http://demo.mapserver.org/cgi-bin/mapserv.exe?map=/ms4w/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv.exe&map_web=template+example2-5.html>`_
+ `Example 2.5- Adding a Legend <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/fgs/apps/tutorial/htdocs/example2.map&layer=states&zoom=0&mode=browse&root=/tutorial&program=/cgi-bin/mapserv&map_web=template+example2-5.html>`_
----
More information about the mapserver-commits
mailing list