[GRASS-SVN] r74165 - in grass/branches/releasebranch_7_4/scripts: r.in.wms v.in.wfs
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Mar 6 06:14:14 PST 2019
Author: neteler
Date: 2019-03-06 06:14:14 -0800 (Wed, 06 Mar 2019)
New Revision: 74165
Added:
grass/branches/releasebranch_7_4/scripts/r.in.wms/r_in_wms_sentinel2.jpg
Modified:
grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.html
grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.py
grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_drv.py
grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_gdal_drv.py
grass/branches/releasebranch_7_4/scripts/v.in.wfs/v.in.wfs.py
Log:
r.in.wms, v.in.wfs: msg cosmetics; keywords added; Sentinel-2 screenshot added; some examples updated (trunk r74163)
Modified: grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.html
===================================================================
--- grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.html 2019-03-06 14:13:47 UTC (rev 74164)
+++ grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.html 2019-03-06 14:14:14 UTC (rev 74165)
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>
<em>r.in.wms</em> handles all of downloading and importing raster data
-from an <a href="http://www.opengeospatial.org/standards/wms">OGC
+from <a href="http://www.opengeospatial.org/standards/wms">OGC
WMS</a> and <a href="http://www.opengeospatial.org/standards/wmts">OGC
WMTS</a> web mapping servers. It only needs be told the
desired data to collect (bounds and resolution) via a region, the
@@ -80,10 +80,16 @@
r.in.wms url="https://tiles.maps.eox.at/wms?" layers=s2cloudless output=sentinel2 format=png
</pre></div>
+<div align="center" style="margin: 10px">
+<a href="r_in_wms_sentinel2.jpg"><img src="r_in_wms_sentinel2.jpg" width="600px" height="531px"></a><br>
+<i>Figure: Raleigh (NC, USA) seen by Sentinel-2 (10m resolution; image courtesy: EOX)</i>
+</div>
+
<h4>OGC WMTS Example</h4>
<div class="code"><pre>
-r.in.wms url="http://gpp3-wxs.ign.fr/yourAPIkey/geoportail/wmts" layers=ORTHOIMAGERY.ORTHOPHOTOS output=orthophoto srs=3857 format=jpeg driver=WMTS_GRASS style=normal password="*" username="*"
+r.in.wms url="http://gpp3-wxs.ign.fr/yourAPIkey/geoportail/wmts" layers=ORTHOIMAGERY.ORTHOPHOTOS \
+ output=orthophoto srs=3857 format=jpeg driver=WMTS_GRASS style=normal password="*" username="*"
</pre></div>
Note: username, password and API key can be obtained from <a href="http://api.ign.fr/">IGN API</a> website
@@ -95,15 +101,16 @@
</pre></div>
<div class="code"><pre>
-r.in.wms url="http://geoportal.cuzk.cz/WMTS_ORTOFOTO/WMTService.aspx" layers=orto output=ortofoto srs=3857 format=jpeg driver=WMTS_GRASS style=default
+r.in.wms url="http://geoportal.cuzk.cz/WMTS_ORTOFOTO/WMTService.aspx" layers=orto output=ortofoto \
+ srs=3857 format=jpeg driver=WMTS_GRASS style=default
</pre></div>
-Note: data are provided by <a href="http://cuzk.cz/Dokument.aspx?PRARESKOD=998&MENUID=10384&AKCE=DOC:10-ENGLISH">Czech office for surveying, mapping and cadastre</a>.
+Note: data are provided by
+<a href="https://cuzk.cz/en">Czech office for surveying, mapping and cadastre</a>.
<h2>REQUIREMENTS</h2>
-<em>r.in.wms</em>
-requires the <a href="http://www.gdal.org/gdalwarp.html">gdalwarp</a>
+<em>r.in.wms</em> requires the <a href="https://www.gdal.org/gdalwarp.html">gdalwarp</a>
utility from the GDAL/OGR library.
<h2>REFERENCES</h2>
@@ -129,7 +136,7 @@
<h2>AUTHOR</h2>
-Stepan Turek, Czech Technical University in Prague, Czech Republic
+Stepan Turek, Czech Technical University in Prague, Czech Republic<br>
(bachelor's final project 2012, mentor: Martin Landa)
<p>
Modified: grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.py 2019-03-06 14:13:47 UTC (rev 74164)
+++ grass/branches/releasebranch_7_4/scripts/r.in.wms/r.in.wms.py 2019-03-06 14:14:14 UTC (rev 74165)
@@ -13,10 +13,12 @@
"""
#%module
-#% description: Downloads and imports data from WMS/WMTS/NASA OnEarth server.
+#% description: Downloads and imports data from OGC WMS and OGC WMTS web mapping servers.
#% keyword: raster
#% keyword: import
#% keyword: OGC web services
+#% keyword: OGC WMS
+#% keyword: OGC WMTS
#%end
#%option
Copied: grass/branches/releasebranch_7_4/scripts/r.in.wms/r_in_wms_sentinel2.jpg (from rev 74163, grass/trunk/scripts/r.in.wms/r_in_wms_sentinel2.jpg)
===================================================================
(Binary files differ)
Modified: grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_drv.py
===================================================================
--- grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_drv.py 2019-03-06 14:13:47 UTC (rev 74164)
+++ grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_drv.py 2019-03-06 14:14:14 UTC (rev 74165)
@@ -30,7 +30,7 @@
from osgeo import gdal
from osgeo import gdalconst
except:
- grass.fatal(_("Unable to load GDAL python bindings"))
+ grass.fatal(_("Unable to load GDAL Python bindings (requires package 'python-gdal' being installed)"))
import numpy as Numeric
Numeric.arrayrange = Numeric.arange
Modified: grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_gdal_drv.py
===================================================================
--- grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_gdal_drv.py 2019-03-06 14:13:47 UTC (rev 74164)
+++ grass/branches/releasebranch_7_4/scripts/r.in.wms/wms_gdal_drv.py 2019-03-06 14:14:14 UTC (rev 74165)
@@ -24,7 +24,7 @@
from osgeo import gdal
from osgeo import gdalconst
except:
- grass.fatal(_("Unable to load GDAL Python bindings"))
+ grass.fatal(_("Unable to load GDAL Python bindings (requires package 'python-gdal' being installed)"))
import xml.etree.ElementTree as etree
Modified: grass/branches/releasebranch_7_4/scripts/v.in.wfs/v.in.wfs.py
===================================================================
--- grass/branches/releasebranch_7_4/scripts/v.in.wfs/v.in.wfs.py 2019-03-06 14:13:47 UTC (rev 74164)
+++ grass/branches/releasebranch_7_4/scripts/v.in.wfs/v.in.wfs.py 2019-03-06 14:14:14 UTC (rev 74165)
@@ -27,6 +27,7 @@
#% keyword: vector
#% keyword: import
#% keyword: OGC web services
+#% keyword: OGC WFS
#%end
#%option
#% key: url
More information about the grass-commit
mailing list