lib: Add new SRTM_percent color table

[cmbarton]

This color table uses the color ramp from the srtm_plus color table for terrain to create colors for relative elevation (spread over the range of elevations in a raster map) rather than absolute elevation in meters. This applies srtm colors in a way similar to the way the elevation color table applies them. This color table is especially useful in creating nice looking elevation maps and shading relief maps.

If this seems useful, it could be backported to 8.4.x and 7.8

[neteler]

Would you mind to add a screenshot here? (simply pasting works)

[cmbarton]

Would you mind to add a screenshot here? (simply pasting works)

Here are 2 from the new Flagstaff, AZ demo data set (NC does not have much relief). An SRTM DEM and a color-shaded relief map of the same area.

[cmbarton]

Following up creating an image for Markus, I'd like to make a slight change in this. What is the best way to do it? Modify the PR or submit a new one?

[neteler]

Please modify this pull request.

[cmbarton]

Please modify this pull request.

done. Added a new image too

[neteler]

For full integration of the new color table, it also needs to be added to https://github.com/OSGeo/grass/blob/main/lib/gis/colors.desc (otherwise it won't show up in r.colors, v.colors, etc.).

[cmbarton]

OK. Thanks. Just put a 2nd copy there?

…

____________________ Michael Barton

On Oct 28, 2024, at 2:38 PM, Markus Neteler ***@***.***> wrote: For full integration of the new color table, it also needs to be added to https://github.com/OSGeo/grass/blob/main/lib/gis/colors.desc (otherwise it won't show up in r.colors, v.colors, etc.). — Reply to this email directly, view it on GitHub <#4608 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ACENLL6OQZAMBY2IEEOUXHTZ52OC7AVCNFSM6AAAAABQWJMH36VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINBSGY4DANRYG4>. You are receiving this because you authored the thread.

[neteler]

OK. Thanks. Just put a 2nd copy there?

Essentially you edit the file here in your branch and commit/push it to this branch.

[cmbarton]

I'll do that after class today. I guess that will make a 2nd PR

[echoix]

Since we normally squash-merge PRs, up until this PR is merged, you can add more commits, merge main into, do anything you'd like, and we can edit the final merge message once done

[wenzeslaus]

The ds store modification to gitignore needs to be universal to all directories. That might the thing which is better handled in a separate PR.

[nilason]

The ds store modification to gitignore needs to be universal to all directories. That might the thing which is better handled in a separate PR.

Yes, that should go into a separate PR. Note that the pattern ".DS_Store" is enough.

It is also good to have this in the global git config:

echo .DS_Store >> ~/.gitignore
git config --global core.excludesfile ~/.gitignore

[petrasovaa]

I am not fond of the name "srtm_pct", how about srtm_percent or srtm_relative?

[cmbarton]

1. I'm fine with shortening the description and will see about the suggested alternative. Any guidelines on how short/long?
2. I originally had srtm_rel or srtm_relative but thought that was not clear. srtm_percent is fine. I was trying to keep it short.
3. I don't want my .gitignore update to be in the PR. I did not intend for it to be there. So I am happy to take it out. How to do that? I'd like to set it for any future commits but don't understand how to set it for me and not have it go into grass/main. This is not a huge issue but suggestions would be welcome.
4. Is 1 fork = 1 PR? Perhaps this is where I am confused. I was assuming that I could use my fork for >1 PR. Which is correct?
5. What do you recommend I do at this point?

• If there a way to delete the .gitignore part, is the new color table AND description already in the PR?
• Or is the color.desc part still waiting to create a new PR?
• It both parts (color table and description) is already in the PR, can I just rename the color table and modify the description locally, commit and push?
• Do I have to do something else?

[echoix]

4. Is 1 fork = 1 PR? Perhaps this is where I am confused. I was assuming that I could use my fork for >1 PR. Which is correct?

1 branch (of your fork) = 1 PR. You can continue changing the branch, and each commit pushed once the PR is opened shows up here. You can use your fork for creating multiple PRs, each in a branch.

[cmbarton]

4. Is 1 fork = 1 PR? Perhaps this is where I am confused. I was assuming that I could use my fork for >1 PR. Which is correct?

1 branch (of your fork) = 1 PR. You can continue changing the branch, and each commit pushed once the PR is opened shows up here. You can use your fork for creating multiple PRs, each in a branch.

Thanks much. This explains a lot. So I can make any updates, commit and push, and it will update the PR. Good to know.

[cmbarton]

I made the recommended changes in the PR. I am happy to remove the .gitignore commit if someone can tell me how. Can/should I just delete it in my fork/branch and commit/push?

[echoix]

I made the recommended changes in the PR. I am happy to remove the .gitignore commit if someone can tell me how. Can/should I just delete it in my fork/branch and commit/push?

That would do it. It's better a new commit (rather than rebase+force push) as there are already some review comments. After a force-push, it's hard to follow the comments that were made on commits that don't exist anymore in the PR.

[cmbarton]

I made the recommended changes in the PR. I am happy to remove the .gitignore commit if someone can tell me how. Can/should I just delete it in my fork/branch and commit/push?

That would do it. It's better a new commit (rather than rebase+force push) as there are already some review comments. After a force-push, it's hard to follow the comments that were made on commits that don't exist anymore in the PR.

Thanks. Done.

[wenzeslaus]

The goal is to remove the changes, not file file. Try git checkout upstream/main -- path/to/file. Upstream may be called differently depending on how you set up your local repo, check git remote -v.

[cmbarton]

The goal is to remove the changes, not file file. Try git checkout upstream/main -- path/to/file. Upstream may be called differently depending on how you set up your local repo, check git remote -v.

I can always get this back locally. I just want this PR to go through

[wenzeslaus]

The deletion is included in the PR. See the Files tab. That's why the file needs to be restored with checkout.

[petrasovaa]

Also, I just modified the PR title, see the instructions:
https://github.com/OSGeo/grass/blob/main/doc/development/github_guide.md#pr-title