From 3ccecb020fa3cfadc5a41fe894845362026d6d03 Mon Sep 17 00:00:00 2001 From: Trey Stafford Date: Tue, 22 Aug 2023 11:46:10 -0600 Subject: [PATCH 1/5] Update racmo wind vectors style: remove color coding for magnitude Magnitude is represented by the size of the vector lines. The color mapping was causing conflicts with other layers (like the raster of annual wind speed). This problem was discovered in: https://github.com/nsidc/qgreenland/pull/749 --- .../ancillary/styles/racmo_wind_vectors.qml | 857 +++--------------- 1 file changed, 134 insertions(+), 723 deletions(-) diff --git a/qgreenland/ancillary/styles/racmo_wind_vectors.qml b/qgreenland/ancillary/styles/racmo_wind_vectors.qml index 8f770fe2f..f4163e3a5 100644 --- a/qgreenland/ancillary/styles/racmo_wind_vectors.qml +++ b/qgreenland/ancillary/styles/racmo_wind_vectors.qml @@ -1,616 +1,163 @@ - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -620,142 +167,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 753871bf917097669feb0e14031052e19adfd1a2 Mon Sep 17 00:00:00 2001 From: Trey Stafford Date: Tue, 22 Aug 2023 11:48:13 -0600 Subject: [PATCH 2/5] CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0253fe6d9..a09db1a48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ * Add new "Geology/Mineral occurrences" layer from GEUS. * Update `layer_list.csv` to include new column indicating if each layer is stored on disk. Internet-required layers take the value `False`. +* Improve symbology for "Regional climate models/RACMO model output/Annual mean + wind vectors 1958-2019 (5km)" by removing color mapping to magnitude + values. This was causing conflicts with other layers' color maps. # v3.0.0alpha4 (2023-07-21) From 3993ce7f4a9da8062cb77a3d70801074338ead64 Mon Sep 17 00:00:00 2001 From: Trey Stafford Date: Wed, 23 Aug 2023 12:49:36 -0600 Subject: [PATCH 3/5] Remove OBE "More coming soon..." --- doc/user/reference/glossary.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/user/reference/glossary.md b/doc/user/reference/glossary.md index 98af2f239..ddc1966d5 100644 --- a/doc/user/reference/glossary.md +++ b/doc/user/reference/glossary.md @@ -26,7 +26,6 @@ targeted use. Modules include: - QGreenland Core: Covers a wide variety of disciplines and scientific needs. Curated to be useful for the largest number of users. -- More coming soon... ## Defined Terms From ffa550e5bdf95547bd756e4ecc288ed3be65163a Mon Sep 17 00:00:00 2001 From: Trey Stafford Date: Wed, 23 Aug 2023 13:41:15 -0600 Subject: [PATCH 4/5] Remove NSF badges from "what is next for qgreenland" discussion These break the PDF build --- doc/user/discussion/what-is-next-qgreenland.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/user/discussion/what-is-next-qgreenland.md b/doc/user/discussion/what-is-next-qgreenland.md index 46207e126..12ad0a2f7 100644 --- a/doc/user/discussion/what-is-next-qgreenland.md +++ b/doc/user/discussion/what-is-next-qgreenland.md @@ -6,8 +6,6 @@ NSF's EarthCube program and marks the start of planning for our next award. ## [QGreenland: Enabling Science through GIS](https://www.nsf.gov/awardsearch/showAward?AWD_ID=1928393) -[![NSF-1928393](https://img.shields.io/badge/NSF-1928393-red.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=1928393) - Under this grant, we released QGreenland v1, v2, and v3. The QGreenland team also hosted virtual (e.g., [1](https://qgreenland-workshop-2023-researcher.github.io/), @@ -18,8 +16,6 @@ travel to Denmark and Greenland. ## [QGreenland-Net: Open, connected data infrastructure for Greenland-focused geoscience, and beyond](https://www.nsf.gov/awardsearch/showAward?AWD_ID=2324765) -[![NSF-1928393](https://img.shields.io/badge/NSF-2324765-red.svg)](https://nsf.gov/awardsearch/showAward?AWD_ID=2324765) - Under QGreenland's next award, we will focus on developing community practices for data customization that QGreenland and other communities can leverage to create consistent geospatial data packages. Learn more From 0843c99f04ecb6c9a7d619ae5edbc2a70b7a16ef Mon Sep 17 00:00:00 2001 From: Trey Stafford Date: Wed, 23 Aug 2023 13:56:30 -0600 Subject: [PATCH 5/5] Revert use of sed Not working... --- qgreenland/config/cfg-lock.json | 4 +++- .../layers/Glaciology/Ice sheet velocity/GrIMP/grimp.py | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/qgreenland/config/cfg-lock.json b/qgreenland/config/cfg-lock.json index af8358dd5..3896c9d7e 100644 --- a/qgreenland/config/cfg-lock.json +++ b/qgreenland/config/cfg-lock.json @@ -12112,7 +12112,9 @@ "{input_dir}/downsampled.tif", "{output_dir}/data_with_header.csv", "&&", - "sed -i '1s/^/x,y,vx,vy\n/' {output_dir}/data_with_header.csv" + "echo \"x,y,vx,vy\" > {output_dir}/data_with_header.csv", + "&&", + "cat {output_dir}/as_xyz.xyz >> {output_dir}/data_with_header.csv" ], "type": "command" }, diff --git a/qgreenland/config/layers/Glaciology/Ice sheet velocity/GrIMP/grimp.py b/qgreenland/config/layers/Glaciology/Ice sheet velocity/GrIMP/grimp.py index a98906eaf..5ac6c95f3 100644 --- a/qgreenland/config/layers/Glaciology/Ice sheet velocity/GrIMP/grimp.py +++ b/qgreenland/config/layers/Glaciology/Ice sheet velocity/GrIMP/grimp.py @@ -152,9 +152,11 @@ def make_layer( "-csv", "-allbands", "{input_dir}/downsampled.tif", - "{output_dir}/data_with_header.csv", + "{output_dir}/as_xyz.xyz", "&&", - "sed -i '1s/^/x,y,vx,vy\n/' {output_dir}/data_with_header.csv", + 'echo "x,y,vx,vy" > {output_dir}/data_with_header.csv', + "&&", + "cat {output_dir}/as_xyz.xyz >> {output_dir}/data_with_header.csv", ], ), # Finally, convert to gpkg.