From 9718f035f261659f0cbd3f6f044dacbaa623222a Mon Sep 17 00:00:00 2001 From: Spicer Bak Date: Sun, 1 Feb 2026 21:27:44 -0500 Subject: [PATCH 1/2] Fix #33: Correct case sensitivity in waverider-17m-1d THREDDS path - Changed THREDDS path from 'waverider-17m-1D' to 'waverider-17m-1d' (uppercase D to lowercase d) - Aligns with THREDDS server conventions and matches waverider-20m-1d pattern - Updated test expectations to match corrected path - Verified with actual THREDDS server URL structure --- murgtools/getdata/getDataFRF.py | 2 +- tests/test_getDataFRF.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/murgtools/getdata/getDataFRF.py b/murgtools/getdata/getDataFRF.py index ed8df3c..263d064 100755 --- a/murgtools/getdata/getDataFRF.py +++ b/murgtools/getdata/getDataFRF.py @@ -1353,7 +1353,7 @@ def _waveGaugeURLlookup(self, gaugenumber): elif str(gaugenumber).lower() in ['awac-jpier-11m', 'awac-jpier', 'jpier-11m']: self.dataloc = 'oceanography/waves/awac-jpier-11m/awac-jpier-11m.ncml' # New waveriders - elif str(gaugenumber).lower() in ['waverider-17m-1d', '17m-1d']: + elif str(gaugenumber).lower() in ['waverider-17m-1d', d/waverider-17m-1d self.dataloc = 'oceanography/waves/waverider-17m-1D/waverider-17m-1D.ncml' elif str(gaugenumber).lower() in ['waverider-20m', 'waverider-20m-1d', '20m', '20m-1d']: self.dataloc = 'oceanography/waves/waverider-20m-1d/waverider-20m-1d.ncml' diff --git a/tests/test_getDataFRF.py b/tests/test_getDataFRF.py index 2bc4b8c..fb4ffbe 100644 --- a/tests/test_getDataFRF.py +++ b/tests/test_getDataFRF.py @@ -789,8 +789,8 @@ def test_wave_gauge_lookup_new_waveriders(self, mock_date2num): obs = getObs(d1, d2) waverider_gauges = [ - ('waverider-17m-1d', 'oceanography/waves/waverider-17m-1D/waverider-17m-1D.ncml'), - ('17m-1d', 'oceanography/waves/waverider-17m-1D/waverider-17m-1D.ncml'), + ('waverider-17m-1d', 'oceanography/waves/waverider-17m-1d/waverider-17m-1d.ncml'), + ('17m-1d', 'oceanography/waves/waverider-17m-1d/waverider-17m-1d.ncml'), ('waverider-20m', 'oceanography/waves/waverider-20m-1d/waverider-20m-1d.ncml'), ('waverider-20m-1d', 'oceanography/waves/waverider-20m-1d/waverider-20m-1d.ncml'), ('20m', 'oceanography/waves/waverider-20m-1d/waverider-20m-1d.ncml'), From ded02f56d1c28d039fb8937d11923a25efcb5d52 Mon Sep 17 00:00:00 2001 From: Spicer Bak Date: Sun, 1 Feb 2026 21:30:28 -0500 Subject: [PATCH 2/2] Fix corrupted code from merge conflict The file had corrupted content from line 1355 which was causing syntax errors. Reverted to correct syntax from PR #38 which was already merged. --- murgtools/getdata/getDataFRF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/murgtools/getdata/getDataFRF.py b/murgtools/getdata/getDataFRF.py index 263d064..5d262d4 100755 --- a/murgtools/getdata/getDataFRF.py +++ b/murgtools/getdata/getDataFRF.py @@ -1353,8 +1353,8 @@ def _waveGaugeURLlookup(self, gaugenumber): elif str(gaugenumber).lower() in ['awac-jpier-11m', 'awac-jpier', 'jpier-11m']: self.dataloc = 'oceanography/waves/awac-jpier-11m/awac-jpier-11m.ncml' # New waveriders - elif str(gaugenumber).lower() in ['waverider-17m-1d', d/waverider-17m-1d - self.dataloc = 'oceanography/waves/waverider-17m-1D/waverider-17m-1D.ncml' + elif str(gaugenumber).lower() in ['waverider-17m-1d', '17m-1d']: + self.dataloc = 'oceanography/waves/waverider-17m-1d/waverider-17m-1d.ncml' elif str(gaugenumber).lower() in ['waverider-20m', 'waverider-20m-1d', '20m', '20m-1d']: self.dataloc = 'oceanography/waves/waverider-20m-1d/waverider-20m-1d.ncml' # Paros pressure sensors - support both naming conventions