소스 검색

r.in.wms: added missing .tif extension needed by gdalwarp (GDAL 2.3+), fixes trac https://trac.osgeo.org/grass/ticket/3702

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73778 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 6 년 전
부모
커밋
159e7d52f8
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      scripts/r.in.wms/wms_base.py

+ 3 - 2
scripts/r.in.wms/wms_base.py

@@ -381,7 +381,7 @@ class WMSBase:
         # reprojection of raster
         # reprojection of raster
         if self.proj_srs != self.proj_location:  # TODO: do it better
         if self.proj_srs != self.proj_location:  # TODO: do it better
             grass.message(_("Reprojecting raster..."))
             grass.message(_("Reprojecting raster..."))
-            self.temp_warpmap = grass.tempfile()
+            self.temp_warpmap = grass.tempfile() + '.tif'
 
 
             if int(os.getenv('GRASS_VERBOSE', '2')) <= 2:
             if int(os.getenv('GRASS_VERBOSE', '2')) <= 2:
                 nuldev = open(os.devnull, 'w+')
                 nuldev = open(os.devnull, 'w+')
@@ -512,7 +512,8 @@ class GRASSImporter:
         """
         """
         # importing temp_map into GRASS
         # importing temp_map into GRASS
         try:
         try:
-            grass.run_command('r.in.gdal',
+            # -o flag needed to overcome different ellipsoid representations
+            grass.run_command('r.in.gdal', flags='o',
                               quiet=True, overwrite=True,
                               quiet=True, overwrite=True,
                               input=raster, output=self.opt_output)
                               input=raster, output=self.opt_output)
         except CalledModuleError:
         except CalledModuleError: