Skip to content

Commit

Permalink
merged main
Browse files Browse the repository at this point in the history
  • Loading branch information
Geary-Layne committed Sep 6, 2024
2 parents eaed6db + f188ea8 commit b851dcc
Show file tree
Hide file tree
Showing 24 changed files with 61 additions and 104 deletions.
Binary file not shown.
32 changes: 11 additions & 21 deletions python/idsse/testing/data_access/request_with_bad_units.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
{
"label": "data_requested",
"sourceType": "units",
"sourceObj": {
"units": "MilesPerDecade",
"source": {
"sourceType": "slice",
"sourceObj": {
"slice": "[910:1010,829:929]",
"source": {
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "WINDSPEED",
"issueDt": "2023-01-10T08:00:00Z",
"validDt": "2023-01-11T06:00:00Z"
}
}
}
}
}
}
"label": "data_requested",
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "WINDSPEED",
"slice": "[910:1010,829:929]",
"issueDt": "2023-01-10T08:00:00Z",
"validDt": "2023-01-11T06:00:00Z",
"units": "MilesPerDecade"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,95 +7,59 @@
{
"sourceType": "condition",
"sourceObj": {
"mapping": {
"controlPoints": [
"-Infinity",
"30.000",
"60.000",
"Infinity"
],
"startWeight": [
0,
1,
0
],
"endWeight": [
0,
1,
0
]
},
"relational": "GT",
"thresh": 45.0,
"source": {
"sourceType": "units",
"sourceObj": {
"units": "MilesPerHour",
"source": {
"sourceType": "slice",
"sourceObj": {
"slice": "[910:1010,829:929]",
"source": {
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "WINDSPEED",
"region": "CONUS",
"issueDt": "2023-01-10T08:00:00.000Z",
"validDt": "2023-01-11T06:00:00.000Z"
}
}
}
}
}
"mapping": {
"controlPoints": [
"-Infinity",
"30.000",
"60.000",
"Infinity"
],
"startWeight": [0, 1, 0],
"endWeight": [0, 1, 0]
},
"relational": "GT",
"thresh": 45.0,
"source": {
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "WINDSPEED",
"region": "CONUS",
"slice": "[910:1010,829:929]",
"issueDt": "2023-01-10T08:00:00.000Z",
"validDt": "2023-01-11T06:00:00.000Z",
"units": "MilesPerHour"
}
}
}
},
{
"sourceType": "condition",
"sourceObj": {
"mapping": {
"controlPoints": [
"-Infinity",
"15.000",
"45.000",
"Infinity"
],
"startWeight": [
0,
1,
0
],
"endWeight": [
0,
1,
0
]
},
"relational": "LTE",
"thresh": 30.0,
"source": {
"sourceType": "units",
"sourceObj": {
"units": "Fahrenheit",
"source": {
"sourceType": "slice",
"sourceObj": {
"slice": "[829:929,910:1010]",
"source": {
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "TEMP",
"region": "CONUS",
"issueDt": "2023-01-10T08:00:00Z",
"validDt": "2023-01-11T06:00:00Z"
}
}
}
}
}
"mapping": {
"controlPoints": [
"-Infinity",
"15.000",
"45.000",
"Infinity"
],
"startWeight": [0, 1, 0],
"endWeight": [0, 1, 0]
},
"relational": "LTE",
"thresh": 30.0,
"source": {
"sourceType": "data",
"sourceObj": {
"product": "NBM",
"field": "TEMP",
"region": "CONUS",
"slice": "[829:929,910:1010]",
"issueDt": "2023-01-10T08:00:00Z",
"validDt": "2023-01-11T06:00:00Z",
"units": "Fahrenheit"
}
}
}
}
]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 4 additions & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ def package_files(directory):
'idsse.testing.data_access.data_cache',
'idsse.testing.data_access.mrms_aws_grib',
'idsse.testing.data_access.nbm_aws_grib',
'idsse.testing.data_access.validation',
'idsse.testing.event_portfolios',
'idsse.testing.idsse_common',
'idsse.testing.ims_request',
'idsse.testing.ims_response',
'idsse.testing.ims_service',
Expand All @@ -34,7 +36,8 @@ def package_files(directory):
'idsse.testing.utils'],
data_files=[('idsse.testing.data_access.data_cache', package_files('idsse/testing/data_access/data_cache')),
('idsse.testing.data_access.mrms_aws_grib', package_files('idsse/testing/data_access/mrms_aws_grib')),
('idsse.testing.data_access.nbm_aws_grib', package_files('idsse/testing/data_access/nbm_aws_grib'))],
('idsse.testing.data_access.nbm_aws_grib', package_files('idsse/testing/data_access/nbm_aws_grib')),
('idsse.testing.data_access.validation', package_files('idsse/testing/data_access/validation'))],
include_package_data=True,
package_data={'':['*.csv', '*.json', '*.nc', '*.grib2*']},
install_requires=[
Expand Down

0 comments on commit b851dcc

Please sign in to comment.