Add support for alternative tagging of the presets.

resources/data/tagging-preset.xsd

@@ -288,7 +288,7 @@
     <complexType name="preset_link">
         <annotation>
             <documentation><![CDATA[
-                Adds a link to an other preset with a label on top. The preset_name attribute is required, text to override the label (default is "Edit also …") and text_context are optional. A sequence of <preset_link /> without text or a identical text value are grouped below one label. Watch out for presets with identical name as it is not predictable to which preset the link will lead to, see #12716.
+                Adds a link to an other preset with a label on top. The preset_name attribute is required. alternative, text to override the label (default is "Edit also …") and text_context are optional. A sequence of <preset_link /> without text or a identical text value are grouped below one label. Watch out for presets with identical name as it is not predictable to which preset the link will lead to, see #12716.
             ]]></documentation>
         </annotation>
         <attribute name="preset_name" type="string" use="required">
@@ -298,6 +298,13 @@
                 </documentation>
             </annotation>
         </attribute>
+        <attribute name="alternative" type="boolean">
+            <annotation>
+                <documentation>
+                    Indicates that the preset link points to an alternative tagging of the object.
+                </documentation>
+            </annotation>
+        </attribute>
         <attributeGroup ref="tns:attributes.text" />
         <attribute name="name" use="prohibited" />
         <anyAttribute processContents="skip" />

src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -18,7 +18,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
@@ -419,23 +418,43 @@ public void applyComponentOrientation(ComponentOrientation o) {
             }
         };
         JPanel linkPanel = new JPanel(new GridBagLayout());
-        TaggingPresetItem previous = null;
+        List<PresetLink> alternativeTags = new ArrayList<>(); //list to store PresetLinks with alternative="true"
+        List<PresetLink> editAlsoTags = new ArrayList<>(); //list to store other presetLinks
         for (TaggingPresetItem i : data) {
             if (i instanceof Link) {
                 i.addToPanel(linkPanel, itemGuiSupport);
                 p.hasElements = true;
             } else {
                 if (i instanceof PresetLink) {
                     PresetLink link = (PresetLink) i;
-                    if (!(previous instanceof PresetLink && Objects.equals(((PresetLink) previous).text, link.text))) {
-                        itemPanel.add(link.createLabel(), GBC.eol().insets(0, 8, 0, 0));
+                    if (link.isAlternative()) {
+                        alternativeTags.add(link);
+                    } else {
+                        editAlsoTags.add(link);
                     }
                 }
-                if (i.addToPanel(itemPanel, itemGuiSupport)) {
+                if (!(i instanceof PresetLink) && (i.addToPanel(itemPanel, itemGuiSupport))) {
                     p.hasElements = true;
                 }
             }
-            previous = i;
+        }
+
+        if (!alternativeTags.isEmpty()) {
+            PresetLink link = new PresetLink();
+            itemPanel.add(link.createAlternativeLabel(), GBC.eol().insets(0, 8, 0, 0));
+            for (PresetLink links : alternativeTags) {
+                links.addToPanel(itemPanel, itemGuiSupport);
+                p.hasElements = true;
+            }
+        }
+
+        if (!editAlsoTags.isEmpty()) {
+            PresetLink link = new PresetLink();
+            itemPanel.add(link.createLabel(), GBC.eol().insets(0, 8, 0, 0));
+            for (PresetLink links : editAlsoTags) {
+                links.addToPanel(itemPanel, itemGuiSupport);
+                p.hasElements = true;
+            }
         }
         p.add(itemPanel, GBC.eol().fill());
         p.add(linkPanel, GBC.eol().fill());

src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java

@@ -44,12 +44,40 @@ public void mouseClicked(MouseEvent e) {
     /** The exact name of the preset to link to. Required. */
     public String preset_name = ""; // NOSONAR
 
+    /**
+     * true if the PresetLink points to the alternative tagging of the preset.
+     */
+    private boolean alternative;
+
+    /**
+     * Gets the alternative for the preset
+     */
+    public boolean isAlternative() {
+        return alternative;
+    }
+
+    /**
+     * Sets the alternative for the preset.
+     */
+    public void setAlternative(boolean alternative) {
+        this.alternative = alternative;
+    }
+
     /**
      * Creates a label to be inserted above this link
      * @return a label
      */
     public JLabel createLabel() {
-        initializeLocaleText(tr("Edit also …"));
+        initializeLocaleText(tr("Additional tags to edit"));
+        return new JLabel(locale_text);
+    }
+
+    /**
+     * Creates a label to be inserted above the alternative presets
+     * @return a label
+     */
+    public JLabel createAlternativeLabel() {
+        initializeLocaleText(tr("Similar but different tags"));
         return new JLabel(locale_text);
     }