Changes between Version 3 and Version 4 of Ru:Help/Dialog/Conflict


Ignore:
Timestamp:
2011-01-02T01:48:56+01:00 (15 years ago)
Author:
stoecker
Comment:

fix links

Legend:

Unmodified
Added
Removed
Modified

  • Ru:Help/Dialog/Conflict

    v3 v4  
    55The Conflict Dialog is used to resolve [wiki:/Help/Concepts/Conflict conflicts] between two  [wiki:/Help/Concepts/Object versions] of an OSM object.
    66
    7 [[Image(wiki:Help/Dialog/ConflictDialog:conflict-dialog.png)]] [[BR]]
     7[[Image(wiki:Help/Dialog/Conflict:conflict-dialog.png)]] [[BR]]
    88
    99== Resolving differences between tags ==
    … …  
    1717In the example below both versions have a tag "`name`". The values in the two object versions are different, though, and JOSM therefore displays the row with a red background. The value of the first version is "`Secondary School`", the opposite version has a value "`Elementary School`". You now have to decide which of these values you want to keep and which you want to discard.
    1818
    19 [[Image(wiki:Help/Dialog/ConflictDialog:tag-resolve-1-commented.png)]] [[BR]]
     19[[Image(wiki:Help/Dialog/Conflict:tag-resolve-1-commented.png)]] [[BR]]
    2020
    2121Click on the value you want to keep, in the example for instance on the value on the left. If you either double-click on the value or click on [[Image(source:/trunk/images/dialogs/conflict/tagkeepmine.png)]], you decide to keep the value and to discard the opposite value. The table in the middle now displays the value to keep and the background color turns to green.
    2222
    2323
    24 [[Image(wiki:Help/Dialog/ConflictDialog:tag-resolve-2-commented.png)]] [[BR]]
     24[[Image(wiki:Help/Dialog/Conflict:tag-resolve-2-commented.png)]] [[BR]]
    2525
    2626When the button '''Apply Resolution''' is enabled you can apply your decision. The values you've chosen will be applied and the dialog will be closed.
    2727
    28 [[Image(wiki:Help/Dialog/ConflictDialog:tag-resolve-3-commented.png)]] [[BR]]
     28[[Image(wiki:Help/Dialog/Conflict:tag-resolve-3-commented.png)]] [[BR]]
    2929
    3030== Resolving differences in the node list of two versions of a way ==
    … …  
    3737
    3838
    39 [[Image(wiki:Help/Dialog/ConflictDialog:node-resolve-main-commented.png)]] [[BR]]
     39[[Image(wiki:Help/Dialog/Conflict:node-resolve-main-commented.png)]] [[BR]]
    4040
    4141=== The standard workflow ===
    … …  
    4343
    4444  1. Pick nodes from either object version and reorder the resulting node list if necessary
    45   2. '''Freeze''' the resulting merged node list by clicking on the button [[Image(wiki:Help/Dialog/ConflictDialog:button-freeze.png)]]. When you freeze the merged node list you tell JOSM that all conflicts in the node list are resolved.
     45  2. '''Freeze''' the resulting merged node list by clicking on the button [[Image(wiki:Help/Dialog/Conflict:button-freeze.png)]]. When you freeze the merged node list you tell JOSM that all conflicts in the node list are resolved.
    4646  3. '''Apply the resolution'''
    4747
    … …  
    5252First, select all elements in the leftmost table (either using the mouse or by pressing Ctrl-A in the table) (see next screen shot):
    5353
    54 [[Image(wiki:Help/Dialog/ConflictDialog:simple1-step-1.png)]] [[BR]]
     54[[Image(wiki:Help/Dialog/Conflict:simple1-step-1.png)]] [[BR]]
    5555
    5656Then, click [[Image(source:/trunk/images/dialogs/conflict/copystartleft.png)]] to copy the selected nodes to the middle table with the merged nodes: [[BR]]
    5757
    58 [[Image(wiki:Help/Dialog/ConflictDialog:simple1-step-2.png)]] [[BR]]
     58[[Image(wiki:Help/Dialog/Conflict:simple1-step-2.png)]] [[BR]]
    5959
    60 Finally, click [[Image(wiki:Help/Dialog/ConflictDialog:button-freeze.png)]] to freeze the resulting merged node list:
     60Finally, click [[Image(wiki:Help/Dialog/Conflict:button-freeze.png)]] to freeze the resulting merged node list:
    6161
    62 [[Image(wiki:Help/Dialog/ConflictDialog:simple1-step-3.png)]] [[BR]]
     62[[Image(wiki:Help/Dialog/Conflict:simple1-step-3.png)]] [[BR]]
    6363
    6464The symbol in the nodes tab now switched to [[Image(source:/trunk/images/dialogs/conflict/mergecomplete.png)]] and you can apply the merge decisions.
    … …  
    7070
    7171From the following combo box you can select which pair of node lists to compare:  [[BR]]
    72 [[Image(wiki:Help/Dialog/ConflictDialog:compare-options.png)]] [[BR]]
     72[[Image(wiki:Help/Dialog/Conflict:compare-options.png)]] [[BR]]
    7373
    7474 * '''My with Their''': compares the leftmost table with the rightmost table in the Conflict Dialog
    … …  
    7777
    7878Depending on the position of a node in the list different background colors are used:
    79  * [[Image(wiki:Help/Dialog/ConflictDialog:compare-in-one-list-only.png)]] - the node is in this list '''only'''. It isn't present in the opposite list.
    80  * [[Image(wiki:Help/Dialog/ConflictDialog:compare-different-positions.png)]] - the node is in both lists, but it is on different positions
     79 * [[Image(wiki:Help/Dialog/Conflict:compare-in-one-list-only.png)]] - the node is in this list '''only'''. It isn't present in the opposite list.
     80 * [[Image(wiki:Help/Dialog/Conflict:compare-different-positions.png)]] - the node is in both lists, but it is on different positions
    8181 * White background means that a node is in both lists at the same position.
    8282