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.

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

Update data_tools.onc_json_to_dataset() to ONC API v3 JSON schema and add tests #93

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Update data_tools.onc_json_to_dataset() to ONC API v3 JSON schema and add tests #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5525782
Update onc_json_to_dataset() to v3 API and add tests
douglatornell Jan 19, 2024
0d41e2a
Add "station" dataset attribute from JSON locationCode
douglatornell Jan 25, 2024
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
22 changes: 13 additions & 9 deletions SalishSeaTools/salishsea_tools/data_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,12 @@ def onc_json_to_dataset(onc_json, teos=True):

:arg dict onc_json: Data structure returned from an ONC data web service
API request.
Typically produces by calling the :py:meth:`json`
Typically produced by calling the :py:meth:`json`
method on the :py:class:`~requests.Response` object
produced by calling :py:meth:`requests.get`.

:arg boolean teos: Convert salinity data from PSU
(Practical Salinity Units) to TEOS-10 reference
(Practical Salinity Units) to TEOS-10 reference
salinity in g/kg.
Defaults to :py:obj:`True`.

Expand All @@ -357,28 +357,32 @@ def onc_json_to_dataset(onc_json, teos=True):
data_vars = {}
for sensor in onc_json["sensorData"]:
if sensor["sensorName"] == "Practical Salinity" and teos:
data = teos_tools.psu_teos([d["value"] for d in sensor["data"]])
data = teos_tools.psu_teos([d for d in sensor["data"]["values"]])
sensor["sensorName"] = "Reference Salinity"
sensor["unitOfMeasure"] = "g/kg"
else:
data = [d["value"] for d in sensor["data"]]
data_vars[sensor["sensor"]] = xarray.DataArray(
name=sensor["sensor"],
data = [d for d in sensor["data"]["values"]]
sensor_code = sensor["sensorCode"].lower()
data_vars[sensor_code] = xarray.DataArray(
name=sensor_code,
data=data,
coords={
"sampleTime": [
arrow.get(d["sampleTime"]).naive for d in sensor["data"]
arrow.get(d).naive for d in sensor["data"]["sampleTimes"]
],
},
dims=("sampleTime",),
attrs={
"qaqcFlag": np.array([d["qaqcFlag"] for d in sensor["data"]]),
"qaqcFlag": np.array([d for d in sensor["data"]["qaqcFlags"]]),
"sensorName": sensor["sensorName"],
"unitOfMeasure": sensor["unitOfMeasure"],
"actualSamples": sensor["actualSamples"],
},
)
return xarray.Dataset(data_vars, attrs=onc_json["serviceMetadata"])
dataset_attrs = {
"station": onc_json["parameters"]["locationCode"]
}
return xarray.Dataset(data_vars, attrs=dataset_attrs)


def get_chs_tides(
Expand Down
Loading