Skip to content

Fix waverider-17m-1d URL case inconsistency #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SBFRF merged 3 commits into from
Feb 2, 2026
Merged

Fix waverider-17m-1d URL case inconsistency #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c0b6f4
Initial plan
Copilot Feb 2, 2026
0311f54
Fix waverider-17m-1d URL case inconsistency and add flexible input ha…
Copilot Feb 2, 2026
49e3cdc
Remove redundant uppercase variants from condition (handled by .lower())
Copilot Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions murgtools/getdata/getDataFRF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@ class getObs:
def __init__(self, d1, d2, **kwargs):
"""Data are returned in self.dataindex are inclusive at start, exclusive at end."""
# this is active wave gauge list for looping through as needed
self.waveGaugeList = ['waverider-26m', 'waverider-17m', 'waverider-20m-1d', 'awac-11m',
self.waveGaugeList = ['waverider-26m', 'waverider-17m', 'waverider-17m-1d', 'waverider-20m-1d', 'awac-11m',
'awac-jpier-11m', '8m-array', 'awac-6m', 'awac-4.5m', 'adop-3.5m',
'xp200m', 'xp150m', 'xp125m', 'sig940-300', 'sig769-300',
'sig940-400', 'sig940-600']

self.directionalWaveGaugeList = ['waverider-26m', 'waverider-17m', 'waverider-20m-1d',
self.directionalWaveGaugeList = ['waverider-26m', 'waverider-17m', 'waverider-17m-1d', 'waverider-20m-1d',
'awac-11m', 'awac-jpier-11m', '8m-array',
'awac-6m', 'awac-4.5m', 'adop-3.5m']

Expand Down Expand Up @@ -1354,7 +1354,7 @@ def _waveGaugeURLlookup(self, gaugenumber):
self.dataloc = 'oceanography/waves/awac-jpier-11m/awac-jpier-11m.ncml'
# New waveriders
elif str(gaugenumber).lower() in ['waverider-17m-1d', '17m-1d']:
self.dataloc = 'oceanography/waves/waverider-17m-1D/waverider-17m-1D.ncml'
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
Expand Down
10 changes: 6 additions & 4 deletions tests/test_getDataFRF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,10 @@ 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'),
('waverider-17m-1D', 'oceanography/waves/waverider-17m-1d/waverider-17m-1d.ncml'),
('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'),
Expand Down Expand Up @@ -859,7 +861,7 @@ def test_wave_gauge_list_contains_new_gauges(self, mock_date2num):
obs = getObs(d1, d2)

new_wave_gauges = [
'waverider-20m-1d', 'awac-jpier-11m',
'waverider-17m-1d', 'waverider-20m-1d', 'awac-jpier-11m',
'sig940-300', 'sig769-300', 'sig940-400', 'sig940-600'
]
for gauge in new_wave_gauges:
Expand All @@ -876,7 +878,7 @@ def test_directional_wave_gauge_list_contains_new_gauges(self, mock_date2num):
obs = getObs(d1, d2)

# Waveriders and AWACs provide directional data
directional_gauges = ['waverider-20m-1d', 'awac-jpier-11m']
directional_gauges = ['waverider-17m-1d', 'waverider-20m-1d', 'awac-jpier-11m']
for gauge in directional_gauges:
assert gauge in obs.directionalWaveGaugeList, \
f"{gauge} should be in directionalWaveGaugeList"
Loading