update predefined catalogs (deltares_data & artifact_data) #833
Conversation
…created a separate gtsm data catalog
There was a problem hiding this comment.
Thanks for the update @Tjalling-dejong ! I focused my review on the content of the data catalogs file themselves and will let @savente93 look at the rest.
I just have a few minor comments so I approve already!
| path: merit_hydro/{variable}.tif | ||
|
|
There was a problem hiding this comment.
I cannot comment the line below but can you update from merit_hydro_1k to merit_hydro_ihu so that it's the same name as in deltares_data?
| path: rgi.gpkg | ||
| rivers_lin2019_v1: | ||
|
|
||
| hydro_rivers_lin2019: |
There was a problem hiding this comment.
| hydro_rivers_lin2019: | |
| hydro_rivers_lin: |
I dont think we need 2019 in the name anymore. Can you update in all artifact_data + deltares_data?
| path: rgi.gpkg | ||
| rivers_lin2019_v1: | ||
|
|
||
| rivers_lin2019: |
There was a problem hiding this comment.
update the name so that it is the same in deltares_data
| @@ -704,6 +751,7 @@ soilgrids: | |||
| ph_sl5: 0.1 | |||
| ph_sl6: 0.1 | |||
| ph_sl7: 0.1 | |||
|
|
|||
There was a problem hiding this comment.
Good to harmonise name of vito with deltares_data ie vito to vito_2015
data/catalogs/changelog.rst
Outdated
| +--------------------------------+---------------------------+ | ||
| | esa_worldcover | esa_worldcover_2020 | | ||
| +--------------------------------+---------------------------+ | ||
| | corine | corine_2018 | | ||
| +--------------------------------+---------------------------+ | ||
| | globcover | globcover_2009 | | ||
| +--------------------------------+---------------------------+ |
There was a problem hiding this comment.
I actually see that you added the year of the landuse map to also in a way match vito. For data like globcover there was really only one year so I dont know if we need to add. For esa_worldcover the 2021 map is actually under a separate version number. And corine I think so far also one map only.
So in a way I don't really mind if you prefer to leave the years after all or not, just make sure they are the same in artifact_data as well.
There was a problem hiding this comment.
I removed the years in the name of the corine, esa_worldcover, and globcover datasets. It makes more sense if these datasets are from one year only.
| urlpath: https://raw.githubusercontent.com/Deltares/hydromt/{version}/data/catalogs/artifact_data.yml | ||
| versions: | ||
| v0.0.8: v0.0.8 | ||
| v0.0.7: v0.0.7 | ||
| v0.0.6: v0.0.6 | ||
| v0.0.9: main | ||
| v0.0.8: 202874eb4fe3415d0608ea81cd61620af6f5816a |
There was a problem hiding this comment.
This will break older versions of hydromt I think. So unless very necessary I think this is more something for v1
| From CLI | ||
| ~~~~~~~~ | ||
|
|
||
| To use a predefined catalog, you can specify the catalog name with the ``--dd`` or ``--data_catalog`` option when running a HydroMT command. |
There was a problem hiding this comment.
I think this is incorrect. The current code in cli/main.py specifies that --dd is for the detlares data catalog specifically not other predefined catalogs, those are loaded by default if I recall correctly. Can you check this, and update if necessary?
There was a problem hiding this comment.
Could also be that we need to rework the cli option, but in that case it should also move to v1
There was a problem hiding this comment.
Yes, you're right Sam. I changed it.
| html-test-skip-examples = { cmd = [ | ||
| "export", | ||
| "SPHINX_SKIP_EXAMPLES=1;", | ||
| "sphinx-build", | ||
| "-M", | ||
| "html", | ||
| "docs", | ||
| "docs/_build", | ||
| ] } |
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: Sam Vente <savente93@gmail.com>
Issue addressed
Fixes #521 #701 #537
Explanation
Explain how you addressed the bug/feature request, what choices you made and why.
Checklist
mainAdditional Notes (optional)
Add any additional notes or information that may be helpful.