wolfhece 2.1.50__py3-none-any.whl → 2.1.56__py3-none-any.whl

wolfhece/rem/REMMaker.py

@@ -1,13 +1,3 @@
-"""
-Author: HECE - University of Liege, Pierre Archambeau
-Date: 2024
-
-Copyright (c) 2024 University of Liege. All rights reserved.
-
-This script and its content are protected by copyright law. Unauthorized
-copying or distribution of this file, via any medium, is strictly prohibited.
-"""
-
 #!/usr/bin/env python
 import os
 import sys
@@ -228,8 +218,8 @@ class REMMaker(object):
         if self.count is not None and self.centerline_shp is None:
             raise ValueError(f'Obligation de donner un shapefile pour en sélectionner une géométrie.')
         if self.pres is not None:
-            gdal.Warp(f'{self.dem_name}_warp.tif', self.dem, xRes=self.pres, yRes=self.pres)
-            r = gdal.Open(f'{self.dem_name}_warp.tif', gdal.GA_ReadOnly)
+            gdal.Warp(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), self.dem, xRes=self.pres, yRes=self.pres)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), gdal.GA_ReadOnly)
         if self.bounds is not None:
             band = r.GetRasterBand(1)
             self.dem_array = band.ReadAsArray()
@@ -240,19 +230,19 @@ class REMMaker(object):
             min_x, max_x = sorted([upper_left_x, upper_left_x + x_size * cols])
             min_y, max_y = sorted([upper_left_y, upper_left_y + y_size * rows])
             if self.bounds[0] > min_x and self.bounds[1] > min_y and self.bounds[2] < max_x and self.bounds[3] < max_y:
-                gdal.Translate(f'{self.dem_name}_crop.tif', r, projWin=(self.bounds[0],self.bounds[3],self.bounds[2],self.bounds[1]))
-                r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+                gdal.Translate(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), r, projWin=(self.bounds[0],self.bounds[3],self.bounds[2],self.bounds[1]))
+                r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
             else:
                 raise ValueError(f"bounds choisi hors DEM. Redéfinir des limites contenues dans x={min_x,max_x:.3f} et y={min_y,max_y:.3f}")
         if self.count is not None:
             self.rivers:gpd.GeoDataFrame
             self.rivers = read_file(self.centerline_shp)
             upper_left_x, x_size, x_rot, upper_left_y, y_rot, y_size = r.GetGeoTransform()
-            gdal.Translate(f'{self.dem_name}_crop.tif', r, projWin=(self.rivers.bounds.iloc[self.count].minx-50*x_size,
+            gdal.Translate(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), r, projWin=(self.rivers.bounds.iloc[self.count].minx-50*x_size,
                                                                     self.rivers.bounds.iloc[self.count].maxy-50*y_size,
                                                                     self.rivers.bounds.iloc[self.count].maxx+50*x_size,
                                                                     self.rivers.bounds.iloc[self.count].miny+50*y_size))
-            r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
         self.proj = osr.SpatialReference(wkt=r.GetProjection())
         self.epsg_code = self.proj.GetAttrValue('AUTHORITY', 1)
         self.h_unit = self.proj.GetAttrValue('UNIT')
@@ -426,9 +416,9 @@ class REMMaker(object):
             self.river_coords = self.ix2coords(self.river_indices)
             self.river_wses = self.dem_array[self.river_indices]
         else:
-            self.rivers = read_file(f'{self.dem_name}_river_pts.shp')
+            self.rivers = os.path.join(self.out_dir, f'{self.dem_name}_river_pts.shp')
             self.rivers['curvi'] = self.river_curvi
-            self.rivers.to_file(f'{self.dem_name}_river_pts.shp', driver='ESRI Shapefile')
+            self.rivers.to_file(os.path.join(self.out_dir, f'{self.dem_name}_river_pts.shp'), driver='ESRI Shapefile')
             self.river_coords = np.array([curpt.xy for curpt in self.rivers.geometry])
             self.river_wses = np.array([curpt.z for curpt in self.rivers.geometry])
         return
@@ -463,9 +453,9 @@ class REMMaker(object):
         logging.info("Interpolating river elevation across DEM extent.")
         if not self.k:
             self.k = self.estimate_k()
-        self.rivers = read_file(f'{self.dem_name}_river_pts.shp')
+        self.rivers = read_file(self.river_shp)
         self.rivers['curvi'] = self.river_curvi
-        self.rivers.to_file(f'{self.dem_name}_river_pts.shp', driver='ESRI Shapefile')
+        self.rivers.to_file(self.river_shp, driver='ESRI Shapefile')
         logging.info(f"Using k = {self.k} nearest neighbors.")
         # coords to interpolate over (don't interpolate where DEM is null or on centerline where REM = 0)
         interp_indices = np.where(~(np.isnan(self.dem_array) | (self.centerline_array == 1)))
@@ -513,9 +503,9 @@ class REMMaker(object):
         if self.bounds is None and self.count is None:
             r = gdal.Open(self.dem, gdal.GA_ReadOnly)
         if self.bounds is not None or self.count is not None:
-            r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
         if self.pres is not None and self.bounds is None and self.count is None:
-            r = gdal.Open(f'{self.dem_name}_warp.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), gdal.GA_ReadOnly)
         driver = gdal.GetDriverByName("GTiff")
         rem = driver.CreateCopy(self.rem_ras, r, strict=0)
         # fill with REM array
@@ -565,9 +555,9 @@ class REMMaker(object):
         if self.bounds is None and self.count is None:
             dem_viz = RasterViz(self.dem, out_dir=self.cache_dir, out_ext=".tif")
         if self.bounds is not None or self.count is not None:
-            dem_viz = RasterViz(f'{self.dem_name}_crop.tif', out_dir=self.cache_dir, out_ext=".tif")
+            dem_viz = RasterViz(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), out_dir=self.cache_dir, out_ext=".tif")
         if self.pres is not None and self.bounds is None and self.count is None:
-            dem_viz = RasterViz(f'{self.dem_name}_warp.tif', out_dir=self.cache_dir, out_ext=".tif")
+            dem_viz = RasterViz(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), out_dir=self.cache_dir, out_ext=".tif")
         dem_viz.make_hillshade(multidirectional=True, z=z)
         # make color-relief of REM in cache dir
         rem_viz = RasterViz(self.rem_ras, out_dir=self.cache_dir, out_ext=".tif", make_png=make_png, make_kmz=make_kmz, *args, **kwargs)

wolfhece/rem/RasterViz.py

@@ -1,13 +1,3 @@
-"""
-Author: HECE - University of Liege, Pierre Archambeau
-Date: 2024
-
-Copyright (c) 2024 University of Liege. All rights reserved.
-
-This script and its content are protected by copyright law. Unauthorized
-copying or distribution of this file, via any medium, is strictly prohibited.
-"""
-
 #!/usr/bin/env python
 import os
 import sys
@@ -26,46 +16,46 @@ This script can be called from Python using its class/methods or as a CLI utilit
 
 CLI Usage:
 
-"python RasterViz.py viz_type [-z (default=1)] [-alt (default=45)] [-azim (default=315)] [-multidirectional] 
-    [-cmap (default=terrain)] [-out_ext tif | img (default=tif)] [-make_png] [-make_kmz] [-docker] [-shell] 
+"python RasterViz.py viz_type [-z (default=1)] [-alt (default=45)] [-azim (default=315)] [-multidirectional]
+    [-cmap (default=terrain)] [-out_ext tif | img (default=tif)] [-make_png] [-make_kmz] [-docker] [-shell]
     /path/to/dem"
 
 Options:
-    
-    viz_type: string corresponding to raster product to be produced, one of the following strings: 
+
+    viz_type: string corresponding to raster product to be produced, one of the following strings:
         ["hillshade", "slope", "aspect", "roughness", "color-relief", "hillshade-color"]
-    
+
     -z: only if using "hillshade" or "hillshade-color" viz_type,
         factor to scale/exaggerate vertical topographic differences. Default 1 (no rescale).
-    
-    -alt: only if using "hillshade" or "hillshade-color" viz_type, 
+
+    -alt: only if using "hillshade" or "hillshade-color" viz_type,
           altitude of light source in degrees [0-90]. Default 45.
-    
-    -azim: only if using "hillshade" or "hillshade-color" viz_type, 
+
+    -azim: only if using "hillshade" or "hillshade-color" viz_type,
            azimuth of light source in degrees [0-360]. Default 315.
-    
-    -multidirectional: only if using "hillshade" or "hillshade-color" viz_type. 
+
+    -multidirectional: only if using "hillshade" or "hillshade-color" viz_type.
                        Makes multidirectional hillshade, overriding alt and azim args.
-    
+
     -cmap: only if using "color-relief" viz_type, name of a matplotlib or seaborn colormap. Default "terrain".
            (see https://matplotlib.org/stable/gallery/color/colormap_reference.html)
-    
+
     -out_ext: the extension/file format to use for geodata outputs (tif or img). Default "tif".
-    
+
     -make_png: output a png version (EPSG:3857) of the viz_type in addition to the viz raster in source projection.
-    
+
     -make_kmz: output a kmz version of the viz_type in addition to the viz raster in source projection.
-    
+
     -docker: run GDAL commands from within the osgeo/gdal docker container. This makes it run slightly slower but will
              be needed to run all features if gdal install is on a version <2.2. If using docker, input path must be
              within the working directory path or a subdirectory.
-             
+
     -shell: call GDAL functions (gdaldem, gdal_translate, gdalwarp) as shell commands instead of using Python bindings.
             This may be faster than using pure Python but requires additional environment configuration.
 
     /path/to/dem.tif: path to input DEM, currently assumed to be in GeoTIFF format.
 
-Notes: Output file naming convention uses the DEM basename as a prefix, then viz_type and file extension. 
+Notes: Output file naming convention uses the DEM basename as a prefix, then viz_type and file extension.
        E.g. output.tin.tif --> output_hillshade.tif, output_hillshade.png, output_hillshade.kmz.
        Outputs are saved to the working directory.