From cdb510d671b944aa3cdd6d83e859623d435ccb35 Mon Sep 17 00:00:00 2001 From: Jeremy Maurer Date: Tue, 21 Jan 2025 16:32:53 -0600 Subject: [PATCH] Fix issue 693 --- tools/RAiDER/getStationDelays.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/RAiDER/getStationDelays.py b/tools/RAiDER/getStationDelays.py index 2a1a8e92..8848b37f 100644 --- a/tools/RAiDER/getStationDelays.py +++ b/tools/RAiDER/getStationDelays.py @@ -243,18 +243,25 @@ def get_station_data(inFile, dateList, gps_repo=None, numCPUs=8, outDir=None, re del statsFile # Add lat/lon/height info - origstatsFile = pd.read_csv(inFile) - statsFile = pd.read_csv(name) - statsFile = pd.merge( - left=statsFile, right=origstatsFile[['ID', 'Lat', 'Lon', 'Hgt_m']], how='left', left_on='ID', right_on='ID' + origstats = pd.read_csv(inFile) + keys = origstats.columns + lat_keys = ['lat', 'latitude', 'Lat', 'Latitude'] + lon_keys = ['lon', 'longitude', 'Lon', 'Longitude'] + lat_key = [ik for ik in lat_keys if ik in keys][0] + lon_key = [ik for ik in lon_keys if ik in keys][0] + origstats.rename(columns={lat_key: 'Lat', lon_key: 'Lon'}, inplace=True) + + stats = pd.read_csv(name) + stats = pd.merge( + left=stats, right=origstats[['ID', 'Lat', 'Lon', 'Hgt_m']], how='left', left_on='ID', right_on='ID' ) # drop all lines with nans and sort by station ID and year - statsFile.dropna(how='any', inplace=True) + stats.dropna(how='any', inplace=True) # drop all duplicate lines - statsFile.drop_duplicates(inplace=True) - statsFile.sort_values(['ID', 'Date']) - statsFile.to_csv(name, index=False) - del origstatsFile, statsFile + stats.drop_duplicates(inplace=True) + stats.sort_values(['ID', 'Date']) + stats.to_csv(name, index=False) + del origstats, stats def get_date(stationFile: Union[str, Path]) -> tuple[dt.datetime, int, int]: