Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Feature/592 implement heat map on the frontend #804

Open
wants to merge 182 commits into
base: master
Choose a base branch
from
Open

Feature/592 implement heat map on the frontend #804

wants to merge 182 commits into from

Conversation

badnames
Copy link
Member

@badnames badnames commented Aug 7, 2023 •
edited
Loading

Please note:
This PR is based on #684 and #684 should therefore be merged first.

This PR does not include facilities for adding map bounds or the shade layer, they will be added in a separate PR so we keep this one as simple as possible.

Special thanks to @Bushuo for helping me find an annoying bug related to axios loading binary data that prevented me from submitting this PR before friday ❤️.

Basics

  • I added a line to /doc/CHANGELOG.md
  • The PR is rebased with current master.
  • Details of what you changed are in commit messages.
  • References to issues, e.g. close #X, are in the commit messages.
  • The buildserver is happy.

Checklist

  • I have installed and I am using pre-commit hooks
  • I fully described what my PR does in the documentation
    (not in the PR description)
  • I fixed all affected documentation
  • I fixed the introduction tour
  • I wrote migrations in a way that they are compatible with already present data
  • I fixed all affected decisions
  • I added unit tests for my code
  • I added code comments, logging, and assertions as appropriate
  • I translated all strings visible to the user
  • I mentioned every code or binary not directly written or done by me in reuse syntax
  • I created left-over issues for things that are still to be done
  • Code is conforming to our Architecture
  • Code is conforming to our Guidelines
    (exceptions are documented)
  • Code is consistent to our Design Decisions

Review

  • I've tested the code
  • I've read through the whole code
  • Examples are well chosen and understandable

@kitzbergerg
#638 initial shadings endpoints
2a5724a
@kitzbergerg
refactor SQL calculate_heatmap to instead call function calculate_score
140f98f
@kitzbergerg
use array to store layer ids at dedicated positions
8bbc9c0
@kitzbergerg
#638 use shadings in heatmap calculation
1317e34
@kitzbergerg
Merge branch 'master' of github.com:ElektraInitiative/PermaplanT into…
e97b77a 
… #638_shade_layer_endpoint
@kitzbergerg
add shadings to changelog
ec75d26
@kitzbergerg
fix down.sql
e8297d6
@kitzbergerg
move shade_layer to current and add gabriel as backend implementor
1c822f1
@kitzbergerg
update SQL doc according to suggestions
cf2d503
@kitzbergerg
update SQL doc and uppercase integers
ee50d96
@kitzbergerg
add manual test for shading with heatmap to show that it works
71d1e3b
@kitzbergerg
add alpha channel to PNG
99f580a
@kitzbergerg
rename fields of score
c4500cb
@kitzbergerg
change heatmap gradient to red-green
a570bb6
@kitzbergerg
change heatmap logging to trace
b8fe47a
@kitzbergerg
change default map size back to 1ha
01fbc25
@kitzbergerg
fix down.sql
07a1a05
@kitzbergerg
Merge branch 'master' of github.com:ElektraInitiative/PermaplanT into…
ee23b84 
… #638_shade_layer_endpoint
@kitzbergerg
set SQL type formatting to uppercase
5d16ad0
@kitzbergerg
use typeshare.toml to map Polygon to ts object
e6dc289
@kitzbergerg
changes according to suggestions, include light requirement in shade …
d2f8aec 
…calculation
@kitzbergerg
add test for light requirement
20cab0e
@kitzbergerg
add heatmap test for plant relations
9435306
@kitzbergerg
fix light requirement calculation and add test case
d64613c
@kitzbergerg
reduce influence of shading on preference
d05be15
@kitzbergerg
heatmap: add checks that layers are of correct type
da4b884
@kitzbergerg
heatmap: use sigmoid as scaling function
c05804c
@kitzbergerg
Merge branch 'master' of github.com:ElektraInitiative/PermaplanT into…
6276850 
… #638_shade_layer_endpoint
@kitzbergerg
heatmap: performance test scripts initial commit
22a6855
@kitzbergerg
Merge branch 'master' into #638_shade_layer_endpoint
792edac
Moritz Schalk and others added 10 commits March 27, 2024 21:51
Change layer order such that the plant layer is on top of the shade a…
75d52d0 
…nd heat map layer.
@badnames @danielsteinkogler
Remove redundant comment.
4131293 
Co-authored-by: danielsteinkogler <[email protected]>
@markus2330
Add shade layer to frontend (#1135)
a74237c 
<!--
Check relevant points but **please do not remove entries**.
-->

## Basics

<!--
These points need to be fulfilled for every PR.
-->

- [x] I added a line to [changelog.md](/doc/changelog.md)
- [x] The PR is rebased with current master.
- [x] Details of what you changed are in commit messages.
- [x] References to issues, e.g. `close #X`, are in the commit messages
and changelog.
- [x] The buildserver is happy.

<!--
If you have any troubles fulfilling these criteria, please write about
the trouble as comment in the PR.
We will help you, but we cannot accept PRs that do not fulfill the
basics.
-->

## Checklist

<!--
For documentation fixes, spell checking, and similar none of these
points below need to be checked.
Otherwise please check these points when getting a PR done:
-->

- [ ] I have installed and I am using [pre-commit
hooks](../doc/contrib/README.md#Hooks)
- [ ] I fully described what my PR does in the documentation
- [ ] I fixed all affected documentation
- [ ] I fixed the introduction tour
- [ ] I wrote migrations in a way that they are compatible with already
present data
- [ ] I fixed all affected decisions
- [ ] I added automated tests or a [manual test
protocol](../doc/tests/manual/protocol.md)
- [ ] I added code comments, logging, and assertions as appropriate
- [ ] I translated all strings visible to the user
- [ ] I mentioned [every code or
binary](https://github.com/ElektraInitiative/PermaplanT/blob/master/.reuse/dep5)
not directly written or done by me in [reuse
syntax](https://reuse.software/)
- [ ] I created left-over issues for things that are still to be done
- [ ] Code is conforming to [our Architecture](/doc/architecture)
- [ ] Code is conforming to [our Guidelines](/doc/guidelines)
- [ ] Code is consistent to [our Design Decisions](/doc/decisions)
- [ ] Exceptions to any guidelines are documented

## Review

<!--
Reviewers can copy&check the following to their review.
Also the checklist above can be used.
But also the PR creator should check these points when getting a PR
done:
-->

- [ ] I've tested the code
- [ ] I've read through the whole code
- [ ] I've read through the whole documentation
- [ ] I've checked conformity to guidelines
Merge with current master.
ed76165 
Shade layer is currently broken.
Remove unused action id and user id from shading action structs.
d398f3f
Fix incorrect routing.
bbdb987
Reintegrate shade layer with new APis.
daaeeaa
@badnames
Merge branch 'master' into feature/592-implement-heat-map-on-the-fron…
009aebe 
…tend
Fix remaining integration issues with the new API.
2e67c68
Fix clippy error.
9d43b6d
@badnames
Copy link
Member Author

jenkins build please

@badnames
Copy link
Member Author

jenkins build please

2 similar comments
@badnames
Copy link
Member Author

jenkins build please

@badnames
Copy link
Member Author

jenkins build please

@badnames
Copy link
Member Author

badnames commented Apr 18, 2024 •
edited
Loading

@markus2330
@horenso
@danielsteinkogler
@hatchla
@chr-schr

After yet another week of bug fixing, this branch should be ready to become our new dev branch.
Unfurtunately the pipeline seems to be broken, so I could not make sure that the project builds at the moment.

@markus2330
Copy link
Contributor

@badnames great, thank you! ❤️

@filo14 can you check out the pipeline?

@filo14
Copy link
Contributor

filo14 commented Apr 18, 2024 •
edited
Loading

There are some errors regarding shadings.rs and timeline.rs in test; things like unresolved classes etc. . When I checkout the branch locally I have similar error warnings.

On another note, the pipeline fails very often at the moment, but should be a seperate problem.

@badnames
Copy link
Member Author

badnames commented Apr 18, 2024 •
edited
Loading

On another note, the pipeline fails very often at the moment, but should be a seperate problem.

That was what I meant.
I tried to run it three times yesterday and it always failed because it could not connect to the database while testing migrations.

image

There are some errors regarding shadings.rs and timeline.rs in test; things like unresolved classes etc. . When I checkout the branch locally I have similar error warnings.

That is already fixed.

@badnames
Copy link
Member Author

jenkins build please

1 similar comment
@badnames
Copy link
Member Author

jenkins build please

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@horenso horenso horenso left review comments

@kitzbergerg kitzbergerg Awaiting requested review from kitzbergerg

@ThorbenStaufer ThorbenStaufer Awaiting requested review from ThorbenStaufer

@markus2330 markus2330 Awaiting requested review from markus2330

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement Heat-Map on the Frontend
5 participants
@badnames @markus2330 @filo14 @horenso @kitzbergerg