Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] Integrate contour lines (elevation) into generated maps with argument -con #188

Merged
merged 31 commits into from
Apr 25, 2023
Merged

[FEAT] Integrate contour lines (elevation) into generated maps with argument -con #188

merged 31 commits into from
Apr 25, 2023

Conversation

treee111
Copy link
Owner

@treee111 treee111 commented Mar 17, 2023 •
edited
Loading

This PR…

  • closes Contour lines #145
  • makes relevant changes to be able to integrate contour lines (elevantion) into the generated maps
    • python coding
    • quickstart documenation
    • usage documentation
    • tag-wahoo-poi.xml to have contour lines included in the generated maps
    • anaconda env .yml files to have the relevant tools included

Considerations and implementations

  • Most of the initial solution been described here: Contour lines #145 (comment)
  • A important thing is that python 3.10 is needed because matplotlib-3.4.3 is needed, later versions which work with python 3.11 do not work a la "_contour" has not been found

How to test

  1. setup a Anaconda environment with python 3.10 if you don't have one already
    https://github.com/treee111/wahooMapsCreator/blob/contour-lines/docs/QUICKSTART_ANACONDA.md#create-anaconda-environment
    make sure that shapely is installed via conda-forge as written in this link!

  2. install additional programs
    https://github.com/treee111/wahooMapsCreator/blob/contour-lines/docs/QUICKSTART_ANACONDA.md#additional-programs-for-generating-contour-lines

  3. use branch contour-lines or alpha version installed via
    pip install wahoomc==4.0.0a3
    pip install wahoomc==4.0.0a5
    pip install wahoomc==4.0.0a10 or
    pip install wahoomc==4.0.0a8

  4. run python -m wahoomc cli -co malta -con or similar for your country / xy-coordinates

Pull Request Checklist

@treee111 treee111 changed the base branch from develop to release-v4.0.0 March 17, 2023 14:45
@treee111 treee111 force-pushed the contour-lines branch 3 times, most recently from a3c5710 to 0ccb308 Compare March 17, 2023 15:10
@treee111 treee111 mentioned this pull request Mar 24, 2023
Merged
4 tasks
@treee111 treee111 marked this pull request as ready for review April 1, 2023 14:05
treee111 added 12 commits April 1, 2023 16:51
@treee111
launch config for contour lines
2a8ef8a
@treee111
correctly check if elevation file is already there in X/Y directory
1d387fc 
temp correctly
@treee111
refactor, separat user/pw
1be92ae 
temp refactor

temp refactor
@treee111
add cli argument for contour lines
91122fa
@treee111
handle FileNotFoundError in function instead of the caller level
40f8289
@treee111
save and read earthexplorer username & password from config file
e3f4ef8 
enable write_config_file to not only write the version of last run ;-)
@treee111
set Cache directory for hgt files to user dir instead of cwd
b5df746 
documentation: http://katze.tfiu.de/projects/phyghtmap/phyghtmap.1.html
@treee111
move contour packages into conda env .yml files + delete separate con…
36bf409 
…tour .yml file
@treee111
add contour lines to documentation
622b1d9
@treee111
mention -con in USAGE.md and cleanup/restructure
16c6a57
@treee111
check for phyghtmap on macOS
0a87a9c
@treee111
ask for -con on main.py level
e6a71e2
@treee111 treee111 mentioned this pull request Apr 1, 2023
Closed
@treee111 treee111 added the enhancement New feature or request label Apr 1, 2023
treee111 added 4 commits April 2, 2023 19:41
@treee111
Merge branch 'release-v4.0.0' into contour-lines
9a96cae
@treee111
Bump version to v4.0.0a8
03c3c19
@treee111
update QUICKSTART documentation
77e0bba 
- python3 is oldschool, not needed anymore. got it from http://katze.tfiu.de/projects/phyghtmap

- add required conda packages for contour lines to QUICKSTART

- differentiate Windows and macOS/Linux for phyghtmap installation
@treee111
make logging identical to other processing functions
de7ead4
@treee111 treee111 added this to the v4.0.0 milestone Apr 3, 2023
@treee111 treee111 changed the title [FEAT] Implement contour lines [FEAT] Integrate contour lines (elevation) into generated maps with -con Apr 3, 2023
@treee111 treee111 changed the title [FEAT] Integrate contour lines (elevation) into generated maps with -con [FEAT] Integrate contour lines (elevation) into generated maps with argument -con Apr 3, 2023
treee111 added 4 commits April 3, 2023 19:28
@treee111
update misc stuff (leftovers)
9e3ab34 
- add required conda packages for contour lines to FAQ
@treee111
Bump version to v4.0.0a10
9aa5492
@treee111
move earthexplorer credentials prompt to the beginning
9a64f21 
so that the user can enter it once the tool startet and not in the middle of processing e.g. big countries
@treee111
add GUI checkbox for contour lines
e843caa
treee111
treee111 commented Apr 25, 2023
View reviewed changes
Copy link
Owner Author

@treee111 treee111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested in #145

@treee111 treee111 merged commit 0078845 into release-v4.0.0 Apr 25, 2023
@treee111 treee111 deleted the contour-lines branch April 25, 2023 19:10
treee111 added a commit that referenced this pull request May 5, 2023
@treee111 @masc4ii
[FEAT] Integrate contour lines (elevation) into generated maps with a…
c08907d 
…rgument `-con` (#188)

* dev environment for countour lines

need to be installed manually in addition: http://katze.tfiu.de/projects/phyghtmap/

* Added contour lines py code

Thanks to @masc4ii and @Ebe66

* Fix polygon lines

* elevation: refactor, fix pylint findings

* launch config for contour lines

* correctly check if elevation file is already there in X/Y directory

temp correctly

* refactor, separat user/pw

temp refactor

temp refactor

* add cli argument for contour lines

* handle FileNotFoundError in function instead of the caller level

* save and read earthexplorer username & password from config file

enable write_config_file to not only write the version of last run ;-)

* set Cache directory for hgt files to user dir instead of cwd

documentation: http://katze.tfiu.de/projects/phyghtmap/phyghtmap.1.html

* move contour packages into conda env .yml files + delete separate contour .yml file

* add contour lines to documentation

* mention -con in USAGE.md and cleanup/restructure

* check for phyghtmap on macOS

* ask for -con on main.py level

* Bump version to v4.0.0a3

* Bump version to v4.0.0a5

* Bump version to v4.0.0a8

* update QUICKSTART documentation

- python3 is oldschool, not needed anymore. got it from http://katze.tfiu.de/projects/phyghtmap

- add required conda packages for contour lines to QUICKSTART

- differentiate Windows and macOS/Linux for phyghtmap installation

* make logging identical to other processing functions

* launch config & documentation

* setup check can be equal for both OS

* update misc stuff (leftovers)
- add required conda packages for contour lines to FAQ

* Bump version to v4.0.0a10

* move earthexplorer credentials prompt to the beginning

so that the user can enter it once the tool startet and not in the middle of processing e.g. big countries

* add GUI checkbox for contour lines

---------

Co-authored-by: masc4ii <[email protected]>
alfh pushed a commit to alfh/wahooMapsCreator that referenced this pull request Nov 4, 2023
@treee111 @masc4ii @alfh
[FEAT] Integrate contour lines (elevation) into generated maps with a…
4964573 
…rgument `-con` (treee111#188)

* dev environment for countour lines

need to be installed manually in addition: http://katze.tfiu.de/projects/phyghtmap/

* Added contour lines py code

Thanks to @masc4ii and @Ebe66

* Fix polygon lines

* elevation: refactor, fix pylint findings

* launch config for contour lines

* correctly check if elevation file is already there in X/Y directory

temp correctly

* refactor, separat user/pw

temp refactor

temp refactor

* add cli argument for contour lines

* handle FileNotFoundError in function instead of the caller level

* save and read earthexplorer username & password from config file

enable write_config_file to not only write the version of last run ;-)

* set Cache directory for hgt files to user dir instead of cwd

documentation: http://katze.tfiu.de/projects/phyghtmap/phyghtmap.1.html

* move contour packages into conda env .yml files + delete separate contour .yml file

* add contour lines to documentation

* mention -con in USAGE.md and cleanup/restructure

* check for phyghtmap on macOS

* ask for -con on main.py level

* Bump version to v4.0.0a3

* Bump version to v4.0.0a5

* Bump version to v4.0.0a8

* update QUICKSTART documentation

- python3 is oldschool, not needed anymore. got it from http://katze.tfiu.de/projects/phyghtmap

- add required conda packages for contour lines to QUICKSTART

- differentiate Windows and macOS/Linux for phyghtmap installation

* make logging identical to other processing functions

* launch config & documentation

* setup check can be equal for both OS

* update misc stuff (leftovers)
- add required conda packages for contour lines to FAQ

* Bump version to v4.0.0a10

* move earthexplorer credentials prompt to the beginning

so that the user can enter it once the tool startet and not in the middle of processing e.g. big countries

* add GUI checkbox for contour lines

---------

Co-authored-by: masc4ii <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
v4.0.0
Development

Successfully merging this pull request may close these issues.

Contour lines
2 participants
@treee111 @masc4ii