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

Feature/43 add map #44

Merged
merged 49 commits into from
Jan 30, 2022
Merged

Feature/43 add map #44

merged 49 commits into from
Jan 30, 2022

Conversation

Dassderdie
Copy link
Collaborator

@Dassderdie Dassderdie commented Jan 12, 2022 •
edited
Loading

Fix #43

What did we do?

  • add an OpenLayers map
  • dummy elements (patients, vehicles, personnel, etc.) can be created via the buttons at the bottom
  • the elements are rendered on the map in their specified position
  • elements have images as textures
  • elements can be moved (translated) via drag and drop
  • the movement of an element is animated
  • all this integrates with the state synchronization

image
Multiple thousand elements can be displayed at a time.

image

About the code

  • Most of the architectural decisions made will probably be refactored soon - I tried to make educated guesses on what will work and what not - but I think we'll see everything clearer when we implement more features.
  • The actions and reducers in shared are now big enough to split them more up - this will not happen on this branch
  • FeatureManager > CommonFeatureManager > PatientFeatureManager, VehicleFeatureManager, ...

@Dassderdie Dassderdie added the enhancement New feature or request label Jan 12, 2022
@Dassderdie Dassderdie added this to the 1 milestone Jan 12, 2022
@Dassderdie Dassderdie self-assigned this Jan 12, 2022
@Dassderdie Dassderdie added this to In progress in BP2021HG1 via automation Jan 12, 2022
Dassderdie and others added 21 commits January 12, 2022 14:36
@Dassderdie @jonathanmmm
Check for existence of patient in move patient reducer
d1a2fdc 
Co-authored-by: jonathanmmm <jonathanmmm@users.noreply.github.com>
@Dassderdie @jonathanmmm
Prevent open layers control buttons from blocking the map
5c7c4f9 
Co-authored-by: jonathanmmm <jonathanmmm@users.noreply.github.com>
@Dassderdie
Animate the movement of patients
8e56c58
@Dassderdie
Improve code structure
04db1ab
@Dassderdie
Add max zoom level
3b92efc
@Dassderdie
Make patient dimensions more realistic
53c3394
@Dassderdie
Refactor movementAnimations to own class
529c19c 
* Fixed multiple edge cases
@Dassderdie
Increase dimensions of the map
0107e21
@Dassderdie
Merge remote-tracking branch 'origin/dev' into feature/43-add-map
44242b0
@Dassderdie
Cache the tiles when zooming in and out
5154eff
@Dassderdie
Prevent clipping during animations/zoom
4ae1ec9
@Dassderdie
Fix element sometimes not being rendered when moving into viewport
0e4b090
@Dassderdie
Merge remote-tracking branch 'origin/dev' into feature/43-add-map
c60bea5
@Dassderdie @jonathanmmm
Add temporary utilites for better testing
a4e41d4 
Co-authored-by: jonathanmmm <jonathanmmm@users.noreply.github.com>
@Dassderdie
Use custom images for patients instead of Circles
9807b88
@Dassderdie
Move patientStyle to patientRenderer
95cd379
@Dassderdie @jonathanmmm
Refactor ElementRenderer code
0181df1 
Co-authored-by: jonathanmmm <jonathanmmm@users.noreply.github.com>
@Dassderdie
Improve ImageStyleHelper
bfe966a
@Dassderdie
Improve code style of exercise map
d10b93d
@Dassderdie
Refactor renderers
b563045
@Dassderdie
More refactoring
c3b35de
@Dassderdie Dassderdie marked this pull request as ready for review January 24, 2022 19:57
@Dassderdie Dassderdie moved this from In progress to In Review in BP2021HG1 Jan 25, 2022
@Dassderdie Dassderdie removed this from In Review in BP2021HG1 Jan 26, 2022
@ClFeSc ClFeSc mentioned this pull request Jan 29, 2022
Closed
ClFeSc
ClFeSc requested changes Jan 29, 2022
View reviewed changes
Copy link
Contributor

@ClFeSc ClFeSc left a comment

Choose a reason for hiding this comment

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

Many comments, but mostly small stuff. Sorry that it took so long.

frontend/src/app/shared/exercise-map/exercise-map.component.html Show resolved Hide resolved
frontend/src/app/shared/exercise-map/exercise-map.component.ts Show resolved Hide resolved
frontend/src/app/shared/exercise-map/exercise-map.component.ts Outdated Show resolved Hide resolved
frontend/src/app/shared/exercise-map/exercise-map.component.ts Show resolved Hide resolved
frontend/src/app/shared/exercise-map/exercise-map.component.ts Show resolved Hide resolved
frontend/src/app/state/exercise/exercise.selectors.ts Outdated Show resolved Hide resolved
frontend/tsconfig.json Show resolved Hide resolved
shared/src/models/material.ts Show resolved Hide resolved
shared/src/store/exercise.actions.ts Outdated Show resolved Hide resolved
shared/src/store/reducer/exercise-reducer-map.ts Outdated Show resolved Hide resolved
@ClFeSc ClFeSc added the frontend Issues mainly related to the frontend label Jan 29, 2022
@Dassderdie
Copy link
Collaborator Author

@ClFeSc The pipeline fails again in the frontend because of this strange node error.
I would propose that we just remove jest-preset-angular (which is probably responsible for this).

We need it to write unit tests for angular stuff (components, services, pipes, directives etc.). Currently, we solely write unit tests for typescript-only stuff or e2e tests via cypress...

@ClFeSc
Copy link
Contributor

ClFeSc commented Jan 30, 2022

@ClFeSc The pipeline fails again in the frontend because of this strange node error. I would propose that we just remove jest-preset-angular (which is probably responsible for this).

We need it to write unit tests for angular stuff (components, services, pipes, directives etc.). Currently, we solely write unit tests for typescript-only stuff or e2e tests via cypress...

Go ahead, when this helps. I don't really know where this problem might come from, and why it returned here.

ClFeSc
ClFeSc requested changes Jan 30, 2022
View reviewed changes
frontend/src/app/app.component.html Outdated Show resolved Hide resolved
frontend/src/app/app.component.ts Outdated Show resolved Hide resolved
shared/src/utils/immutability.ts Show resolved Hide resolved
@Dassderdie Dassderdie mentioned this pull request Jan 30, 2022
Closed
@ClFeSc ClFeSc self-requested a review January 30, 2022 15:03
@ClFeSc ClFeSc self-requested a review January 30, 2022 15:06
@Dassderdie Dassderdie merged commit 323febc into dev Jan 30, 2022
@Dassderdie Dassderdie deleted the feature/43-add-map branch January 30, 2022 15:07
anonym-HPI pushed a commit that referenced this pull request Apr 6, 2022
@Dassderdie @anonym-HPI
Merge pull request #44 from hpi-sam/feature/43-add-map
ab3617d 
Feature/43 add map
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ClFeSc ClFeSc ClFeSc approved these changes

@hpistudent72 hpistudent72 Awaiting requested review from hpistudent72

Assignees

@Dassderdie Dassderdie

@anonym-HPI anonym-HPI

Labels
enhancement New feature or request frontend Issues mainly related to the frontend
Projects
None yet
Milestone
1
Development

Successfully merging this pull request may close these issues.

Add map
3 participants
@Dassderdie @ClFeSc @anonym-HPI