#12091 closed defect (fixed)
Merging of nodes show conflict in case that one node is part of a relation
Reported by: | ratrun | Owned by: | team |
---|---|---|---|
Priority: | major | Milestone: | 15.12 |
Component: | Core | Version: | tested |
Keywords: | template_report | Cc: | Klumbumbus |
Description
Since JOSM version 8969 it is not possible to merge two nodes any longer in case that one of the nodes is part of a relation. A conflict dialog is shown instead. This conflict cannot be solved. Therefore I consider this problem as major.
See discussion in https://lists.openstreetmap.org/pipermail/talk-de/2015-November/112164.html (German only)
What steps will reproduce the problem?
- Revert changeset 35224160 (this is because the nodes are already merged now)
- Select the nodes of the major corssing with the traffic light
- Press "m"
-> Conflict dialog is shown
What is the expected result?
Automatic merge just as in older JOSM versions
What happens instead?
-> Conflict dialog is shown
The problem still exists in the latest version.
Revision: 9003 Repository Root: http://josm.openstreetmap.de/svn Relative URL: ^/trunk Last Changed Author: Klumbumbus Last Changed Date: 2015-11-11 22:51:39 +0100 (Wed, 11 Nov 2015) Build-Date: 2015-11-12 02:32:21 URL: http://josm.openstreetmap.de/svn/trunk Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b Last Changed Rev: 9003 Identification: JOSM/1.5 (9003 de) Windows 10 64-Bit Memory Usage: 532 MB / 1813 MB (139 MB allocated, but free) Java version: 1.8.0_60, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM Dataset consistency test: No problems found Plugins: - buildings_tools (31694) - reverter (31694)
Attachments (3)
Change History (17)
comment:1 by , 8 years ago
Cc: | added |
---|
comment:2 by , 8 years ago
Milestone: | → 15.11 |
---|
comment:3 by , 8 years ago
(I am not the one who reported it)
Is there a secret option (or could we have an option) to have the old behavior back?
follow-up: 6 comment:4 by , 8 years ago
Sorry that I didn`t include my user name. I (ratrun) reported this issue.
Only one of the nodes is part of a relation. Have you tried to reproduce it? The instruction is a little bit incomplete. You also need to load a little bit of the surroundings after the exectuion of step 1, because otherwise the nodes relation doesn't get loaded.
I didn't find any way how to deal with the conflict popup window. Only pressing of "Cancel" is possible.
by , 8 years ago
Attachment: | josm ticket 12091.osm added |
---|
comment:6 by , 8 years ago
Replying to ratrun:
I didn't find any way how to deal with the conflict popup window. Only pressing of "Cancel" is possible.
One node is part of three relations and the other is not part of any relation. So you need to choose if you want the new merged node in the new relations or not. On the right side for all three relations you need to choose either "keep" or "remove" instead of "undecided".
After this you need to click again on another line (which is somehow a bug) and then the Apply button is availible.
In this case three times "keep" would be the correct way to resolve the conflict.
by , 8 years ago
Attachment: | Josm12091Conflict.png added |
---|
comment:8 by , 8 years ago
On the right side for all three relations you need to choose either "keep" or "remove" instead of "undecided".
It looks as if I get a totally different dialog. Here is what I get:
There is no indication about the three releations, no right side and no option to choose keep" or "remove" instead of "undecided".
by , 8 years ago
Attachment: | conflict.png added |
---|
comment:10 by , 8 years ago
Reporter: | changed from | to
---|
comment:11 by , 8 years ago
Thank you. Now I found the source of the problem per chance. When I re-size the window I also see the entries. It looks that only the autmatic re-sizing is missing. There is a problem with sizing of this window anyways, you can make it super small so that you can't see anything.
comment:12 by , 8 years ago
Milestone: | 15.11 → 15.12 |
---|
Before, when merging/combining, many relation membership conflicts have been resolved automatically causing invalid route relations. Now, less guessing is involved and the user has to select the membership afterwards.
For each relation member you have to change the decision from Undecided to something else. Then you can resolve the conflict.
When merging two nodes where one node is part of some relations and the other is not, we might want to resolve the conflict automatically.