Changes between Version 15 and Version 16 of Help/Action/CombineWay

Timestamp:

2020-01-31T01:25:49+01:00 (6 years ago)

Author:

skyper

Comment:

added all confirmation warnings and the Tags/Membership Conflict Dialog

Help/Action/CombineWay

@@ -1 @@
-[[TranslatedPages(outdated=This page is incomplete. The Tags/Memberships the warning and the conflict dialog need a screenshot and more explanation)]]
+[[TranslatedPages]]
+[[PageOutline(2-10,Table of Contents)]]
 
 = Tools > Combine Way =
@@ -7 +8 @@
 '''Combine several selected ways in one.'''
 
-If there are any differences in tags or relation memberships, JOSM will warn you and open up a dialog to decide manually for each one. The options are:
+JOSM will usually add all tags with single value and all memberships from all ways and open the Tags/Memberships Conflict Dialog if manual decisions are needed. In normal user mode it will additionally warn before adding any tag or membership the ways do not have in common.
 
-* all single values of the different ways
-* '''none''' - the key will be removed
-* '''all''' - all values are used for a key, separated by a semicolon
+== Combine Confirmation ==#CombineConfirmation
+**Note**: Following warnings are not presented in [wikitr:/Help/ExpertMode Expert Mode].
+
+=== Tag ===#CombineConfirmationTag
+If there is any difference in tags or conflicting tag combinations, JOSM presents following warning and ask for confirmation:
+
+[[Image(josm_combine_confirmation_tag_screenshot.png)]] 
+
+=== Relation ===#CombineConfirmationRelation
+
+If there is any difference in relation membership or role, JOSM presents following warning and ask for confirmation:
+
+[[Image(josm_combine_confirmation_relation_screenshot.png)]]
+
+
+== Tags/Memberships Conflict Dialog ==
+If there is any conflicting tag value, tag combination, membership or role where JOSM cannot find a solution, the Tags/Memberships Conflict Dialog will open up in order to solve the conflict manually.
+
+[[Image(josm_TagsMembership_conflict_dialog_screenshot.png)]]
+
+The dialog is divided into two parts where the upper part is for tags and the lower part is for memberships and roles.
+
+=== Tags ===
+[[Image(josm_TagsMembership_conflict_all_screenshot.png,right,margin=15)]]
+
+==== Filter ====
+On top there are two check boxes to filter the tags:
+* **''Show tags with conflict only''** is checked by default to only show the tags not in common. Unchecking will reveal all tags.
+* **''Show tags with multiple values only''** shows only the tags with conflicts in values
+
+==== Background Color ====
+Additionally the background color indicates the conflicts:
+ **white** - common tag (no conflict) \\
+ **green** - single value conflict \\
+ **red** - multiple values conflict
+
+==== Value Column ====
+With the drop down menus in the value column you can solve the conflicts and remove tags.
+The options are:
+* all single values of the different objects
+* ''**none**'' - the tag will be removed
+* ''**all**'' - all values are used for a key, separated by a semicolon
 
 If the key is representing a quantity like `capacity=*` or `step_count=*` there is one more option:
-* '''sum''' - sums up all numerical values of the selected ways
+* ''**sum**'' - sums up all numerical values of the selected objects
+
+=== Memberships and Roles ===
+[[Image(josm_TagsMembership_conflict_membership_screenshot.png,right,margin=15)]]
+
+==== Membership ====
+With the two columns on the far right, **''Keep''** and **''Remove''**, the decision on the membership can be made.
+
+==== Background Color ====
+The background colors are:
+ **grey** - delete membership, remove object from relation \\
+ **green** - keep membership \\
+ **red** - undecided, needs to be set manually
+
+==== Roles ====
+Roles can be changed by editing the entry in the role column or with the **''Role''** text box beneath the membership list.
+==== Tag modified relations ====
+On the bottom line are a check box **''Tag modified relation with''** and a text box for **''Key''** and **''Value''** in order to add a tag to all modified relations by checking the box and entering a key-value combination.
 
 == See also ==
-
  * [[Image(source:/trunk/images/splitway.png,middle)]] [wikitr:/Help/Action/SplitWay Split Way]
  * [[Image(source:/trunk/images/joinareas.svg,middle)]] [wikitr:/Help/Action/JoinAreas Join Areas]