Commit e9f93afc authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Bugfix for issue #13 (ValueError related to pandas.merge).

parent 10d9c448
Pipeline #3042 passed with stages
in 3 minutes and 23 seconds
...@@ -368,8 +368,8 @@ class Tie_Point_Grid(object): ...@@ -368,8 +368,8 @@ class Tie_Point_Grid(object):
bar.print_progress((i + 1) / len(GDF) * 100) bar.print_progress((i + 1) / len(GDF) * 100)
results[i, :] = self._get_spatial_shifts(coreg_kwargs) results[i, :] = self._get_spatial_shifts(coreg_kwargs)
# merge results with GDF # merge results with GDF
records = GeoDataFrame(np.array(results, np.object), records = GeoDataFrame(results,
columns=['POINT_ID', 'X_WIN_SIZE', 'Y_WIN_SIZE', 'X_SHIFT_PX', 'Y_SHIFT_PX', 'X_SHIFT_M', columns=['POINT_ID', 'X_WIN_SIZE', 'Y_WIN_SIZE', 'X_SHIFT_PX', 'Y_SHIFT_PX', 'X_SHIFT_M',
'Y_SHIFT_M', 'ABS_SHIFT', 'ANGLE', 'SSIM_BEFORE', 'SSIM_AFTER', 'Y_SHIFT_M', 'ABS_SHIFT', 'ANGLE', 'SSIM_BEFORE', 'SSIM_AFTER',
'SSIM_IMPROVED', 'RELIABILITY', 'LAST_ERR']) 'SSIM_IMPROVED', 'RELIABILITY', 'LAST_ERR'])
......
...@@ -63,9 +63,9 @@ def run_local_coreg(args): ...@@ -63,9 +63,9 @@ def run_local_coreg(args):
min_reliability=args.min_reliability, min_reliability=args.min_reliability,
rs_max_outlier=args.rs_max_outlier, rs_max_outlier=args.rs_max_outlier,
rs_tolerance=args.rs_tolerance, rs_tolerance=args.rs_tolerance,
# align_grids = args.align_grids, # align_grids=args.align_grids,
# match_gsd = args.match_gsd, # match_gsd=args.match_gsd,
# out_gsd = args.out_gsd, # out_gsd=args.out_gsd,
resamp_alg_calc=args.rsp_alg_deshift, resamp_alg_calc=args.rsp_alg_deshift,
resamp_alg_deshift=args.rsp_alg_calc, resamp_alg_deshift=args.rsp_alg_calc,
data_corners_ref=args.cor0, data_corners_ref=args.cor0,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment