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

Revised previous commit.

parent 6e70d16d
Pipeline #3228 passed with stages
in 4 minutes and 9 seconds
......@@ -374,8 +374,8 @@ class Tie_Point_Grid(object):
'Y_SHIFT_M', 'ABS_SHIFT', 'ANGLE', 'SSIM_BEFORE', 'SSIM_AFTER',
'SSIM_IMPROVED', 'RELIABILITY', 'LAST_ERR'])
GDF = GDF.astype(np.object) # must be equal to records.dtypes; We need np.object due to None values
GDF = GDF.merge(records, on='POINT_ID', how="inner")
# merge DataFrames (dtype must be equal to records.dtypes; We need np.object due to None values)
GDF = GDF.astype(np.object).merge(records.astype(np.object), on='POINT_ID', how="inner")
GDF = GDF.fillna(int(self.outFillVal))
if not self.q:
......
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