Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jzwart committed Feb 12, 2024
2 parents 9ab78bb + 6a4e460 commit 07cbf10
Show file tree
Hide file tree
Showing 26 changed files with 1,214 additions and 187 deletions.
152 changes: 152 additions & 0 deletions catalog/forecasts/aquatics/Daily_Chlorophyll_a/collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"id": "Daily_Chlorophyll_a",
"description": "This page includes all models for the Daily_Chlorophyll_a variable.",
"stac_version": "1.0.0",
"license": "CC0-1.0",
"stac_extensions": [
"https://stac-extensions.github.io/scientific/v1.0.0/schema.json",
"https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
"https://stac-extensions.github.io/table/v1.2.0/schema.json"
],
"type": "Collection",
"links": [
{
"rel": "item",
"type": "application/json",
"href": "../../models/model_items/climatology.json"
},
{
"rel": "item",
"type": "application/json",
"href": "../../models/model_items/persistenceRW.json"
},
{
"rel": "parent",
"type": "application/json",
"href": "../collection.json"
},
{
"rel": "root",
"type": "application/json",
"href": "../collection.json"
},
{
"rel": "self",
"type": "application/json",
"href": "collection.json"
},
{
"rel": "cite-as",
"href": "https://doi.org/10.1002/fee.2616"
},
{
"rel": "about",
"href": "https://projects.ecoforecast.org/usgsrc4cast-docs/",
"type": "text/html",
"title": "EFI-USGS River Chlorophyll Forecasting Challenge Documentation"
},
{
"rel": "describedby",
"href": "https://projects.ecoforecast.org/usgsrc4cast-docs/",
"title": "EFI-USGS River Chlorophyll Forecast Challenge Dashboard",
"type": "text/html"
}
],
"title": "Daily_Chlorophyll_a",
"extent": {
"spatial": {
"bbox": [
["Inf", "Inf", "-Inf", "-Inf"]
]
},
"temporal": {
"interval": [
[
"2024-02-07T00:00:00Z",
"2024-03-17T00:00:00Z"
]
]
}
},
"table:columns": [
{
"name": "reference_datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime that the forecast was initiated (horizon = 0)"
},
{
"name": "datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime of the forecasted value (ISO 8601)"
},
{
"name": "site_id",
"type": "string",
"description": "For forecasts that are not on a spatial grid, use of a site dimension that maps to a more detailed geometry (points, polygons, etc.) is allowable. In general this would be documented in the external metadata (e.g., alook-up table that provides lon and lat)"
},
{
"name": "family",
"type": "string",
"description": "For ensembles: “ensemble.” Default value if unspecified for probability distributions: Name of the statistical distribution associated with the reported statistics. The “sample” distribution is synonymous with “ensemble.”For summary statistics: “summary.”"
},
{
"name": "parameter",
"type": "string",
"description": "ensemble member or distribution parameter"
},
{
"name": "prediction",
"type": "double",
"description": "predicted value for variable"
},
{
"name": "pub_datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime that forecast was submitted"
},
{
"name": "project_id",
"type": "string",
"description": "unique identifier for the forecast project"
},
{
"name": "duration",
"type": "string",
"description": "temporal duration of forecast (hourly, daily, etc.); follows ISO 8601 duration convention"
},
{
"name": "variable",
"type": "string",
"description": "name of forecasted variable"
},
{
"name": "model_id",
"type": "string",
"description": "unique model identifier"
},
{
"name": "reference_date",
"type": "string",
"description": "date that the forecast was initiated"
}
],
"assets": {
"data": {
"href": "s3://anonymous@bio230014-bucket01/challenges/forecasts/parquet/project_id=usgsrc4cast/duration=P1D/variable=chla?endpoint_override=sdsc.osn.xsede.org",
"type": "application/x-parquet",
"title": "Database Access",
"roles": [
"data"
],
"description": "Use `arrow` for remote access to the database. This R code will return results for forecasts of the variable by the specific model .\n\n### R\n\n```{r}\n# Use code below\n\nall_results <- arrow::open_dataset(\"s3://anonymous@bio230014-bucket01/challenges/forecasts/parquet/project_id=usgsrc4cast/duration=P1D/variable=chla?endpoint_override=sdsc.osn.xsede.org\")\ndf <- all_results |> dplyr::collect()\n\n```\n \n\nYou can use dplyr operations before calling `dplyr::collect()` to `summarise`, `select` columns, and/or `filter` rows prior to pulling the data into a local `data.frame`. Reducing the data that is pulled locally will speed up the data download speed and reduce your memory usage.\n\n\n"
},
"thumbnail": {
"href": "pending",
"type": "image/JPEG",
"roles": [
"thumbnail"
],
"title": "pending"
}
}
}
147 changes: 147 additions & 0 deletions catalog/forecasts/aquatics/collection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"id": "aquatics",
"description": "This page includes variables for the aquatics group.",
"stac_version": "1.0.0",
"license": "CC0-1.0",
"stac_extensions": [
"https://stac-extensions.github.io/scientific/v1.0.0/schema.json",
"https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
"https://stac-extensions.github.io/table/v1.2.0/schema.json"
],
"type": "Collection",
"links": [
{
"rel": "child",
"type": "application/json",
"href": "Daily_Chlorophyll_a/collection.json"
},
{
"rel": "parent",
"type": "application/json",
"href": "../collection.json"
},
{
"rel": "root",
"type": "application/json",
"href": "../collection.json"
},
{
"rel": "self",
"type": "application/json",
"href": "collection.json"
},
{
"rel": "cite-as",
"href": "https://doi.org/10.1002/fee.2616"
},
{
"rel": "about",
"href": "https://projects.ecoforecast.org/usgsrc4cast-docs/",
"type": "text/html",
"title": "EFI-USGS River Chlorophyll Forecasting Challenge Documentation"
},
{
"rel": "describedby",
"href": "https://projects.ecoforecast.org/usgsrc4cast-docs/",
"title": "EFI-USGS River Chlorophyll Forecast Challenge Dashboard",
"type": "text/html"
}
],
"title": "aquatics",
"extent": {
"spatial": {
"bbox": [
["Inf", "Inf", "-Inf", "-Inf"]
]
},
"temporal": {
"interval": [
[
"2024-02-07T00:00:00Z",
"2024-03-17T00:00:00Z"
]
]
}
},
"table:columns": [
{
"name": "reference_datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime that the forecast was initiated (horizon = 0)"
},
{
"name": "datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime of the forecasted value (ISO 8601)"
},
{
"name": "site_id",
"type": "string",
"description": "For forecasts that are not on a spatial grid, use of a site dimension that maps to a more detailed geometry (points, polygons, etc.) is allowable. In general this would be documented in the external metadata (e.g., alook-up table that provides lon and lat)"
},
{
"name": "family",
"type": "string",
"description": "For ensembles: “ensemble.” Default value if unspecified for probability distributions: Name of the statistical distribution associated with the reported statistics. The “sample” distribution is synonymous with “ensemble.”For summary statistics: “summary.”"
},
{
"name": "parameter",
"type": "string",
"description": "ensemble member or distribution parameter"
},
{
"name": "prediction",
"type": "double",
"description": "predicted value for variable"
},
{
"name": "pub_datetime",
"type": "timestamp[us, tz=UTC]",
"description": "datetime that forecast was submitted"
},
{
"name": "project_id",
"type": "string",
"description": "unique identifier for the forecast project"
},
{
"name": "duration",
"type": "string",
"description": "temporal duration of forecast (hourly, daily, etc.); follows ISO 8601 duration convention"
},
{
"name": "variable",
"type": "string",
"description": "name of forecasted variable"
},
{
"name": "model_id",
"type": "string",
"description": "unique model identifier"
},
{
"name": "reference_date",
"type": "string",
"description": "date that the forecast was initiated"
}
],
"assets": {
"data": {
"href": "s3://anonymous@bio230014-bucket01/challenges/forecasts/parquet/?endpoint_override=sdsc.osn.xsede.org",
"type": "application/x-parquet",
"title": "Database Access",
"roles": [
"data"
],
"description": "Use `arrow` for remote access to the database. This R code will return results for the NEON Ecological Forecasting Aquatics theme.\n\n### R\n\n```{r}\n# Use code below\n\nall_results <- arrow::open_dataset(\"s3://anonymous@bio230014-bucket01/challenges/forecasts/parquet/?endpoint_override=sdsc.osn.xsede.org\")\ndf <- all_results |>\n dplyr::filter(variable %in% c(\"chla\")) |>\n dplyr::collect()\n\n```\n \n\nYou can use dplyr operations before calling `dplyr::collect()` to `summarise`, `select` columns, and/or `filter` rows prior to pulling the data into a local `data.frame`. Reducing the data that is pulled locally will speed up the data download speed and reduce your memory usage.\n\n\n"
},
"thumbnail": {
"href": "https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/thumbnails/image/Back-b.jpg",
"type": "image/JPEG",
"roles": [
"thumbnail"
],
"title": "USGS Streamgage"
}
}
}
2 changes: 1 addition & 1 deletion catalog/forecasts/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"interval": [
[
"2024-02-07T00:00:00Z",
"2024-03-14T00:00:00Z"
"2024-03-17T00:00:00Z"
]
]
}
Expand Down
2 changes: 1 addition & 1 deletion catalog/forecasts/models/collection.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"interval": [
[
"2024-02-07T00:00:00Z",
"2024-03-14T00:00:00Z"
"2024-03-17T00:00:00Z"
]
]
}
Expand Down
2 changes: 1 addition & 1 deletion catalog/forecasts/models/model_items/climatology.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"properties": {
"description": "\nmodel info: Forecasts stream chlorophyll-a based on the historic average and standard deviation for that given site and day-of-year.\n\nSites: USGS-01427510, USGS-01463500, USGS-05543010, USGS-05553700, USGS-05558300, USGS-05586300, USGS-14181500, USGS-14211010, USGS-14211720\n\nVariables: Daily Chlorophyll_a",
"start_datetime": "2024-02-07",
"end_datetime": "2024-03-14",
"end_datetime": "2024-03-17",
"providers": [
{
"url": "pending",
Expand Down
2 changes: 1 addition & 1 deletion catalog/forecasts/models/model_items/persistenceRW.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"properties": {
"description": "\nmodel info: Random walk model based on most recent stream chl-a observations using the fable::RW() model.\n\nSites: USGS-01427510, USGS-01463500, USGS-05543010, USGS-05549500, USGS-05553700, USGS-05558300, USGS-05586300, USGS-14181500, USGS-14211010, USGS-14211720\n\nVariables: Daily Chlorophyll_a",
"start_datetime": "2024-02-07",
"end_datetime": "2024-03-13",
"end_datetime": "2024-03-15",
"providers": [
{
"url": "pending",
Expand Down
Loading

0 comments on commit 07cbf10

Please sign in to comment.