add agency to nwis site numbers

Author: jacob-a-brown

backend/connectors/usgs/source.py

@@ -76,11 +76,12 @@ def parse_json(data):
 
     for location in data["timeSeries"]:
         site_code = location["sourceInfo"]["siteCode"][0]["value"]
+        agency = location["sourceInfo"]["siteCode"][0]["agencyCode"]
         source_parameter_name = location["variable"]["variableName"]
         source_parameter_units = location["variable"]["unit"]["unitCode"]
         for value in location["values"][0]["value"]:
             record = {
-                "site_code": site_code,
+                "site_id": f"{agency}-{site_code}",
                 "source_parameter_name": source_parameter_name,
                 "value": value["value"],
                 "datetime_measured": value["dateTime"],
@@ -150,12 +151,16 @@ def __repr__(self):
         return "NWISWaterLevelSource"
 
     def get_records(self, site_record):
+        # query sites with the agency, which need to be in the form of "{agency}:{site number}"
+        sites = make_site_list(site_record)
+        sites_with_colons = [s.replace("-", ":") for s in sites]
+
         params = {
             "format": "json",
             "siteType": "GW",
             "siteStatus": "all",
             "parameterCd": "72019",
-            "sites": ",".join(make_site_list(site_record)),
+            "sites": ",".join(sites_with_colons),
         }
 
         config = self.config
@@ -178,7 +183,7 @@ def get_records(self, site_record):
             return records
 
     def _extract_site_records(self, records, site_record):
-        return [ri for ri in records if ri["site_code"] == site_record.id]
+        return [ri for ri in records if ri["site_id"] == site_record.id]
 
     def _clean_records(self, records):
         return [

backend/connectors/usgs/transformer.py

@@ -32,9 +32,13 @@ def _transform(self, record):
         # if not self.contained(lng, lat):
         #     return
 
+        agency = record["agency_cd"]
+        site_no = record["site_no"]
+        site_id = f"{agency}-{site_no}"
+
         rec = {
             "source": "USGS-NWIS",
-            "id": record["site_no"],
+            "id": site_id,
             "name": record["station_nm"],
             "latitude": lat,
             "longitude": lng,