[GRASS-SVN] r69846 - grass/branches/releasebranch_7_2/scripts/r.in.wms

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-11-17 02:26:42 -0800 (Thu, 17 Nov 2016)
New Revision: 69846

Modified:
   grass/branches/releasebranch_7_2/scripts/r.in.wms/r.in.wms.html
Log:
r.in.wms manual: examples cleanup

Modified: grass/branches/releasebranch_7_2/scripts/r.in.wms/r.in.wms.html
===================================================================
--- grass/branches/releasebranch_7_2/scripts/r.in.wms/r.in.wms.html	2016-11-17 10:25:03 UTC (rev 69845)
+++ grass/branches/releasebranch_7_2/scripts/r.in.wms/r.in.wms.html	2016-11-17 10:26:42 UTC (rev 69846)
@@ -13,9 +13,7 @@
 
 To understand the data you are getting it is necessary to look at the
 capabilities of the WMS server. This should be available via a capabilities
-request. This is an
-<a href="http://wms.jpl.nasa.gov/wms.cgi?request=GetCapabilities">example
-capabilities request to NASA's OnEarth server</a>.
+request (see examples)
 
 <p>
 When using GDAL WMS driver (<b>driver=WMS_GDAL</b>), the GDAL library
@@ -23,10 +21,10 @@
 see <a href="http://gdal.org/frmt_wms.html">GDAL WMS</a> manual page
 for details.
 
-<h3>NASA OnEarth Tiled WMS</h3>
+<h3>Tiled WMS</h3>
 
-Into parameter <b>layers</b> insert name of <i>TiledGroup</i> from
-Tile Service file. Time variable is possible to specify
+Into the parameter <b>layers</b> the name of the <i>TiledGroup</i> need to
+be inserted from Tile Service file. Time variable can be specified
 in <b>urlparams</b> parameter,
 e.g: <tt>urlparams='time=2012-1-1'</tt>.
 
@@ -48,20 +46,16 @@
 <h4>Open Street Map</h4>
 
 <div class="code"><pre>
+# OSM
 g.region n=90 s=-90 w=-180 e=180 res=0:10:00 -p
 r.in.wms url=http://watzmann-geog.urz.uni-heidelberg.de/cached/osm layers=osm_auto:all output=osm format=png
 </pre></div>
 
 <div class="code"><pre>
+# OSM
 r.in.wms url=http://irs.gis-lab.info layers=osm output=osm format=png
 </pre></div>
 
-More OSM WMS servers can be found online, e.g. on the OSM wiki in a 
-<a href="http://wiki.openstreetmap.org/wiki/WMS#Public_WMS_Servers">OSM WMS Servers list</a>
-and on the <a href="http://wiki.openstreetmap.org/wiki/OSM-WMS-EUROPE">OSM-WMS-EUROPE</a> page.
-
-<h4>World data</h4>
-
 <div class="code"><pre>
 # OSM Overlay WMS (can be used as an overlay for other maps)
 r.in.wms url="http://ows.mundialis.de/services/service?" layer=OSM-Overlay-WMS output=osm_overlay format=png
@@ -73,12 +67,18 @@
 r.in.wms url="http://ows.mundialis.de/services/service?" layer=TOPO-WMS output=topo format=png
 </pre></div>
 <p>
+More OSM WMS servers can be found online, e.g. on the OSM wiki in a
+<a href="http://wiki.openstreetmap.org/wiki/WMS#Public_WMS_Servers">OSM WMS Servers list</a>
+and on the <a href="http://wiki.openstreetmap.org/wiki/OSM-WMS-EUROPE">OSM-WMS-EUROPE</a> page.
 
+<h4>Image data</h4>
+
 <div class="code"><pre>
-r.in.wms url=http://iceds.ge.ucl.ac.uk/cgi-bin/icedswms layers=bluemarble,landsat_1_01 styles=default,default output=landsat srs=4326 format=png 
+# Landsat
+r.in.wms url=http://irs.gis-lab.info layers=landsat output=landsat format=png
 </pre></div>
 
-Note: server supports only WMS 1.1.1
+<h4>Countries and coastlines</h4>
 
 <div class="code"><pre>
 r.in.wms url=http://www2.demis.nl/WMS/wms.asp layers=Countries,Borders,Coastline output=countries srs=4326 format=png 
@@ -92,12 +92,6 @@
 
 Note: username, password and API key can be get from <a href="http://api.ign.fr/">IGN API</a> website
 
-<h4>NASA OnEarth Tiled WMS Example</h4>
-
-<div class="code"><pre>
-r.in.wms output=global_mosaic url=http://onearth.jpl.nasa.gov/wms.cgi layers='Global Mosaic, visual' driver=OnEarth_GRASS 
-</pre></div>
-
 <h4>Data covering the Czech Republic</h4>
 
 <div class="code"><pre>