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.

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

callOnUpdated if an updated element does not have a local edit #5818

Merged
merged 4 commits into from
Aug 21, 2024

Conversation

Helium314
Copy link
Collaborator

Fixes #5745 as in the latest comments.
(the new test fails without the changes to MapDataWithEditsSource)

Copy link
Member

@westnordost westnordost left a comment

Choose a reason for hiding this comment

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

Very nice! Did you test it (beyond the unit test)?

Helium314 and others added 3 commits August 21, 2024 20:31
…/MapDataWithEditsSource.kt

Co-authored-by: Tobias Zwick <[email protected]>
…/MapDataWithEditsSource.kt

Co-authored-by: Tobias Zwick <[email protected]>
…/MapDataWithEditsSource.kt

Co-authored-by: Tobias Zwick <[email protected]>
@Helium314
Copy link
Collaborator Author

Very nice! Did you test it (beyond the unit test)?

Not yet, will do a test a bit later.

@Helium314
Copy link
Collaborator Author

Works as intended, tested in buildings overlay.

@westnordost westnordost merged commit 62f6d88 into streetcomplete:master Aug 21, 2024
@westnordost westnordost deleted the fix-update-on-conflict branch August 21, 2024 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Element is not updated after conflict on upload
2 participants