[GRASS-SVN] r65835 - in grass/trunk/scripts/r.import: . testsuite testsuite/data
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 4 15:15:16 PDT 2015
Author: annakrat
Date: 2015-08-04 15:15:16 -0700 (Tue, 04 Aug 2015)
New Revision: 65835
Added:
grass/trunk/scripts/r.import/testsuite/
grass/trunk/scripts/r.import/testsuite/data/
grass/trunk/scripts/r.import/testsuite/data/data1.tif
grass/trunk/scripts/r.import/testsuite/data/data2.asc
grass/trunk/scripts/r.import/testsuite/data/data2.asc.aux.xml
grass/trunk/scripts/r.import/testsuite/data/data2.prj
grass/trunk/scripts/r.import/testsuite/test_r_import.py
Log:
r.import: add testsuite
Added: grass/trunk/scripts/r.import/testsuite/data/data1.tif
===================================================================
(Binary files differ)
Property changes on: grass/trunk/scripts/r.import/testsuite/data/data1.tif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: grass/trunk/scripts/r.import/testsuite/data/data2.asc
===================================================================
--- grass/trunk/scripts/r.import/testsuite/data/data2.asc (rev 0)
+++ grass/trunk/scripts/r.import/testsuite/data/data2.asc 2015-08-04 22:15:16 UTC (rev 65835)
@@ -0,0 +1,9 @@
+ncols 4
+nrows 3
+xllcorner 1544385.000000000000
+yllcorner 1553655.000000000000
+cellsize 30.000000000000
+NODATA_value 255
+ 22 22 21 21
+ 22 22 22 21
+ 21 22 22 22
Added: grass/trunk/scripts/r.import/testsuite/data/data2.asc.aux.xml
===================================================================
--- grass/trunk/scripts/r.import/testsuite/data/data2.asc.aux.xml (rev 0)
+++ grass/trunk/scripts/r.import/testsuite/data/data2.asc.aux.xml 2015-08-04 22:15:16 UTC (rev 65835)
@@ -0,0 +1,274 @@
+<PAMDataset>
+ <Metadata>
+ <MDI key="AREA_OR_POINT">Area</MDI>
+ <MDI key="DataType">Thematic</MDI>
+ </Metadata>
+ <PAMRasterBand band="1">
+ <ColorInterp>Palette</ColorInterp>
+ <ColorTable>
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="249" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="71" c2="107" c3="160" c4="255" />
+ <Entry c1="209" c2="221" c3="249" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="221" c2="201" c3="201" c4="255" />
+ <Entry c1="216" c2="147" c3="130" c4="255" />
+ <Entry c1="237" c2="0" c3="0" c4="255" />
+ <Entry c1="170" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="178" c2="173" c3="163" c4="255" />
+ <Entry c1="249" c2="249" c3="249" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="104" c2="170" c3="99" c4="255" />
+ <Entry c1="28" c2="99" c3="48" c4="255" />
+ <Entry c1="181" c2="201" c3="142" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="165" c2="140" c3="48" c4="255" />
+ <Entry c1="204" c2="186" c3="124" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="226" c2="226" c3="193" c4="255" />
+ <Entry c1="201" c2="201" c3="119" c4="255" />
+ <Entry c1="153" c2="193" c3="71" c4="255" />
+ <Entry c1="119" c2="173" c3="147" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="219" c2="216" c3="60" c4="255" />
+ <Entry c1="170" c2="112" c3="40" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="186" c2="216" c3="234" c4="255" />
+ <Entry c1="181" c2="211" c3="229" c4="255" />
+ <Entry c1="181" c2="211" c3="229" c4="255" />
+ <Entry c1="181" c2="211" c3="229" c4="255" />
+ <Entry c1="181" c2="211" c3="229" c4="255" />
+ <Entry c1="112" c2="163" c3="186" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ <Entry c1="0" c2="0" c3="0" c4="255" />
+ </ColorTable>
+ <Metadata>
+ <MDI key="RepresentationType">THEMATIC</MDI>
+ <MDI key="STATISTICS_MAXIMUM">22</MDI>
+ <MDI key="STATISTICS_MEAN">21.666666666667</MDI>
+ <MDI key="STATISTICS_MINIMUM">21</MDI>
+ <MDI key="STATISTICS_STDDEV">0.47140452079098</MDI>
+ </Metadata>
+ </PAMRasterBand>
+</PAMDataset>
Added: grass/trunk/scripts/r.import/testsuite/data/data2.prj
===================================================================
--- grass/trunk/scripts/r.import/testsuite/data/data2.prj (rev 0)
+++ grass/trunk/scripts/r.import/testsuite/data/data2.prj 2015-08-04 22:15:16 UTC (rev 65835)
@@ -0,0 +1 @@
+PROJCS["Albers_Conical_Equal_Area",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",29.5],PARAMETER["standard_parallel_2",45.5],PARAMETER["latitude_of_origin",23],PARAMETER["central_meridian",-96],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
Added: grass/trunk/scripts/r.import/testsuite/test_r_import.py
===================================================================
--- grass/trunk/scripts/r.import/testsuite/test_r_import.py (rev 0)
+++ grass/trunk/scripts/r.import/testsuite/test_r_import.py 2015-08-04 22:15:16 UTC (rev 65835)
@@ -0,0 +1,50 @@
+from grass.gunittest.case import TestCase
+from grass.gunittest.main import test
+
+
+class TestRImportRegion(TestCase):
+
+ imported = 'test_r_import_imported'
+
+ @classmethod
+ def setUpClass(cls):
+ cls.runModule('g.region', raster='elevation')
+
+ def tearDown(cls):
+ """Remove imported map after each test method"""
+ cls.runModule('g.remove', flags='f', type='raster',
+ name=cls.imported)
+
+ def test_import_estimate(self):
+ """Test e flag"""
+ self.assertModule('r.import', input='data/data2.asc', output=self.imported,
+ resample='nearest', flags='e')
+ self.assertRasterDoesNotExist(name=self.imported)
+
+ def test_import_same_proj_tif(self):
+ """Import tif in same proj, default params"""
+ self.assertModule('r.import', input='data/data1.tif', output=self.imported,
+ resample='bilinear')
+ reference = dict(north=223490, south=223390, east=636820, west=636710,
+ nsres=10, ewres=10, datatype='FCELL')
+ self.assertRasterFitsInfo(raster=self.imported, reference=reference)
+
+ def test_import_asc_custom_res(self):
+ """Import ASC in different projection, with specified resolution"""
+ self.assertModule('r.import', input='data/data2.asc', output=self.imported,
+ resample='nearest', resolution='value', resolution_value=30)
+ reference = dict(rows=3, cols=4,
+ nsres=30, ewres=30, datatype='CELL')
+ self.assertRasterFitsInfo(raster=self.imported, reference=reference, precision=1.1)
+
+ def test_import_asc_region_extent(self):
+ """Import ASC in different projection in specified region"""
+ self.runModule('g.region', raster='elevation', n=223655, s=223600)
+ self.assertModule('r.import', input='data/data2.asc', output=self.imported,
+ resample='nearest', extent='region', resolution='region')
+ reference = dict(north=223655, south=223600)
+ self.assertRasterFitsInfo(raster=self.imported, reference=reference, precision=1e-6)
+
+
+if __name__ == '__main__':
+ test()
More information about the grass-commit
mailing list