Index: trunk/SDToolBox/extract_data.py =================================================================== diff -u -r209 -r210 --- trunk/SDToolBox/extract_data.py (.../extract_data.py) (revision 209) +++ trunk/SDToolBox/extract_data.py (.../extract_data.py) (revision 210) @@ -223,7 +223,7 @@ ) return ( indexes_lat_lon, - (vals[:, extracted_lat_pos], vals[:, extracted_lon_pos],), + (vals[:, extracted_lat_pos].data, vals[:, extracted_lon_pos].data,), ) class BaseExtractor(ABC): @@ -509,20 +509,18 @@ Lat: {nn_lat_lon_idx[0].astype(str)} Lon: {nn_lat_lon_idx[1].astype(str)}""" ) - corrected_nn_lat_lon_idx, idx_map = get_unique_indices(nn_lat_lon_idx) - output_data.data_dict[output_data.var_lat_key] = [ - value - for idx, value in enumerate(nn_values[self.lat_array_pos].tolist()) - if idx in idx_map + corrected_nn_lat_lon, idx_map = get_unique_indices(nn_values) + output_data.data_dict[output_data.var_lat_key] = corrected_nn_lat_lon[ + self.lat_array_pos ] - output_data.data_dict[output_data.var_lon_key] = [ - value - for idx, value in enumerate(nn_values[self.lon_array_pos].tolist()) - if idx in idx_map + output_data.data_dict[output_data.var_lon_key] = corrected_nn_lat_lon[ + self.lon_array_pos ] output_data.data_dict[output_data.var_station_idx_key] = idx_map + + corrected_nn_lat_lon_idx, _ = get_unique_indices(nn_lat_lon_idx) logging.info( - f"""Corrected nn indices: + f"""Corrected nn indices used for data extraction: Lat: {corrected_nn_lat_lon_idx[0].astype(str)} Lon: {corrected_nn_lat_lon_idx[1].astype(str)}""" )