Reburn network

Author: sdunesme

fct/drainage/BorderFlats.py

@@ -109,12 +109,12 @@ def LabelBorderFlatsTile(row, col, params, tileset='default', **kwargs):
                 elevations[0, :],
                 elevations[:, -1],
                 np.flip(elevations[-1, :], axis=0),
-                np.flip(elevations[:, 0], axis=0)]),
+                np.flip(elevations[:, 0], axis=0)], dtype=object),
             labels=np.array([
                 labels[0, :],
                 labels[:, -1],
                 np.flip(labels[-1, :], axis=0),
-                np.flip(labels[:, 0], axis=0)]),
+                np.flip(labels[:, 0], axis=0)], dtype=object),
             flatindex=flatindex,
             graph=np.array(list(graph.items()), dtype=object)
         )

fct/drainage/Burn.py

@@ -26,9 +26,9 @@
     box
 )
 
-from .. import terrain_analysis as ta
-from ..config import config
-from ..rasterize import rasterize_linestringz
+from fct  import terrain_analysis as ta
+from fct.config import config
+from fct.rasterize import rasterize_linestringz
 
 # def DispatchHydrographyToTiles():
 
@@ -50,7 +50,7 @@
 #                 for feature in features:
 #                     fst.write(feature)
 
-def BurnTile(params, row, col, tileset='default'):
+def BurnTile(params, row, col, elevations=None, tileset='default'):
     """
     DOCME
     """
@@ -62,7 +62,9 @@ def BurnTile(params, row, col, tileset='default'):
 
     with rio.open(elevation_raster) as ds:
 
-        elevations = ds.read(1)
+        if elevations is None:
+            elevations = ds.read(1)
+
         height, width = elevations.shape
 
         if os.path.exists(hydrography):

fct/drainage/DepressionFill.py

@@ -23,17 +23,17 @@
 import fiona
 import fiona.crs
 
-from ..config import (
+from fct.config import (
     config,
     DatasetParameter,
     LiteralParameter
 )
-from .. import terrain_analysis as ta
-from .. import speedup
-from .Burn import BurnTile
+from fct import terrain_analysis as ta
+from fct import speedup
+from fct.drainage.Burn import BurnTile
 
 from multiprocessing import Pool
-from ..cli import starcall_nokwargs
+from fct.cli import starcall_nokwargs
 
 def tileindex(tileset='default'):
     """
@@ -133,7 +133,7 @@ def step(msg):
         if offset < 0:
             elevations = ds.read(1)
         else:
-            elevations = BurnTile(params, row, col, tileset=tileset)
+            elevations = BurnTile(params, row, col, elevations=None, tileset=tileset)
 
     step('Label flats')
 
@@ -142,6 +142,8 @@ def step(msg):
 
     step('Write filled DEM')
 
+    elevations = BurnTile(params, row, col, elevations, tileset=tileset) # Burn again filled elevations to avoid burned zone filling
+
     profile.update(
         compress='deflate',
         tiled='yes'
@@ -167,7 +169,7 @@ def step(msg):
             elevations[0, :],
             elevations[:, -1],
             np.flip(elevations[-1, :], axis=0),
-            np.flip(elevations[:, 0], axis=0)]),
+            np.flip(elevations[:, 0], axis=0)], dtype=object),
         labels=np.array([
             labels[0, :],
             labels[:, -1],