conflict detection too strict for node coordinates

[skyper]

I have uploaded an osm-file. Upload did not finish and josm did not response anymore.
I had to kill it without saving.
I started josm again and updated the data from the server. I got 260 conficts with nodes without any changes. JOSM said the position were not the same but it was.

attach osm-file, only update from server
version 2595

[skyper]

If this is not a bug, please have some possibility to automate the conflict management. I had to click threetimes on every conflict to set the positions right.

[mjulius]

JOSM is too strict when comparing node coordinates. It only shows 4 decimals in the conflict dialog but there are a lot more. If someone has modified the node without moving the node and his editor was rounding the coordinates a little bit you will get a conflict and the coordinates will look the same in the conflict dialog.

JOSM needs to relax a little bit and it needs to show all relevant digits.

[mjulius]

The API actually returns only 7 decimals for coordinates. Therefore, the attached patch sets the MAX_SERVER_PRECISION to 5e-8 and displays 7 decimals in the conflict resolution dialog.

[mjulius]

(In [2612]) Fixes #4083 - exception when copying relation with incomplete node
Fixes #4141 - relax conflict detection for coordinates; API only returns 7 decimals

[skyper]

I think it is not yet done.

I have updated the first osm and I got a lot of conflicts, because a lot of nodes were already uploaded.
Conflict said that nodes are deleted on my osm but in fact they existed with id:0.

Conflict management should notice that.

I have attached an osm of this region just downloaded from server that it should be possible to merge these two osm form debugging.

version 2670

[mjulius]

This is a different issue. I agree that JOSM should try to match newly downloaded primitives to existing new ones (see #4223), but this is not necessarily a conflict.

When updating your data JOSM first reports 15 conflicts and then tells me that there are 454 primitives in the local data that might have been deleted on the server. This is because the server did not return those when JOSM was downloading the bounding box defined in your data. Checking the server for those does not produce any additional conflicts. There are no conflicts on nodes.