Skip to content

Commit d3865a2

Browse files
Adjust gwlevels URL services (#147)
* add gwlevels to waterdata services * add state code conversion * get rid of usa piece * adjust mock requests, but still errors * one correction * switch format in urls to get tests to work * Update dataretrieval/nwis.py keep API consistent Co-authored-by: Timothy Hodson <[email protected]> --------- Co-authored-by: Timothy Hodson <[email protected]>
1 parent 64a575d commit d3865a2

File tree

4 files changed

+159
-147
lines changed

4 files changed

+159
-147
lines changed

dataretrieval/nwis.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
PARAMCODES_URL = 'https://help.waterdata.usgs.gov/code/parameter_cd_nm_query?'
3535
ALLPARAMCODES_URL = 'https://help.waterdata.usgs.gov/code/parameter_cd_query?'
3636

37-
WATERSERVICES_SERVICES = ['dv', 'iv', 'site', 'stat', 'gwlevels']
37+
WATERSERVICES_SERVICES = ['dv', 'iv', 'site', 'stat']
3838
WATERDATA_SERVICES = [
3939
'qwdata',
40+
'gwlevels',
4041
'measurements',
4142
'peaks',
4243
'pmcodes',
@@ -434,12 +435,23 @@ def get_gwlevels(
434435
"""
435436
_check_sites_value_types(sites)
436437

437-
kwargs['startDT'] = kwargs.pop('startDT', start)
438-
kwargs['endDT'] = kwargs.pop('endDT', end)
439-
kwargs['sites'] = kwargs.pop('sites', sites)
438+
# Make kwargs backwards compatible with waterservices
439+
# vocabulary
440+
if 'startDT' in kwargs:
441+
kwargs['begin_date'] = kwargs.pop('startDT')
442+
if 'endDT' in kwargs:
443+
kwargs['end_date'] = kwargs.pop('endDT')
444+
if 'sites' in kwargs:
445+
kwargs['site_no'] = kwargs.pop('sites')
446+
if 'stateCd'in kwargs:
447+
kwargs['state_cd'] = kwargs.pop('stateCd')
448+
449+
kwargs['begin_date'] = kwargs.pop('begin_date', start)
450+
kwargs['end_date'] = kwargs.pop('end_date', end)
451+
kwargs['site_no'] = kwargs.pop('site_no', sites)
440452
kwargs['multi_index'] = multi_index
441453

442-
response = query_waterservices('gwlevels', ssl_check=ssl_check, **kwargs)
454+
response = query_waterdata('gwlevels', format = 'rdb', ssl_check=ssl_check, **kwargs)
443455

444456
df = _read_rdb(response.text)
445457

0 commit comments

Comments
 (0)