From 0e9bc16b0c933bbdc00db55de7d523d7f9baa0d8 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 14:45:20 -0600 Subject: [PATCH 1/6] Fix image name in dev compose --- docker-compose.dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c4a5fd8c..8e99f382 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -3,7 +3,7 @@ version: "3.4" services: luigi: - image: "nsidc/luigi:dev" + image: "nsidc/qgreenland:dev" build: "." volumes: # Code From 610ee833aea47a8f64d0dea4e0a419c549db696d Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 15:36:04 -0600 Subject: [PATCH 2/6] Add access date to all Natural Earth layers Change access date substitution code to include surrounding text for consistency across our datasets --- qgreenland/config/datasets/asiaq_nunagis.py | 4 +--- qgreenland/config/datasets/background.py | 2 +- qgreenland/config/datasets/geus_mineral_occurrences.py | 4 ++-- qgreenland/config/datasets/ice_cores.py | 4 ++-- qgreenland/config/datasets/land_ocean_shape.py | 4 ++-- qgreenland/config/datasets/nunagis_protected_areas.py | 2 +- qgreenland/config/datasets/political_boundaries.py | 8 ++++---- qgreenland/config/datasets/promice_stations.py | 2 +- qgreenland/config/datasets/soil_types.py | 2 +- qgreenland/config/datasets/timezones.py | 2 +- qgreenland/config/datasets/wmm.py | 3 +-- qgreenland/util/metadata.py | 3 ++- 12 files changed, 19 insertions(+), 21 deletions(-) diff --git a/qgreenland/config/datasets/asiaq_nunagis.py b/qgreenland/config/datasets/asiaq_nunagis.py index f11b4704..76a81b9e 100644 --- a/qgreenland/config/datasets/asiaq_nunagis.py +++ b/qgreenland/config/datasets/asiaq_nunagis.py @@ -54,9 +54,7 @@ """ ), "citation": { - "text": ( - """ASIAQ Greenland Survey (2023). Date accessed: {{date_accessed}}.""" - ), + "text": ("""ASIAQ Greenland Survey (2023) {{date_accessed}}"""), "url": "https://www.asiaq-greenlandsurvey.gl/", }, }, diff --git a/qgreenland/config/datasets/background.py b/qgreenland/config/datasets/background.py index c6a7da30..3645ae47 100644 --- a/qgreenland/config/datasets/background.py +++ b/qgreenland/config/datasets/background.py @@ -18,7 +18,7 @@ "title": "Natural Earth II with Shaded Relief and Water (1:10m)", "abstract": "Natural Earth II (Public Domain).", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": ( "https://github.com/nvkelso/natural-earth-vector" "/blob/master/LICENSE.md" diff --git a/qgreenland/config/datasets/geus_mineral_occurrences.py b/qgreenland/config/datasets/geus_mineral_occurrences.py index 8e27742b..e30bf321 100644 --- a/qgreenland/config/datasets/geus_mineral_occurrences.py +++ b/qgreenland/config/datasets/geus_mineral_occurrences.py @@ -30,8 +30,8 @@ """Thorning, L., Christensen, L. A., Dawes, P. R., Garde, A. A., Heijboer, T. C., Kalvig, P., Larsen, L. M., Larsen, U., Nielsen, T. F., Rehnström, E. F., Thomassen, B., Thrane, K., Schjøth, F. & Secher, K. "Greenland - mineral occurrences map (GMOM)", GEUS GeoNetwork catalogue. Accessed on - {{date_accessed}}.""" + mineral occurrences map (GMOM)", GEUS GeoNetwork catalogue. + {{date_accessed}}""" ), "url": "https://data.geus.dk/geonetwork/srv/eng/catalog.search#/metadata/8884ead8-45fc-4d1a-ae67-325182cde646", }, diff --git a/qgreenland/config/datasets/ice_cores.py b/qgreenland/config/datasets/ice_cores.py index 43d484e9..31336130 100644 --- a/qgreenland/config/datasets/ice_cores.py +++ b/qgreenland/config/datasets/ice_cores.py @@ -25,8 +25,8 @@ "citation": { "text": ( """World Data Center (2020). Ice core locations. Download: - http://gis.ncdc.noaa.gov/kml/paleo_icecore.kmz. Date accessed: - {{date_accessed}}.""" + http://gis.ncdc.noaa.gov/kml/paleo_icecore.kmz. + {{date_accessed}}""" ), "url": "http://www.ncdc.noaa.gov/paleo/icecore.html", }, diff --git a/qgreenland/config/datasets/land_ocean_shape.py b/qgreenland/config/datasets/land_ocean_shape.py index fcbef60b..af6fb57b 100644 --- a/qgreenland/config/datasets/land_ocean_shape.py +++ b/qgreenland/config/datasets/land_ocean_shape.py @@ -15,7 +15,7 @@ "title": "Natural Earth Land (10m)", "abstract": ("""Natural Earth Land (Public Domain)."""), "citation": { - "text": ("""Made with Natural Earth"""), + "text": ("""Made with Natural Earth {{date_accessed}}"""), "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md", }, }, @@ -35,7 +35,7 @@ "title": "Natural Earth Ocean (10m)", "abstract": ("""Natural Earth Ocean (Public Domain)."""), "citation": { - "text": ("""Made with Natural Earth"""), + "text": ("""Made with Natural Earth {{date_accessed}}"""), "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md", }, }, diff --git a/qgreenland/config/datasets/nunagis_protected_areas.py b/qgreenland/config/datasets/nunagis_protected_areas.py index c7464889..fcf59071 100644 --- a/qgreenland/config/datasets/nunagis_protected_areas.py +++ b/qgreenland/config/datasets/nunagis_protected_areas.py @@ -23,7 +23,7 @@ Breeding Areas.""" ), "citation": { - "text": ("""NunaGIS (2020). Date accessed: {{date_accessed}}."""), + "text": ("""NunaGIS (2020) {{date_accessed}}"""), "url": "https://kort.nunagis.gl/server/rest/services/Hosted", }, }, diff --git a/qgreenland/config/datasets/political_boundaries.py b/qgreenland/config/datasets/political_boundaries.py index 1d788edc..dc8e2471 100644 --- a/qgreenland/config/datasets/political_boundaries.py +++ b/qgreenland/config/datasets/political_boundaries.py @@ -23,8 +23,8 @@ """NunaGIS (2020). Municipalities by population numbers in 2019, Greenland. Web: https://kort.nunagis.gl/portal/home/item.html?id=b70a43b814e84 - 78c9514208548ca5f61. - Date accessed: {{date_accessed}}.""" + 78c9514208548ca5f61 + {{date_accessed}}.""" ), "url": "https://kort.nunagis.gl/portal/home/item.html?id=b70a43b814e8478c9514208548ca5f61", }, @@ -50,7 +50,7 @@ ISO, HASC).""" ), "citation": { - "text": ("""Made with Natural Earth"""), + "text": ("""Made with Natural Earth {{date_accessed}}"""), "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md", }, }, @@ -84,7 +84,7 @@ Intelligence Agency, and elsewhere.""" ), "citation": { - "text": ("""Made with Natural Earth"""), + "text": ("""Made with Natural Earth {{date_accessed}}"""), "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md", }, }, diff --git a/qgreenland/config/datasets/promice_stations.py b/qgreenland/config/datasets/promice_stations.py index acdd1b34..848dfa23 100644 --- a/qgreenland/config/datasets/promice_stations.py +++ b/qgreenland/config/datasets/promice_stations.py @@ -72,7 +72,7 @@ "PROMICE and GC-Net automated weather station data in Greenland", https://doi.org/10.22008/FK2/IW73UU, GEUS Dataverse. -Date accessed: {{date_accessed}}.""" +{{date_accessed}}""" ), "url": "https://dataverse.geus.dk/dataset.xhtml?persistentId=doi:10.22008/FK2/IW73UU", }, diff --git a/qgreenland/config/datasets/soil_types.py b/qgreenland/config/datasets/soil_types.py index 6f5f4a04..ebc4d98e 100644 --- a/qgreenland/config/datasets/soil_types.py +++ b/qgreenland/config/datasets/soil_types.py @@ -39,7 +39,7 @@ Arnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern Circumpolar Soils Map, Version 1. Greenland. Ottawa, Canada. Research Branch, Agriculture and Agri-Food Canada. doi: - https://doi.org/. {{date_accessed}}.""" + https://doi.org/. {{date_accessed}}""" ), "url": "https://nsidc.org/data/GGD602/versions/1", }, diff --git a/qgreenland/config/datasets/timezones.py b/qgreenland/config/datasets/timezones.py index 10f79d54..8fa63d75 100644 --- a/qgreenland/config/datasets/timezones.py +++ b/qgreenland/config/datasets/timezones.py @@ -29,7 +29,7 @@ styling.""" ), "citation": { - "text": ("""Made with Natural Earth"""), + "text": ("""Made with Natural Earth {{date_accessed}}"""), "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md", }, }, diff --git a/qgreenland/config/datasets/wmm.py b/qgreenland/config/datasets/wmm.py index 2fbece0f..0f49a712 100644 --- a/qgreenland/config/datasets/wmm.py +++ b/qgreenland/config/datasets/wmm.py @@ -85,8 +85,7 @@ "text": """ NCEI Geomagnetic Modeling Team and British Geological Survey. 2019. World Magnetic Model 2020. NOAA National Centers for Environmental -Information. doi: 10.25921/11v3-da71, 2020, Date accessed: -{{date_accessed}}. +Information. doi: 10.25921/11v3-da71, 2020 {{date_accessed}}. """, "url": "https://doi.org/10.25921/11v3-da71", }, diff --git a/qgreenland/util/metadata.py b/qgreenland/util/metadata.py index 587bbddd..da45dfc8 100644 --- a/qgreenland/util/metadata.py +++ b/qgreenland/util/metadata.py @@ -102,4 +102,5 @@ def _populate_date_accessed(text: str, *, layer_cfg: Layer) -> str: mtime = fetch_dir.stat().st_mtime date_accessed = dt.datetime.utcfromtimestamp(mtime) - return text.replace("{{date_accessed}}", date_accessed.date().isoformat()) + date_accessed_str = f"[Accessed on: {date_accessed.date().isoformat()}]" + return text.replace("{{date_accessed}}", date_accessed_str) From 51e8cdd93f2a274ec009130a8f1b1ca1d0bd85ac Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 16:16:56 -0600 Subject: [PATCH 3/6] Fix issue with locked dependencies conda-lock seems to have carried these forward even after we moved them from the `pip` section. --- environments/main/conda-lock.yml | 112 +++---------------------------- 1 file changed, 8 insertions(+), 104 deletions(-) diff --git a/environments/main/conda-lock.yml b/environments/main/conda-lock.yml index a2b55d0b..6a605f14 100644 --- a/environments/main/conda-lock.yml +++ b/environments/main/conda-lock.yml @@ -1760,18 +1760,6 @@ package: sha256: 711602276ae39276cb0faaca6fd0ac851fff0ca17151917569174841ef830bbd category: main optional: false -- name: bump2version - version: 1.0.1 - manager: conda - platform: linux-64 - dependencies: - python: '' - url: https://conda.anaconda.org/conda-forge/noarch/bump2version-1.0.1-pyh9f0ad1d_0.tar.bz2 - hash: - md5: 1b3fd56f54baa99e3c9967caf279f66f - sha256: c3cf2e47b0aee001025ad29061222b552a60362ec9febd355c5eb4d3a06beef8 - category: main - optional: false - name: cachy version: 0.3.0 manager: conda @@ -2641,15 +2629,15 @@ package: category: main optional: false - name: setuptools - version: 68.0.0 + version: 68.1.2 manager: conda platform: linux-64 dependencies: python: '>=3.7' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-68.0.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-68.1.2-pyhd8ed1ab_0.conda hash: - md5: 5a7739d0f57ee64133c9d32e6507c46d - sha256: 083a0913f5b56644051f31ac40b4eeea762a88c00aa12437817191b85a753cec + md5: 4fe12573bf499ff85a0a364e00cc5c53 + sha256: dc5a777597e05ceddefc87d2f96389b7ae0afb097e558307af83a453db3e3887 category: main optional: false - name: six @@ -2763,17 +2751,17 @@ package: category: main optional: false - name: tornado - version: 6.3.2 + version: 6.3.3 manager: conda platform: linux-64 dependencies: libgcc-ng: '>=12' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.2-py310h2372a71_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.3-py310h2372a71_0.conda hash: - md5: 1c510e74c87dc9b8fe1f7f9e8dbcef96 - sha256: 56bcfc59da0f6fc78afe79447b8b1327e9149a52c9dc6ee805ac73bf18ac22b6 + md5: dfb49d3ac440e1a236080f9c300e642f + sha256: 38d517c89f79f3ff0d8f3f1ce46218e0f8e3a3fea743e7f3661eb913919aa94e category: main optional: false - name: traitlets @@ -4995,16 +4983,6 @@ package: sha256: 4117022ed18bce8852389885decbf26519d016a8926a0dc21923f77789d64455 category: main optional: false -- name: mdurl - version: 0.1.2 - manager: pip - platform: linux-64 - dependencies: {} - url: https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl - hash: - sha256: 84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 - category: main - optional: false - name: sphinx-selective-exclude version: 1.0.3 manager: pip @@ -5015,77 +4993,3 @@ package: sha256: 76fc8fd7c24311e0ca2199a9e4db2156585acd7652a5cead98b07ef4f70f9b78 category: main optional: false -- name: autodoc-pydantic - version: 1.5.1 - manager: pip - platform: linux-64 - dependencies: - sphinx: '>=3.4' - pydantic: '>=1.5' - url: https://files.pythonhosted.org/packages/bd/4c/5e3bedc712d5eabc7dc085caf009793c18902906ee3afd991ece56f5a2fb/autodoc_pydantic-1.5.1-py3-none-any.whl - hash: - sha256: d42e9e9432acbda2db82a37669995c7d068f66d06d1d8aefdc8ee8c5ef3f4f59 - category: main - optional: false -- name: markdown-it-py - version: 3.0.0 - manager: pip - platform: linux-64 - dependencies: - mdurl: '>=0.1,<1.0' - url: https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl - hash: - sha256: 355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 - category: main - optional: false -- name: sphinx-rtd-theme - version: 1.0.0 - manager: pip - platform: linux-64 - dependencies: - sphinx: '>=1.6' - docutils: <0.18 - url: https://files.pythonhosted.org/packages/e0/d2/3818e4730e314719e27f639c44164419e40eed826d63753dc480262036e8/sphinx_rtd_theme-1.0.0-py2.py3-none-any.whl - hash: - sha256: 4d35a56f4508cfee4c4fb604373ede6feae2a306731d533f409ef5c3496fdbd8 - category: main - optional: false -- name: rich - version: 13.5.2 - manager: pip - platform: linux-64 - dependencies: - pygments: '>=2.13.0,<3.0.0' - markdown-it-py: '>=2.2.0' - url: https://files.pythonhosted.org/packages/8d/5f/21a93b2ec205f4b79853ff6e838e3c99064d5dbe85ec6b05967506f14af0/rich-13.5.2-py3-none-any.whl - hash: - sha256: 146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808 - category: main - optional: false -- name: rich-click - version: 1.6.1 - manager: pip - platform: linux-64 - dependencies: - click: '>=7' - rich: '>=10.7.0' - url: https://files.pythonhosted.org/packages/f4/f2/3fbb0e6eee13a484dc8aaca450e9322d267fc3839b6769841492f1594037/rich_click-1.6.1-py3-none-any.whl - hash: - sha256: 0fcf4d1a09029d79322dd814ab0b2e66ac183633037561881d45abae8a161d95 - category: main - optional: false -- name: bump-my-version - version: 0.9.2 - manager: pip - platform: linux-64 - dependencies: - click: '*' - pydantic: <2.0.0 - rich-click: '*' - rich: '*' - tomlkit: '*' - url: https://files.pythonhosted.org/packages/e5/04/e415ea7199be27375e4613a5d5c1aafc3f99633d0dd4d1ecb514a5de1fb0/bump_my_version-0.9.2-py3-none-any.whl - hash: - sha256: ff0b78339c10a91e460419802f30a0c5b0aa1489bca016c0b46ef6e4d5a7e170 - category: main - optional: false From eb47099adb5b8cefeb63807e2bac81f640ceaff7 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 16:23:12 -0600 Subject: [PATCH 4/6] Update config lock file --- qgreenland/config/cfg-lock.json | 28 ++++++++++++++-------------- tasks/config.py | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qgreenland/config/cfg-lock.json b/qgreenland/config/cfg-lock.json index 09a9299a..b2799f08 100644 --- a/qgreenland/config/cfg-lock.json +++ b/qgreenland/config/cfg-lock.json @@ -110,7 +110,7 @@ "metadata": { "abstract": "ASIAQ Greenland Survey undertakes surveys and research projects,\nbased on non-living physical data from the environment in\nGreenland. Our data are derived from; mapping of cities and\nnon-urban areas, measuring of water resources, climate monitoring,\nsoil testing, surveying and stakeouts at construction projects. All\nthese, provides a unique knowledge of the arctic climate, soil\nconditions, water resources and topography of Greenland, which makes\npossible for the Greenlandic society, partners, and costumers to\nplan and exploit the physical environment and resources.\n\nAsiaq is 100% owned by the Greenlandic Government and had surveyed\nall around in Greenland for more than 60 years.\n\nData were retreived from the NunaGIS data server, which provides\ndata for the the Asiaq Map Portal\n(https://kort.nunagis.gl/refserver/rest/services/Kortportal/). To\nlearn more about NunaGIS, see: https://nunagis-asiaq.hub.arcgis.com/.", "citation": { - "text": "ASIAQ Greenland Survey (2023). Date accessed: {{date_accessed}}.", + "text": "ASIAQ Greenland Survey (2023) {{date_accessed}}", "url": "https://www.asiaq-greenlandsurvey.gl/" }, "title": "Asiaq Map Portal" @@ -149,7 +149,7 @@ "metadata": { "abstract": "Natural Earth II (Public Domain).", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Natural Earth II with Shaded Relief and Water (1:10m)" @@ -494,7 +494,7 @@ "metadata": { "abstract": "In 2007, Denmark launched the Programme for Monitoring of the\nGreenland Ice Sheet (PROMICE) to assess changes in the mass balance\nof the ice sheet. The two major contributors to the ice sheet mass\nloss are surface melt and a larger production of icebergs through\nfaster ice flow. PROMICE is focused on both processes. Ice movement\nand discharge is tracked by satellites and GPSs. The surface mass\nbalance is monitored by a network of weather stations in the melt\nzone of the ice sheet, providing ground truth data to calibrate mass\nbudget models.\n\nThe Greenland Climate Network (GC-Net) was established in 1995 by\nProf. Konrad Steffen at CIRES, to obtain knowledge of the mass gain\nand climatology of the ice sheet. The programme was funded by the\nUSA until 2020, at which point Denmark assumed responsibility for\nthe operation and maintenance of the weather station network. The\nsnowfall and climatology are monitored by a network of weather\nstations in the accumulation zone of the ice sheet, supplemented by\nsatellite-derived data products.\n\nTogether, the two monitoring programmes deliver data about the mass\nbalance of the Greenland ice sheet in near real-time.\n\nData from the Programme for Monitoring of the Greenland Ice Sheet\n(PROMICE) are provided by the Geological Survey of Denmark and\nGreenland (GEUS) at http://www.promice.dk. They include sites\nfinancially supported by the Glaciobasis programme as part of\nGreenland Ecosystem Monitoring (https://g-e-m.dk/), maintained by\nGEUS (ZAK, LYN) and by Asiaq Greenland Survey (NUK_K). The WEG\nstations are paid for and maintained by the University of Graz.\n\nSee https://github.com/GEUS-Glaciology-and-Climate/pypromice for how\nwe make the data product.\n\nRelated publication:\n\nFausto, R. S., van As, D., Mankoff, K. D., Vandecrux, B., Citterio,\nM., Ahlstr\u00f8m, A. P., Andersen, S. B., Colgan, W., Karlsson, N. B.,\nKjeldsen, K. K., Korsgaard, N. J., Larsen, S. H., Nielsen, S.,\nPedersen, A. \u00d8., Shields, C. L., Solgaard, A. M., and Box, J. E.:\nProgramme for Monitoring of the Greenland Ice Sheet (PROMICE)\nautomatic weather station data, Earth Syst. Sci. Data, 13,\n3819\u20133845, https://doi.org/10.5194/essd-13-3819-2021, 2021.\n\nAdditional data:\n\nTo download data related to PROMICE and GC-Net, including historical\nweather station data, see\nhttps://dataverse.geus.dk/dataverse/PROMICE.", "citation": { - "text": "How, P., Abermann, J., Ahlstr\u00f8m, A.P., Andersen, S.B., Box,\nJ.E., Citterio, M., Colgan, W.T., Fausto, R., Karlsson, N.B., Jakobsen, J.,\nLangley, K., Larsen, S.H., Mankoff, K.D., Pedersen, A.\u00d8., Rutishauser, A.,\nShields, C.L., Solgaard, A.M., van As, D., Vandecrux, B., Wright, P.J., 2022,\n\"PROMICE and GC-Net automated weather station data in Greenland\",\nhttps://doi.org/10.22008/FK2/IW73UU, GEUS Dataverse.\n\nDate accessed: {{date_accessed}}.", + "text": "How, P., Abermann, J., Ahlstr\u00f8m, A.P., Andersen, S.B., Box,\nJ.E., Citterio, M., Colgan, W.T., Fausto, R., Karlsson, N.B., Jakobsen, J.,\nLangley, K., Larsen, S.H., Mankoff, K.D., Pedersen, A.\u00d8., Rutishauser, A.,\nShields, C.L., Solgaard, A.M., van As, D., Vandecrux, B., Wright, P.J., 2022,\n\"PROMICE and GC-Net automated weather station data in Greenland\",\nhttps://doi.org/10.22008/FK2/IW73UU, GEUS Dataverse.\n\n{{date_accessed}}", "url": "https://dataverse.geus.dk/dataset.xhtml?persistentId=doi:10.22008/FK2/IW73UU" }, "title": "PROMICE and GC-Net automated weather station data in Greenland" @@ -655,7 +655,7 @@ "metadata": { "abstract": "Dataset containing a summary of geological information for known\nmineral occurrences on Greenland. The information includes the\nlocation, size, mineral commodities, mineralisation type,\nexploration history and a geological description of the deposit. The\ndata has been collected and compiled from fieldwork investigations\nconducted by geological surveys, academic researchers and mineral\nexploration companies.", "citation": { - "text": "Thorning, L., Christensen, L. A., Dawes, P. R., Garde, A. A.,\nHeijboer, T. C., Kalvig, P., Larsen, L. M., Larsen, U., Nielsen, T. F.,\nRehnstr\u00f6m, E. F., Thomassen, B., Thrane, K., Schj\u00f8th, F. & Secher, K. \"Greenland\nmineral occurrences map (GMOM)\", GEUS GeoNetwork catalogue. Accessed on\n{{date_accessed}}.", + "text": "Thorning, L., Christensen, L. A., Dawes, P. R., Garde, A. A.,\nHeijboer, T. C., Kalvig, P., Larsen, L. M., Larsen, U., Nielsen, T. F.,\nRehnstr\u00f6m, E. F., Thomassen, B., Thrane, K., Schj\u00f8th, F. & Secher, K. \"Greenland\nmineral occurrences map (GMOM)\", GEUS GeoNetwork catalogue.\n{{date_accessed}}", "url": "https://data.geus.dk/geonetwork/srv/eng/catalog.search#/metadata/8884ead8-45fc-4d1a-ae67-325182cde646" }, "title": "Greenland mineral occurrences map (GMOM) " @@ -850,7 +850,7 @@ "metadata": { "abstract": "Greenland ice core locations. Ice cores can provide records of\npast temperature, precipitation, atmospheric trace gases, and other\naspects of climate and environment. Additional information is\navailable in the 'description' attribute, including an ice core\ndataset URL. Data were accessed using the Google Earth Map Search\nDataset. For details please see:\nhttp://www.ncdc.noaa.gov/paleo/icecore.html.", "citation": { - "text": "World Data Center (2020). Ice core locations. Download:\nhttp://gis.ncdc.noaa.gov/kml/paleo_icecore.kmz. Date accessed:\n{{date_accessed}}.", + "text": "World Data Center (2020). Ice core locations. Download:\nhttp://gis.ncdc.noaa.gov/kml/paleo_icecore.kmz.\n{{date_accessed}}", "url": "http://www.ncdc.noaa.gov/paleo/icecore.html" }, "title": "Ice Cores" @@ -913,7 +913,7 @@ "metadata": { "abstract": "Natural Earth Land (Public Domain).", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Natural Earth Land (10m)" @@ -1134,7 +1134,7 @@ "metadata": { "abstract": "Countries distinguish between metropolitan (homeland) and\nindependent and semi-independent portions of sovereign states. If\nyou want to see the dependent overseas regions broken out (like in\nISO codes, see France for example), use map units instead.\n\nEach country is coded with a world region that roughly follows the\nUnited Nations setup.\n\nCountries are coded with standard ISO and FIPS codes. French INSEE\ncodes are also included.\n\nIncludes some thematic data from the United Nations, U.S. Central\nIntelligence Agency, and elsewhere.", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Admin 0 \u2013 Countries" @@ -1154,7 +1154,7 @@ "metadata": { "abstract": "Internal, first-order administrative boundaries and polygons for\nall but a few tiny countries. Includes name attributes (including\ndiacritical marks), name variants, and some statistical codes (FIPS,\nISO, HASC).", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Admin 1 \u2013 States, Provinces" @@ -1174,7 +1174,7 @@ "metadata": { "abstract": "Time zones primarily derive from the Central Intelligence Agency\nmap of Time Zones, downloaded from the World Factbook website May\n2012. Boundaries were adjusted to fit the Natural Earth line work at\na scale of 1:10 million and to follow twelve nautical mile\nterritorial sea boundary lines when running along coasts. Additional\nresearch was performed based on recent news to update several areas\nincluding the international dateline and time zone adjustments for\nSamoa and Tokelau and the discarding of daylight savings time in\nRussia.\n\nData attributes include time offset from Coordinated Universal Time\n(UTC, aka \u201czulu\u201d time) and map color codes for a 6-up and 8-up\nstyling.", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Timezones" @@ -1217,7 +1217,7 @@ "metadata": { "abstract": "Greenland municipality boundaries. Data includes information on\n2019 municipality population and the municipality population as a\npercent of total Greenland population.", "citation": { - "text": "NunaGIS (2020). Municipalities by population numbers in 2019,\nGreenland. Web:\n https://kort.nunagis.gl/portal/home/item.html?id=b70a43b814e84\n78c9514208548ca5f61.\nDate accessed: {{date_accessed}}.", + "text": "NunaGIS (2020). Municipalities by population numbers in 2019,\nGreenland. Web:\n https://kort.nunagis.gl/portal/home/item.html?id=b70a43b814e84\n78c9514208548ca5f61\n{{date_accessed}}.", "url": "https://kort.nunagis.gl/portal/home/item.html?id=b70a43b814e8478c9514208548ca5f61" }, "title": "Municipalities with Population" @@ -1240,7 +1240,7 @@ "metadata": { "abstract": "The NunaGIS data server provides a range of datasets on animal\nareas of importance and protected areas. These data are used to\npopulate the following QGreenland data layers: Walrus Protected\nAreas, Goose Protected Areas, Caribou Calving Areas, Beluga Areas,\nBird Protected Areas, Thickbilled Murre Breeding Colony 5km Zones,\nSeabird Breeding Colonies, Eider Protected Areas, Murre Group 1 km\nZones, Musk Oxen Calving Areas, Narwhal Areas, and Polar Bear\nBreeding Areas.", "citation": { - "text": "NunaGIS (2020). Date accessed: {{date_accessed}}.", + "text": "NunaGIS (2020) {{date_accessed}}", "url": "https://kort.nunagis.gl/server/rest/services/Hosted" }, "title": "NunaGIS data server protected area data" @@ -1260,7 +1260,7 @@ "metadata": { "abstract": "Natural Earth Ocean (Public Domain).", "citation": { - "text": "Made with Natural Earth", + "text": "Made with Natural Earth {{date_accessed}}", "url": "https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md" }, "title": "Natural Earth Ocean (10m)" @@ -1834,7 +1834,7 @@ "metadata": { "abstract": "The full data set consists of a circumpolar map of dominant soil\ncharacteristics, with a scale of 1:10,000,000, covering the United\nStates, Canada, Greenland, Iceland, northern Europe, Russia,\nMongolia, and Kazakhstan. The map was created using the Northern and\nMid Latitude Soil Database. The map is in ESRI Shapefile format,\nconsisting of 11 regional areas. Polygons have attributes that give\nthe percentage polygon area that is a given soil type. The map shows\nthe dominant soil of the spatial polygon unless the polygon is over\n90 percent rock or ice. It also shows the proportion of polygon\nencompassed by the dominant soil or nonsoil. Soils include turbels,\northels, histels, histosols, mollisols, vertisols, aridisols,\nandisols, entisols, spodosols, inceptisols (and hapludolls),\nalfisols (cryalf and udalf), natric great groups, aqu-suborders,\nglaciers, and rocklands. QGreenland dispalys data for Greenland.\nUsers can look to the source information for additional data.", "citation": { - "text": "Tarnocai, C., J. Kimble, D. Swanson, S. Goryachkin, Y. M.\nNaumov, V. Stolbovoi, B. Jakobsen, G. Broll, L. Montanarella, A.\nArnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern\nCircumpolar Soils Map, Version 1. Greenland. Ottawa, Canada.\nResearch Branch, Agriculture and Agri-Food Canada. doi:\nhttps://doi.org/. {{date_accessed}}.", + "text": "Tarnocai, C., J. Kimble, D. Swanson, S. Goryachkin, Y. M.\nNaumov, V. Stolbovoi, B. Jakobsen, G. Broll, L. Montanarella, A.\nArnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern\nCircumpolar Soils Map, Version 1. Greenland. Ottawa, Canada.\nResearch Branch, Agriculture and Agri-Food Canada. doi:\nhttps://doi.org/. {{date_accessed}}", "url": "https://nsidc.org/data/GGD602/versions/1" }, "title": "Northern Circumpolar Soils Map, Version 1" @@ -2115,7 +2115,7 @@ "metadata": { "abstract": "The World Magnetic Model (WMM) is a joint product of the United States\u2019\nNational Geospatial-Intelligence Agency (NGA) and the United Kingdom\u2019s\nDefence Geographic Centre (DGC). The WMM was developed jointly by the\nNational Centers for Environmental Information (NCEI, Boulder CO, USA)\n(formerly National Geophysical Data Center (NGDC)) and the British\nGeological Survey (BGS, Edinburgh, Scotland).\n\nThe World Magnetic Model is the standard model used by the U.S. Department\nof Defense, the U.K. Ministry of Defence, the North Atlantic Treaty\nOrganization (NATO) and the International Hydrographic Organization (IHO),\nfor navigation, attitude and heading referencing systems using the\ngeomagnetic field. It is also used widely in civilian navigation and\nheading systems. The model, associated software, and documentation are\ndistributed by NCEI on behalf of NGA. The model is produced at 5-year\nintervals, with the current model expiring on December 31, 2024.\n\nChanges of the fluid flow in the Earth's outer core lead to unpredictable\nchanges in the Earth's magnetic field. Fortunately, the system has large\ninertia, so that these changes take place over time scales of many\nyears. By surveying the field for a few years, one can precisely map the\npresent field and its rate of change and then linearly extrapolate it out\ninto the future. Provided that suitable satellite magnetic observations\nare available, the prediction of the WMM is highly accurate on its release\ndate and then subsequently deteriorates towards the end of the 5 year\nepoch, when it has to be updated with revised values of the model\ncoefficients.\n\nIt is important to recognize that the WMM and the charts produced from\nthis model characterize only the long-wavelength portion of the Earth's\ninternal magnetic field, which is primarily generated in the Earth's fluid\nouter core. The portions of the geomagnetic field generated by the Earth's\ncrust and upper mantle, and by the ionosphere and magnetosphere, are\nlargely unrepresented in the WMM. Consequently, a magnetic sensor such as\na compass or magnetometer may observe spatial and temporal magnetic\nanomalies when referenced to the WMM. In particular, certain local,\nregional, and temporal magnetic declination anomalies can exceed 10\ndegrees. Anomalies of this magnitude are not common but they do\nexist. Declination anomalies of the order of 3 or 4 degrees are not\nuncommon but are usually of small spatial extent.", "citation": { - "text": "NCEI Geomagnetic Modeling Team and British Geological Survey. 2019.\nWorld Magnetic Model 2020. NOAA National Centers for Environmental\nInformation. doi: 10.25921/11v3-da71, 2020, Date accessed:\n{{date_accessed}}.", + "text": "NCEI Geomagnetic Modeling Team and British Geological Survey. 2019.\nWorld Magnetic Model 2020. NOAA National Centers for Environmental\nInformation. doi: 10.25921/11v3-da71, 2020 {{date_accessed}}.", "url": "https://doi.org/10.25921/11v3-da71" }, "title": "The World Magnetic Model" diff --git a/tasks/config.py b/tasks/config.py index ab8bbc2b..3d443252 100644 --- a/tasks/config.py +++ b/tasks/config.py @@ -37,7 +37,7 @@ def validate(ctx, verbose=False): print("🎉🦆 Configuration validation passed.") -@task +@task(aliases=["lock"]) def export(ctx): """Export the config as a JSON string.""" init_config() From c514c9662a9e666b7983cf8c0498bdb461476b1b Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 16:52:23 -0600 Subject: [PATCH 5/6] Add missing DOI Co-authored-by: Trey Stafford --- qgreenland/config/datasets/soil_types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgreenland/config/datasets/soil_types.py b/qgreenland/config/datasets/soil_types.py index ebc4d98e..89b529c3 100644 --- a/qgreenland/config/datasets/soil_types.py +++ b/qgreenland/config/datasets/soil_types.py @@ -39,7 +39,7 @@ Arnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern Circumpolar Soils Map, Version 1. Greenland. Ottawa, Canada. Research Branch, Agriculture and Agri-Food Canada. doi: - https://doi.org/. {{date_accessed}}""" + https://doi.org/10.7265/eb1s-4551. {{date_accessed}}""" ), "url": "https://nsidc.org/data/GGD602/versions/1", }, From b84e162b970e3e8558a12d0e189e93e0b0d19c30 Mon Sep 17 00:00:00 2001 From: Matt Fisher Date: Fri, 18 Aug 2023 16:56:53 -0600 Subject: [PATCH 6/6] Re-lock config --- qgreenland/config/cfg-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qgreenland/config/cfg-lock.json b/qgreenland/config/cfg-lock.json index b2799f08..19207929 100644 --- a/qgreenland/config/cfg-lock.json +++ b/qgreenland/config/cfg-lock.json @@ -1834,7 +1834,7 @@ "metadata": { "abstract": "The full data set consists of a circumpolar map of dominant soil\ncharacteristics, with a scale of 1:10,000,000, covering the United\nStates, Canada, Greenland, Iceland, northern Europe, Russia,\nMongolia, and Kazakhstan. The map was created using the Northern and\nMid Latitude Soil Database. The map is in ESRI Shapefile format,\nconsisting of 11 regional areas. Polygons have attributes that give\nthe percentage polygon area that is a given soil type. The map shows\nthe dominant soil of the spatial polygon unless the polygon is over\n90 percent rock or ice. It also shows the proportion of polygon\nencompassed by the dominant soil or nonsoil. Soils include turbels,\northels, histels, histosols, mollisols, vertisols, aridisols,\nandisols, entisols, spodosols, inceptisols (and hapludolls),\nalfisols (cryalf and udalf), natric great groups, aqu-suborders,\nglaciers, and rocklands. QGreenland dispalys data for Greenland.\nUsers can look to the source information for additional data.", "citation": { - "text": "Tarnocai, C., J. Kimble, D. Swanson, S. Goryachkin, Y. M.\nNaumov, V. Stolbovoi, B. Jakobsen, G. Broll, L. Montanarella, A.\nArnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern\nCircumpolar Soils Map, Version 1. Greenland. Ottawa, Canada.\nResearch Branch, Agriculture and Agri-Food Canada. doi:\nhttps://doi.org/. {{date_accessed}}", + "text": "Tarnocai, C., J. Kimble, D. Swanson, S. Goryachkin, Y. M.\nNaumov, V. Stolbovoi, B. Jakobsen, G. Broll, L. Montanarella, A.\nArnoldussen, O. Arnalds, and M. Yli-Halla. 2002. Northern\nCircumpolar Soils Map, Version 1. Greenland. Ottawa, Canada.\nResearch Branch, Agriculture and Agri-Food Canada. doi:\nhttps://doi.org/10.7265/eb1s-4551. {{date_accessed}}", "url": "https://nsidc.org/data/GGD602/versions/1" }, "title": "Northern Circumpolar Soils Map, Version 1"