Changes between Version 21 and Version 32 of Help/Action/CombineWay

Timestamp:

(multiple changes)

Author:

(multiple changes)

Comment:

(multiple changes)

Help/Action/CombineWay

@@ -4 +4 @@
 [[PageOutline(2-10,Table of Contents)]]
 
-[[Image(source:/trunk/images/combineway.svg,32,middle)]] ''Keyboard shortcut:'' '''{{{C}}}'''
+[[JOSMImage(combineway,48,link=,middle,margin-right=20)]] ''Keyboard shortcut:'' **`C`**
 
-'''Combine several selected ways in one.'''
+**Combine several selected ways in one.**
 
 * The order of selection matters, as the remaining way will keep the [wikitr:/Help/Concepts/Object#ObjectId object id] and [wikitr:/Help/Concepts/Object#ObjectHistory object history] of the first selected way with positive id.
-* The ways need to be connected to each other in their end nodes and need to form one line otherwise JOSM will show a info warning and refuses the action:
+* The ways need to be connected to each other in their end nodes and need to form a single string otherwise JOSM will show a notification ([#Notification see below]) and refuses the action.
+* All [wikitr:/Help/Concepts/Object#Tags1 tags] with only a single value and all relation memberships from all ways will be added and the [#TagsMembershipsConflictDialog Tags/Memberships Conflict Dialog] will open 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.
 
-[[Image(josm_refuse_combine_warning_screenshot.png)]]
-
-* Usually, all [wikitr:/Help/Concepts/Object#Tags1 tags] with only a single value and all relation memberships from all ways will be added and the [#TagsMembershipsConflictDialog Tags/Memberships Conflict Dialog] will open 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.
+=== Notification ===#Notification
+[[Image(josm_refuse_combine_warning_screenshot.png,link=,right,margin-right=10,margin-left=40,30%)]]
+If the selected ways are not connected in their end nodes and/or do not form a single string a notification is presented with following content:
+{{{
+Could not combine ways
+(They could not be merged into a single string of nodes)
+}}}
 
 == Combine Confirmation ==#CombineConfirmation
@@ -19 +24 @@
 
 === Tag ===#CombineConfirmationTag
-If there is any difference in [wikitr:/Help/Concepts/Object#Tags tags] or conflicting tag combinations, JOSM presents following warning and ask for confirmation:
+If there is any difference in [wikitr:/Help/Concepts/Object#Tags tags] or conflicting tag combinations, JOSM presents following warning and ask for confirmation.\\
+ The warning lists each conflicting key with its values in brackets and offers two options to hide this warning in future. Choosing "No" will cancel the whole action.
 
-[[Image(josm_combine_confirmation_tag_screenshot.png)]] 
+[[Image(josm_combine_confirmation_tag_screenshot.png,link=,margin-left=15,45%)]]
 
 === Relation ===#CombineConfirmationRelation
+If there is any difference in relation membership or role, JOSM presents following warning and ask for confirmation\\
+ The warning lists each involved relation with its name, the number of members and if it is not complete downloaded in brackets and offers two options to hide this warning in future. Choosing "No" will cancel the whole action.
 
-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,link=,margin-left=15,45%)]]
 
-[[Image(josm_combine_confirmation_relation_screenshot.png)]]
+
+== Tags `direction` Conflict Dialog ==#TagsDirectionConflictDialog
+When ways are combined and one of them has to change direction, if on this way there are childnodes with stop, give_way or traffic_signals  signs (with keys `*:direction`): JOSM presents a message and suggest to adapt the `forward/backward` value (since r17289).
 
 
 == Tags/Memberships Conflict Dialog ==#TagsMembershipsConflictDialog
-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)]]
+If there is any conflicting tag value, membership or role where JOSM cannot find a solution, the Tags/Memberships Conflict Dialog will open up in order to solve the conflict manually.
 
 The dialog is divided into two parts where the upper part is for tags and the lower part is for memberships and roles.
 
+[[Image(josm_TagsMembership_conflict_dialog_screenshot.png,link=,margin-left=15,45%)]]
+
 === Tags ===#TagsConflictDialog
-[[Image(josm_TagsMembership_conflict_all_screenshot.png,right,margin=15)]]
+[[Image(josm_TagsMembership_conflict_all_screenshot.png,link=,right,margin-left=15,45%)]]
 
 ==== Filter ====
@@ -62 +72 @@
 
 === Memberships and Roles ===#MembershipsConflictDialog
-[[Image(josm_TagsMembership_conflict_membership_screenshot.png,right,margin=15)]]
+[[Image(josm_TagsMembership_conflict_membership_screenshot.png,link=,right,margin=15,45%)]]
 
 ==== Memberships ====
@@ -79 +89 @@
 
 == 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]
+ * [[JOSMImage(mapmode/splitway)]] [wikitr:/Help/Action/SplitWay Split Way]
+ * [[JOSMImage(joinareas)]] [wikitr:/Help/Action/JoinAreas Join Areas]
 
 
 ----
-Back to [wikitr:/Help/Menu/Tools Menu Tools][[Br]]
+Back to [wikitr:/Help/Menu/Tools Menu Tools] \\
+Back to [wikitr:/Help/Menu Main Menu] \\
 Back to [wikitr:/Help Main Help]