diff --git a/catalog/conus404-daily/collection.json b/catalog/conus404-daily/collection.json
index 76132e128310b3ac4bf714586f8b61f84be1b5a4..805bfb936c9cb3816cb1880b9b88e19d2ea73527 100644
--- a/catalog/conus404-daily/collection.json
+++ b/catalog/conus404-daily/collection.json
@@ -606,7 +606,7 @@
"x"
],
"type": "data",
- "description": "Accumulated surface runoff",
+ "description": "Accumulated subsurface runoff",
"unit": "mm"
},
"ACRUNSF": {
@@ -616,7 +616,7 @@
"x"
],
"type": "data",
- "description": "Accumulated subsurface runoff",
+ "description": "Accumulated surface runoff",
"unit": "mm"
},
"ACSHFLSM": {
@@ -1843,4 +1843,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/catalog_items/conus404-daily/conus404-daily.json b/catalog_items/conus404-daily/conus404-daily.json
index 417a2ab384fbe39f2d40a0299aab381b7943d94b..b12446bbb673c8eb441ab446b247c8d3e8833350 100644
--- a/catalog_items/conus404-daily/conus404-daily.json
+++ b/catalog_items/conus404-daily/conus404-daily.json
@@ -10,7 +10,7 @@
"description": null,
"extent": [
"1979-10-01T00:00:00Z",
- "2021-09-25T00:00:00Z"
+ "2022-10-01T00:00:00Z"
],
"step": "P1DT0H0M0S"
},
@@ -19,8 +19,8 @@
"axis": "x",
"description": "x coordinate of projection",
"extent": [
- -2732097.901153542,
- 2731902.098846458
+ -2732000.0,
+ 2732000.0
],
"step": 4000.0,
"reference_system": {
@@ -81,7 +81,7 @@
},
{
"name": "Longitude of false origin",
- "value": 262.099998474121,
+ "value": -97.9000015258789,
"unit": "degree",
"id": {
"authority": "EPSG",
@@ -150,8 +150,8 @@
"axis": "y",
"description": "y coordinate of projection",
"extent": [
- -2027960.8996368449,
- 2028039.1003631551
+ -2027999.9999999958,
+ 2028000.0000000042
],
"step": 4000.0,
"reference_system": {
@@ -212,7 +212,7 @@
},
{
"name": "Longitude of false origin",
- "value": 262.099998474121,
+ "value": -97.9000015258789,
"unit": "degree",
"id": {
"authority": "EPSG",
@@ -313,24 +313,6 @@
}
},
"cube:variables": {
- "lat": {
- "dimensions": [
- "y",
- "x"
- ],
- "type": "auxiliary",
- "description": "Latitude, south is negative",
- "unit": "degree_north"
- },
- "lon": {
- "dimensions": [
- "y",
- "x"
- ],
- "type": "auxiliary",
- "description": "Longitude, west is negative",
- "unit": "degree_east"
- },
"ACDEWC": {
"dimensions": [
"time",
@@ -1068,24 +1050,6 @@
"description": "Map scale factor on mass grid, y direction",
"unit": ""
},
- "lat_u": {
- "dimensions": [
- "y",
- "x_stag"
- ],
- "type": "auxiliary",
- "description": "Latitude, south is negative",
- "unit": "degree_north"
- },
- "lon_u": {
- "dimensions": [
- "y",
- "x_stag"
- ],
- "type": "auxiliary",
- "description": "Longitude, west is negative",
- "unit": "degree_east"
- },
"MAPFAC_U": {
"dimensions": [
"y",
@@ -1113,24 +1077,6 @@
"description": "Map scale factor on u-grid, y direction",
"unit": ""
},
- "lat_v": {
- "dimensions": [
- "y_stag",
- "x"
- ],
- "type": "auxiliary",
- "description": "Latitude, south is negative",
- "unit": "degree_north"
- },
- "lon_v": {
- "dimensions": [
- "y_stag",
- "x"
- ],
- "type": "auxiliary",
- "description": "Longitude, west is negative",
- "unit": "degree_east"
- },
"MAPFAC_V": {
"dimensions": [
"y_stag",
@@ -1763,6 +1709,60 @@
"type": "data",
"description": null,
"unit": null
+ },
+ "lat": {
+ "dimensions": [
+ "y",
+ "x"
+ ],
+ "type": "auxiliary",
+ "description": "Latitude, south is negative",
+ "unit": "degree_north"
+ },
+ "lat_u": {
+ "dimensions": [
+ "y",
+ "x_stag"
+ ],
+ "type": "auxiliary",
+ "description": "Latitude, south is negative",
+ "unit": "degree_north"
+ },
+ "lat_v": {
+ "dimensions": [
+ "y_stag",
+ "x"
+ ],
+ "type": "auxiliary",
+ "description": "Latitude, south is negative",
+ "unit": "degree_north"
+ },
+ "lon": {
+ "dimensions": [
+ "y",
+ "x"
+ ],
+ "type": "auxiliary",
+ "description": "Longitude, west is negative",
+ "unit": "degree_east"
+ },
+ "lon_u": {
+ "dimensions": [
+ "y",
+ "x_stag"
+ ],
+ "type": "auxiliary",
+ "description": "Longitude, west is negative",
+ "unit": "degree_east"
+ },
+ "lon_v": {
+ "dimensions": [
+ "y_stag",
+ "x"
+ ],
+ "type": "auxiliary",
+ "description": "Longitude, west is negative",
+ "unit": "degree_east"
}
}
},
@@ -1855,4 +1855,4 @@
"stac_extensions": [
"https://stac-extensions.github.io/datacube/v2.2.0/schema.json"
]
-}
\ No newline at end of file
+}
diff --git a/workflows/examples/create_collection_from_zarr_conus404-daily.ipynb b/workflows/examples/create_collection_from_zarr_conus404-daily.ipynb
index ece55a76218a55319f97966d3bdfd654cf97827a..23f657fa0900e36f395043cf51037c5bc808a138 100644
--- a/workflows/examples/create_collection_from_zarr_conus404-daily.ipynb
+++ b/workflows/examples/create_collection_from_zarr_conus404-daily.ipynb
@@ -34,6 +34,7 @@
"import json\n",
"import numpy as np\n",
"import pyproj\n",
+ "from pyproj import Transformer\n",
"import cartopy.crs as ccrs\n",
"import cfunits\n",
"import json\n",
@@ -203,6 +204,34 @@
"crs = pyproj.CRS.from_cf(ds.crs.attrs)"
]
},
+ {
+ "cell_type": "markdown",
+ "id": "282c689e-07f0-48ee-8e3d-35876e8c5094",
+ "metadata": {},
+ "source": [
+ "### Compare dataset crs var to generated proj4 string to make sure it looks ok"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "4cee13ba-487d-483e-a013-b65685137502",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "ds.crs"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f7bc73db-7717-450e-9679-525f7be0c910",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "crs.to_proj4()"
+ ]
+ },
{
"cell_type": "markdown",
"id": "8fbfecfb-9886-4d06-a34c-6471cb0a6053",
@@ -278,14 +307,55 @@
"# coordinates must be from WGS 84 datum\n",
"# left, bottom, right, top\n",
"\n",
- "# Note: try changing around the commented out lines below to get type float ratherthan a numpy float\n",
- "#coord_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float), ds[dim_names_dict['Y']].data.min().compute().astype(float), ds[dim_names_dict['X']].data.max().compute().astype(float), ds[dim_names_dict['Y']].data.max().compute().astype(float)]\n",
- "#coord_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['X']].data.max().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.max().compute().astype(float).tolist()]\n",
- "coord_bounds = [ds[dim_names_dict['X']].data.min().astype(float).item(), ds[dim_names_dict['Y']].data.min().astype(float).item(), ds[dim_names_dict['X']].data.max().astype(float).item(), ds[dim_names_dict['Y']].data.max().astype(float).item()]\n",
- "print(coord_bounds)\n",
- "print(f'\\ncoord_bounds data type: {type(coord_bounds[0])}')\n",
+ "# Note: try changing around the commented out lines below to get type float rather than a numpy float\n",
+ "#spatial_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float), ds[dim_names_dict['Y']].data.min().compute().astype(float), ds[dim_names_dict['X']].data.max().compute().astype(float), ds[dim_names_dict['Y']].data.max().compute().astype(float)]\n",
+ "#spatial_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['X']].data.max().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.max().compute().astype(float).tolist()]\n",
+ "spatial_bounds = [ds[dim_names_dict['X']].data.min().astype(float).item(), ds[dim_names_dict['Y']].data.min().astype(float).item(), ds[dim_names_dict['X']].data.max().astype(float).item(), ds[dim_names_dict['Y']].data.max().astype(float).item()]\n",
+ "print(spatial_bounds)\n",
+ "print(f'\\nspatial_bounds data type: {type(spatial_bounds[0])}')"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f16fdb9e-7ed8-40fb-a4f1-9ecabdebc0a1",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "XX, YY = np.meshgrid(ds[dim_names_dict['X']].data, ds[dim_names_dict['Y']].data)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "074fc23c-f4d9-4427-80d3-fbf691e6d411",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "transformer = Transformer.from_crs(crs, \"EPSG:4326\", always_xy=True)\n",
+ "lon, lat = transformer.transform(XX.ravel(), YY.ravel())"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "5345c975-9fe3-48e1-a663-0275cdf275dc",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "print(f'lower left coordinates (WGS84): {min(lon)}, {min(lat)}')\n",
+ "print(f'upper right coordinates (WGS84): {max(lon)}, {max(lat)}')"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "e0a5a222-743d-403a-9411-2406374803cf",
+ "metadata": {},
+ "outputs": [],
+ "source": [
"# create a spatial extent object \n",
- "spatial_extent = pystac.SpatialExtent(bboxes=[coord_bounds])"
+ "spatial_extent = pystac.SpatialExtent(bboxes=[[min(lon).item(), min(lat).item(), max(lon).item(), max(lat).item()]])"
]
},
{
diff --git a/workflows/examples/create_item_from_zarr_conus404-daily.ipynb b/workflows/examples/create_item_from_zarr_conus404-daily.ipynb
index e29e162989f1c75aa83606074b13810cec02e511..c8e30ce6e75bfe52d6b21ba27cb5bc0fb4ef40a1 100644
--- a/workflows/examples/create_item_from_zarr_conus404-daily.ipynb
+++ b/workflows/examples/create_item_from_zarr_conus404-daily.ipynb
@@ -36,6 +36,7 @@
"import json\n",
"import numpy as np\n",
"import pyproj\n",
+ "from pyproj import Transformer\n",
"import cartopy.crs as ccrs\n",
"import cfunits\n",
"import json\n",
@@ -211,6 +212,34 @@
"crs = pyproj.CRS.from_cf(ds.crs.attrs)"
]
},
+ {
+ "cell_type": "markdown",
+ "id": "958d5dbd-6867-4101-a360-fd0643bf3e19",
+ "metadata": {},
+ "source": [
+ "### Compare dataset crs var to generated proj4 string to make sure it looks ok"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "528c6f4c-aa01-4f3d-a96b-088a9ddab4e7",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "ds.crs"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "b2a02e46-0f50-4550-b193-ffef44f23539",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "crs.to_proj4()"
+ ]
+ },
{
"cell_type": "markdown",
"id": "8fbfecfb-9886-4d06-a34c-6471cb0a6053",
@@ -293,17 +322,58 @@
"# left, bottom, right, top\n",
"\n",
"# Note: try changing around the commented out lines below to get type float ratherthan a numpy float\n",
- "#coord_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float), ds[dim_names_dict['Y']].data.min().compute().astype(float), ds[dim_names_dict['X']].data.max().compute().astype(float), ds[dim_names_dict['Y']].data.max().compute().astype(float)]\n",
- "#coord_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['X']].data.max().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.max().compute().astype(float).tolist()]\n",
- "coord_bounds = [ds[dim_names_dict['X']].data.min().astype(float).item(), ds[dim_names_dict['Y']].data.min().astype(float).item(), ds[dim_names_dict['X']].data.max().astype(float).item(), ds[dim_names_dict['Y']].data.max().astype(float).item()]\n",
- "print(coord_bounds)\n",
- "print(f'\\ncoord_bounds data type: {type(coord_bounds[0])}')\n",
+ "#spatial_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float), ds[dim_names_dict['Y']].data.min().compute().astype(float), ds[dim_names_dict['X']].data.max().compute().astype(float), ds[dim_names_dict['Y']].data.max().compute().astype(float)]\n",
+ "#spatial_bounds = [ds[dim_names_dict['X']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.min().compute().astype(float).tolist(), ds[dim_names_dict['X']].data.max().compute().astype(float).tolist(), ds[dim_names_dict['Y']].data.max().compute().astype(float).tolist()]\n",
+ "spatial_bounds = [ds[dim_names_dict['X']].data.min().astype(float).item(), ds[dim_names_dict['Y']].data.min().astype(float).item(), ds[dim_names_dict['X']].data.max().astype(float).item(), ds[dim_names_dict['Y']].data.max().astype(float).item()]\n",
+ "print(spatial_bounds)\n",
+ "print(f'\\nspatial_bounds data type: {type(spatial_bounds[0])}')"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "3b5cc182-54d4-44b9-98c0-d1be3fd6c6d0",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "XX, YY = np.meshgrid(ds[dim_names_dict['X']].data, ds[dim_names_dict['Y']].data)"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "85024093-da0c-425c-9126-6154cfaabd36",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "transformer = Transformer.from_crs(crs, \"EPSG:4326\", always_xy=True)\n",
+ "lon, lat = transformer.transform(XX.ravel(), YY.ravel())"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "73d130f7-2dba-4d3c-9981-f18120073314",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "print(f'lower left coordinates (WGS84): {min(lon)}, {min(lat)}')\n",
+ "print(f'upper right coordinates (WGS84): {max(lon)}, {max(lat)}')"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "86206def-9e39-474f-9edb-20458a004803",
+ "metadata": {},
+ "outputs": [],
+ "source": [
"# create a geometry object \n",
"footprint = mapping(Polygon([\n",
- " [coord_bounds[0], coord_bounds[1]],\n",
- " [coord_bounds[0], coord_bounds[3]],\n",
- " [coord_bounds[2], coord_bounds[3]],\n",
- " [coord_bounds[2], coord_bounds[1]]\n",
+ " [min(lon).item(), min(lat).item()],\n",
+ " [min(lon).item(), max(lat).item()],\n",
+ " [max(lon).item(), max(lat).item()],\n",
+ " [max(lon).item(), min(lat).item()]\n",
" ]))\n",
"print(footprint)"
]