[GRASS-SVN] r52484 - grass-addons/grass6/raster/r.in.wms2

[svn_grass at osgeo.org]

Author: turek
Date: 2012-07-31 04:08:29 -0700 (Tue, 31 Jul 2012)
New Revision: 52484

Modified:
   grass-addons/grass6/raster/r.in.wms2/r.in.wms2.html
   grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py
   grass-addons/grass6/raster/r.in.wms2/wms_drv.py
   grass-addons/grass6/raster/r.in.wms2/wms_gdal_drv.py
Log:
r.in.wms2: set default epsg 4326, module import bug fixed, small change in manual 

Modified: grass-addons/grass6/raster/r.in.wms2/r.in.wms2.html
===================================================================
--- grass-addons/grass6/raster/r.in.wms2/r.in.wms2.html	2012-07-31 11:02:03 UTC (rev 52483)
+++ grass-addons/grass6/raster/r.in.wms2/r.in.wms2.html	2012-07-31 11:08:29 UTC (rev 52484)
@@ -28,9 +28,8 @@
 r.in.wms2 -c mapserver=http://wms.cuzk.cz/wms.asp
 </pre></div>
 
-<h3>CUZK download</h3>
+<h3>Download raster data from WMS server (GetMap request)</h3>
 
-
 World extend data:
 
 <div class="code"><pre>

Modified: grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py
===================================================================
--- grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py	2012-07-31 11:02:03 UTC (rev 52483)
+++ grass-addons/grass6/raster/r.in.wms2/r.in.wms2.py	2012-07-31 11:08:29 UTC (rev 52484)
@@ -48,6 +48,7 @@
 #% key: srs
 #% type: integer
 #% description: EPSG number of source projection for request 
+#% answer:4326
 #% guisection: Request properties
 #%end
 

Modified: grass-addons/grass6/raster/r.in.wms2/wms_drv.py
===================================================================
--- grass-addons/grass6/raster/r.in.wms2/wms_drv.py	2012-07-31 11:02:03 UTC (rev 52483)
+++ grass-addons/grass6/raster/r.in.wms2/wms_drv.py	2012-07-31 11:08:29 UTC (rev 52484)
@@ -1,3 +1,5 @@
+import grass.script as grass
+
 try:
     from osgeo import gdal
     from osgeo import gdalconst 
@@ -9,8 +11,6 @@
 import numpy as Numeric
 Numeric.arrayrange = Numeric.arange
 
-import grass.script as grass
-
 from wms_base import WMSBase
 
 class WMSDrv(WMSBase):

Modified: grass-addons/grass6/raster/r.in.wms2/wms_gdal_drv.py
===================================================================
--- grass-addons/grass6/raster/r.in.wms2/wms_gdal_drv.py	2012-07-31 11:02:03 UTC (rev 52483)
+++ grass-addons/grass6/raster/r.in.wms2/wms_gdal_drv.py	2012-07-31 11:08:29 UTC (rev 52484)
@@ -1,4 +1,5 @@
 import os
+import grass.script as grass
 
 try:
     from osgeo import gdal
@@ -8,8 +9,6 @@
 
 import xml.etree.ElementTree as etree
 
-import grass.script as grass
-
 from wms_base import WMSBase
 
 class NullDevice():