Skip to content
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.

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

ADD: Adding arm site and facility location coordinate elastic search. #751

Merged
merged 2 commits into from
Nov 15, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
STY: PEP8 Fixes.
zssherman committed Nov 14, 2023
commit b176b84912791ef8a5155353a8dc013a8e0ee5b4
4 changes: 2 additions & 2 deletions act/tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -786,8 +786,8 @@ def test_arm_site_location_search():
# Test for a facility with no latitude and longitude information
test_dict_no_coord = act.utils.arm_site_location_search(site_code='sgp', facility_code='A6')
assert list(test_dict_no_coord)[0] == 'sgp A6'
assert test_dict_no_coord[list(test_dict_no_coord)[0]]['latitude'] == None
assert test_dict_no_coord[list(test_dict_no_coord)[0]]['longitude'] == None
assert test_dict_no_coord[list(test_dict_no_coord)[0]]['latitude'] is None
assert test_dict_no_coord[list(test_dict_no_coord)[0]]['longitude'] is None

# Test for another site
test_dict_nsa = act.utils.arm_site_location_search(site_code='nsa', facility_code=None)
18 changes: 9 additions & 9 deletions act/utils/data_utils.py
Original file line number Diff line number Diff line change
@@ -1261,13 +1261,13 @@ def arm_site_location_search(site_code='sgp', facility_code=None):
},
},
},
},
"size": 0,
"query": {
"query_string": {
"query": query,
},
},
},
"size": 0,
"query": {
"query_string": {
"query": query,
},
},
}

# Uses requests to grab metadata from arm.gov.
@@ -1292,6 +1292,6 @@ def arm_site_location_search(site_code='sgp', facility_code=None):
lon = float(lon)
coords = {'latitude': lat,
'longitude': lon}
coord_dict.setdefault(site_code + ' ' + facility, coords)
coord_dict.setdefault(site + ' ' + facility, coords)

return coord_dict