Changes between Version 24 and Version 25 of Help/Concepts/Conflict


Ignore:
Timestamp:
2013-02-02T16:42:02+01:00 (13 years ago)
Author:
skyper
Comment:

use real icon + small syntax fixes

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v24 v25  
    1616If you download objects from the OSM server into an existing layer, the objects from the server might "collide" with objects already present in the layer. Often, JOSM can handle these collisions automatically but sometimes this isn't possible. Here's an example:
    1717
    18  1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
    19  2. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
    20  3. You select the menu [[Image(wiki:Help/Action/UpdateData:updatedata.png)]]''File->[wiki:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [http://wiki.openstreetmap.org/wiki/Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
     181. You've downloaded a node with id:1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
     191. You edit the node and change its name to `"Or is it this name?"`. In the meantime another user downloaded the node too, changed its name to `"That's the name"`, and uploads it.
     201. You select the menu ''File -> [[Image(source:trunk/images/updatedata.png)]] [wiki:/Help/Action/UpdateData Update data]''. The version of the node retrieved from the server will have a tag [http://wiki.openstreetmap.org/wiki/Key:name name] set to `"That's the name"` which collides with `"Or is it this name?"`, the name you've been setting.
    2121
    2222JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
     23
    2324[[Image(conflict-update-data.png)]]
    2425
    … …  
    2627If you upload objects to the OSM server, they might "collide" there with updates provided by other mappers. Sometimes, JOSM can handle these collisions automatically. If, for instance, you try to delete an already deleted object, JOSM will silently skip deleting and won't bother you with an error message. In most cases, though, JOSM can't deal with them automatically. Here's an example:
    2728
    28   1. You've downloaded a node with id 1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
    29   2. Another mapper downloads the node with id 1 too, assigns it the name `"That's the name"`, and uploads it.
    30   3. You change the name to `"Or is it this name?"` and upload to the server.
    31   4. On the server, your upload collides with the upload from the other mapper.
     291. You've downloaded a node with id:1 from the server whose [http://wiki.openstreetmap.org/wiki/Key:name name] tag is set to `"My name"`.
     301. Another mapper downloads the node with id:1 too, assigns it the name `"That's the name"`, and uploads it.
     311. You change the name to `"Or is it this name?"` and upload to the server.
     321. On the server, your upload collides with the upload from the other mapper.
    3233
    3334JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
     35
    3436[[Image(conflict-upload-data.png)]]
    3537
    … …  
    4547
    4648== Technical background ==
    47 
    4849For each change set that affects an object, the server assigns an increasing version number to that object. (This is shown in the history e.g. [http://api.openstreetmap.org/browse/way/1222/history way 1222].) JOSM remembers the version of the downloaded objects and reports it back to the server on upload. If the server has a higher version number (due to a change by another mapper), it rejects the uploaded change. In this situation JOSM creates a conflict. The version that is called "my" in conflict resolution dialog is the old, downloaded version, but with your local modifications applied. The version that is called "their" is the most current version on the server that is then automatically downloaded from the server.
    4950
    5051== See also ==
    51 
    52  * [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
    53  * [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
     52* [wiki:/Help/Dialog/ConflictList Conflict List Dialog] - displays the list of conflicts in the current data layer
     53* [wiki:/Help/Dialog/Conflict Conflict Dialog] - you can use the conflict dialog to resolve a conflict
    5454
    5555----