diff --git a/fct/height/HeightAboveNearestDrainage.py b/fct/height/HeightAboveNearestDrainage.py index faa7815..38322fd 100644 --- a/fct/height/HeightAboveNearestDrainage.py +++ b/fct/height/HeightAboveNearestDrainage.py @@ -27,18 +27,17 @@ import fiona import fiona.crs -from .. import terrain_analysis as ta -from .. import speedup -from ..config import ( - config, +from fct import terrain_analysis as ta +from fct import speedup +from fct.config import ( LiteralParameter, DatasetParameter ) -from ..config.descriptors import DatasetResolver -from ..rasterize import rasterize_linestringz -# from ..swath import nearest_value_and_distance -from ..measure.Measurement import nearest_value_and_distance -from ..cli import starcall +from fct.config.descriptors import DatasetResolver +from fct.rasterize import rasterize_linestringz +# from fct.swath import nearest_value_and_distance +from fct.measure.Measurement import nearest_value_and_distance +from fct.cli import starcall class Parameters: """ @@ -209,7 +208,7 @@ def accept_pixel(i, j): if refaxis_pixels: nearest, reference, distance = nearest_value_and_distance( - np.array(refaxis_pixels), + np.array(refaxis_pixels, dtype='float32'), mask, ds.nodata) diff --git a/fct/profiles/SwathProfile.py b/fct/profiles/SwathProfile.py index 93dfdb8..e8a223c 100644 --- a/fct/profiles/SwathProfile.py +++ b/fct/profiles/SwathProfile.py @@ -197,7 +197,7 @@ def SwathProfileUnit( logger.error('Window error on swath (%d, %f)', axis, measure) return None - mask = (nearest == float(axis)) & (swaths == float(swath)) & (values != nodata) + mask = (nearest.astype('float32') == float(axis)) & (swaths.astype('float32') == float(swath)) & (values != nodata) if np.sum(mask) == 0: return None