Combine ways silently combines when tag is not present on one way but present on the other

[AM909]

If you have a way with layer=1 and another way with no layer tag, and you combine them, the conflict dialog comes up but just says "no conflicts". The new way will have layer=1, which may be incorrect.

I can't think of any cases where it should do this. There are probably some "who cares" cases (like created_by), but it's still not technically correct.

[stoecker]

Ticket #5113 has been marked as a duplicate of this ticket.

[AM909]

This happens only when you have checked the "Show tags with multiple values only" checkbox at the top of the conflict dialog. It apparently is not considering "no key" as a value different than key=* when it counts how many values there are in the selection (but it should).

Additionally, when it brings up the conflict dialog with "no conflicts" in this case, the checkboxes at the top are not present, so you need to create conflicting tags and then try to combine them in order to change the settings of those checkboxes, which is not ideal - they should appear even in the "no conflicts" case.

Confirmed present in r3329.

[stoecker]

Sorry. Can't reproduce here at all. Please make a step-for-step description.

Note that no conflicts are produced, when a way is totally untagged.

[skyper]

Replying to Am909:

Replying to stoecker:

This happens only when you have checked the "Show tags with multiple values only" checkbox at the top of the conflict dialog. It apparently is not considering "no key" as a value different than key=* when it counts how many values there are in the selection (but it should).

Additionally, when it brings up the conflict dialog with "no conflicts" in this case, the checkboxes at the top are not present, so you need to create conflicting tags and then try to combine them in order to change the settings of those checkboxes, which is not ideal - they should appear even in the "no conflicts" case.

Sorry. Can't reproduce here at all. Please make a step-for-step description.

At least the problem mentioned by Am909 still exists. Once you have checked on of the two chechboxes on top this setting is stored and you do not get any information about it on the next connect, if there are no unfiltered differences.

Please always show the two checkboxes on top to get the information about the filter and be able to switch back to no filter. (uncheck the boxes).

Thanks

[stoecker]

As said I was unable to reproduce, so you do something different than I do. I need a better description.

[skyper]

Not the best example but you should get the clue.

1. combine the two ways and check both checkboxes on top.
2. undo
3. combine the two ways -> only differences in relation membership are listed. There are no checkboxes on top and if there is a tag in without a conflict on one way, you will not get any info.
4. to uncheck the boxes again you have to create a conflict on a tag.

[skyper]

example

[skyper]

still reproducable with r4707