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

Replace period with duration in MeasurementType #15

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Replace period with duration in MeasurementType #15

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe5eb2
feat!: replace `period` with `duration` in `MeasurementType` model
mo-lukecarr Dec 16, 2024
672da94
fix: replaced `period` with `duration` in JSON test data
mo-lukecarr Dec 16, 2024
5ecbcb4
chore: updated durations to remove range of durations
mo-lukecarr Dec 18, 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
4 changes: 1 addition & 3 deletions src/edr_pydantic/parameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
class MeasurementType(EdrBaseModel):
method: str
# TODO: Add validation of ISO 8601 duration (including leading minus sign)
# TODO: Confusion in spec on the field name, duration versus period.
# See https://github.com/opengeospatial/ogcapi-environmental-data-retrieval/issues/560
period: str
duration: str


class Parameter(EdrBaseModel, extra="allow"):
Expand Down
40 changes: 20 additions & 20 deletions tests/test_data/doc-example-collections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
},
"measurementType": {
"method": "mean",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
lukas-phaf marked this conversation as resolved.
Show resolved Hide resolved
}
},
"Wind Speed": {
Expand All @@ -217,7 +217,7 @@
},
"measurementType": {
"method": "mean",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
}
},
"Wind Gust": {
Expand All @@ -236,7 +236,7 @@
},
"measurementType": {
"method": "maximum",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
}
},
"Air Temperature": {
Expand All @@ -255,7 +255,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Weather": {
Expand All @@ -274,7 +274,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Relative Humidity": {
Expand All @@ -293,7 +293,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Dew point": {
Expand All @@ -312,7 +312,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Pressure": {
Expand All @@ -331,7 +331,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Pressure Tendancy": {
Expand All @@ -350,7 +350,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Visibility": {
Expand All @@ -369,7 +369,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
}
}
Expand Down Expand Up @@ -539,7 +539,7 @@
},
"measurementType": {
"method": "mean",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
}
},
"Wind Speed": {
Expand All @@ -558,7 +558,7 @@
},
"measurementType": {
"method": "mean",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
}
},
"Wind Gust": {
Expand All @@ -577,7 +577,7 @@
},
"measurementType": {
"method": "maximum",
"period": "-PT10M/PT0M"
"duration": "-PT10M/PT0M"
}
},
"Air Temperature": {
Expand All @@ -596,7 +596,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Weather": {
Expand All @@ -615,7 +615,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Relative Humidity": {
Expand All @@ -634,7 +634,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Feels like temperature": {
Expand All @@ -653,7 +653,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"UV index": {
Expand All @@ -672,7 +672,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Probability of precipitation": {
Expand All @@ -691,7 +691,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
},
"Visibility": {
Expand All @@ -710,7 +710,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0M"
"duration": "PT0M"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions tests/test_data/parameter-names.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0S"
"duration": "PT0S"
}
},
"u-component_of_wind_altitude_above_msl": {
Expand All @@ -34,7 +34,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0S"
"duration": "PT0S"
}
},
"v-component_of_wind_altitude_above_msl": {
Expand All @@ -53,7 +53,7 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0S"
"duration": "PT0S"
}
}
}
2 changes: 1 addition & 1 deletion tests/test_data/parameter-with-extent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
},
"measurementType": {
"method": "instantaneous",
"period": "PT0S"
"duration": "PT0S"
}
}
Loading