Changes between Version 24 and Version 26 of Help/Action/UpdateData
- Timestamp:
- (multiple changes)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Help/Action/UpdateData
v24 v26 2 2 == File > Update Data == 3 3 4 [[JOSMImage(updatedata )]] ''Keyboard shortcut:'' '''{{{Ctrl+U}}}'''4 [[JOSMImage(updatedata,link=,48,middle,margin-right=20)]] ''Keyboard shortcut:'' '''{{{Ctrl+U}}}''' 5 5 6 6 '''Reload all bounding boxes in the currently active data layer from the server.''' … … 12 12 Objects, you added or edited, will not be affected by the update. If there are new objects on the server (created by other users in the meantime) they will be added to your layer (and thus merged with your own work). If the server reports objects, that have changed (i. e. a node was removed from a way or a tag was added to an object), these changes will be applied to your local layer, '''unless''' you changed one of these objects as well. 13 13 14 In short: If two users edit one area at the same time, JOSM tries to merge both versions. If this is not possible it will create [wiki :/Help/Concepts/Conflict conflicts].14 In short: If two users edit one area at the same time, JOSM tries to merge both versions. If this is not possible it will create [wikitr:/Help/Concepts/Conflict conflicts]. 15 15 16 16 You will have to resolve these conflicts manually after the update is finished. 17 17 18 __Example__: Imagine you find a way that looks strange and you add the tag '{{{FIXME=please check this}}}'. But in the meantime someone else spotted the same error, added the tag '{{{FIXME=does this way exist?}}}' and uploaded it. Then you click update to get the latest version from the server.18 __Example__: :: Imagine you find a way that looks strange and you add the tag '{{{FIXME=please check this}}}'. But in the meantime someone else spotted the same error, added the tag '{{{FIXME=does this way exist?}}}' and uploaded it. Then you click update to get the latest version from the server. 19 19 In this case JOSM cannot decide which of the changes to keep, so it will create a conflict. 20 20 … … 24 24 25 25 == Stale object in your local dataset == #SyncPotentiallyDeletedObjects 26 Sometimes another mapper deletes an [wiki :/Help/Concepts/Object object] on the server while it is still present in your local dataset. These objects are called '''stale'''. When you run the update action JOSM checks whether your local dataset may include stale objects and displays the following warning dialog:26 Sometimes another mapper deletes an [wikitr:/Help/Concepts/Object object] on the server while it is still present in your local dataset. These objects are called '''stale'''. When you run the update action JOSM checks whether your local dataset may include stale objects and displays the following warning dialog: 27 27 28 [[Image(sync-potentially-deleted-objects.png )]]28 [[Image(sync-potentially-deleted-objects.png,link=)]] 29 29 30 If you click on '''Check on the server''' JOSM checks on the server whether potentially stale objects are really stale, i.e. whether they are deleted on the server. If possible it will purge stale objects automatically from your local dataset. At least, if automatic removal is not possible, it will create [wiki:Help/Concepts/Conflict conflicts] which you can resolve manually. 31 30 If you click on '''Check on the server''' JOSM checks on the server whether potentially stale objects are really stale, i.e. whether they are deleted on the server. If possible it will purge stale objects automatically from your local dataset. At least, if automatic removal is not possible, it will create [wikitr:/Help/Concepts/Conflict conflicts] which you can resolve manually. 32 31 33 32 If you don't want to run this check, you can abort by clicking on '''Ignore'''. You can always run the checks later. … … 35 34 36 35 == See also == 37 38 * [[JOSMImage(updatedata,20)]] [wiki:Help/Action/UpdateSelection Update selection] 39 * [[JOSMImage(updatedata,20)]] [wiki:Help/Action/UpdateModified Update modified] 40 * [wiki:Help/Concepts/Conflict What is a conflict?] 36 * [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateSelection Update selection] 37 * [[JOSMImage(updatedata)]] [wikitr:/Help/Action/UpdateModified Update modified] 38 * [wikitr:/Help/Concepts/Conflict What is a conflict?] 41 39 42 40 ---- 43 Back to [wiki :Help/Menu/File Menu File][[Br]]44 Back to [wiki :/Help Main Help]41 Back to [wikitr:/Help/Menu/File Menu File] \\ 42 Back to [wikitr:/Help Main Help]
