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

Use Groups instead of Layers (again). #1224

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

Conversation

badnames
Copy link
Member

@badnames badnames commented Mar 27, 2024

Basics

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

Checklist

  • 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
  • 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
  • Code is consistent to our Design Decisions
  • Exceptions to any guidelines are documented

First Time Checklist

Review

  • 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
  • I've checked conformity to requirements
  • I've checked that the requirements are tested

@badnames badnames linked an issue Mar 27, 2024 that may be closed by this pull request
Copy link
Contributor

@danielsteinkogler danielsteinkogler left a comment

Choose a reason for hiding this comment

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

LGTM :D

@markus2330
Copy link
Contributor

There is unfortunately a merge conflict.

Moritz Schalk added 4 commits March 29, 2024 13:59
…nva-layers' into fix/952-use-groups-instead-of-konva-layers

# Conflicts:
#	frontend/src/features/map_planning/components/EditorMap.tsx
@badnames
Copy link
Member Author

Should be rebased now

@badnames badnames mentioned this pull request Mar 29, 2024
24 tasks
@markus2330
Copy link
Contributor

Something went wrong with the rebase.

@badnames badnames changed the base branch from master to feature/680-grid-improvements March 31, 2024 14:39
@badnames badnames changed the base branch from feature/680-grid-improvements to master March 31, 2024 14:39
@badnames
Copy link
Member Author

badnames commented Mar 31, 2024

Nothing went wrong.
GitHub apparently shows commits that are already in the target branch after you rebase.

https://stackoverflow.com/questions/16306012/github-pull-request-showing-commits-that-are-already-in-target-branch

@badnames badnames closed this Mar 31, 2024
@badnames badnames reopened this Mar 31, 2024
@markus2330
Copy link
Contributor

markus2330 commented Mar 31, 2024

Diffs are now shown correctly.

This PR seems to introduce two blockers:

  • visualization lines broken
  • multi-select broken

Is this because of groups?

@markus2330
Copy link
Contributor

please rebase

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

use groups instead of konva layers
3 participants