Changeset 18918 in josm

Timestamp:

2023-12-19T17:09:19+01:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #23290: Validate the regions a tag is expected to be in (patch by Sarabjeet108, modified)

Modifications are as follows:

• Allow the use of the new region attributes for keys inside a preset
• Basic tests

regions comes from Vespucci's extensions: ​https://vespucci.io/tutorials/presets/#extensions

Location:

trunk

Files:

• resources/data/defaultpresets.xml (modified) (6 diffs)
• resources/data/tagging-preset.xsd (modified) (9 diffs)
• src/org/openstreetmap/josm/data/osm/OsmUtils.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (17 diffs)
• src/org/openstreetmap/josm/gui/NoteInputDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/Environment.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/PlaceholderExpression.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/items/RegionSpecific.java (added)
• src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItemTest.java (added)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RegionSpecificTest.java (added)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java (modified) (3 diffs)
• tools/pmd/josm-ruleset.xml (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -1466 +1466 @@
                     <list_entry value="no" />
                 </combo>
-                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
+                <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" regions="GB" />
                 <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
                 <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
@@ -1517 +1517 @@
             </combo>
             <reference ref="crossing_markings" />
-            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
+            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" regions="GB" />
             <combo key="kerb" text="Kerb" values="flush,lowered,no,raised,rolled,yes" values_context="kerb" />
             <combo key="supervised" text="Crossing attendant" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_i18n="false" values_sort="false" />
@@ -7309 +7309 @@
                 <list_entry value="sculpture" short_description="A non figurative sculpture which does not match any of the other categories." />
                 <list_entry value="cross" short_description="A cross-shaped memorial." />
-                <list_entry value="blue_plaque" short_description="A blue plaque commemorating a historical link to that location. (UK)" />
+                <list_entry value="blue_plaque" short_description="A blue plaque commemorating a historical link to that location. (UK)" regions="GB" />
                 <list_entry value="obelisk" short_description="An obelisk." />
                 <list_entry value="ghost_bike" short_description="A bicycle painted white permanently placed as memorial for a victim of a road accident (usually cyclists)." />
-                <list_entry value="stolperstein" short_description="10cm × 10cm brass plaque commemorating victims of Nazi persecution. (EU,RU)" />
+                <list_entry value="stolperstein" short_description="10cm × 10cm brass plaque commemorating victims of Nazi persecution. (EU,RU)" regions="EU,RU" />
                 <list_entry value="bench" short_description="A bench placed in memory of someone or something; usually has a plaque, and sometimes a statue sitting on (part of) it." />
             </combo>
@@ -8262 +8262 @@
             <check key="payment:laser" text="Laser" match="keyvalue" />
             <check key="payment:maestro" text="Maestro" match="keyvalue" />
-            <check key="payment:postfinance_card" text="PostFinance Card (ch)" match="keyvalue" />
+            <check key="payment:postfinance_card" text="PostFinance Card (ch)" match="keyvalue" region="CH" />
             <check key="payment:visa_debit" text="Visa Debit" match="keyvalue" />
             <check key="payment:visa_electron" text="Visa Electron" match="keyvalue" />
@@ -8281 +8281 @@
         <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="yes,no" match="keyvalue" />
         <checkgroup columns="4">
-            <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" />
-            <check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" />
-            <check key="payment:ep_mep" text="Mep (pt)" match="keyvalue" />
-            <check key="payment:ep_minicash" text="Minicash (lu)" match="keyvalue" />
-            <check key="payment:ep_minipay" text="Minipay (it)" match="keyvalue" />
-            <check key="payment:ep_monedero4b" text="Mondero 4b (es)" match="keyvalue" />
+            <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" regions="FI" />
+            <check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" regions="DE" />
+            <check key="payment:ep_mep" text="Mep (pt)" match="keyvalue" regions="PT" />
+            <check key="payment:ep_minicash" text="Minicash (lu)" match="keyvalue" regions="LU" />
+            <check key="payment:ep_minipay" text="Minipay (it)" match="keyvalue" regions="IT" />
+            <check key="payment:ep_monedero4b" text="Mondero 4b (es)" match="keyvalue" regions="ES" />
         </checkgroup>
         <space />
@@ -9969 +9969 @@
                 <text key="destination" text="Name of river/lake/sea/ocean it runs into" />
                 <text key="ref" text="Reference" />
-                <text key="ref:sandre" text="Reference Sandre (FR)" />
-                <text key="ref:fgkz" text="Reference FGKZ (DE)" />
-                <text key="ref:regine" text="Reference REGINE (NO)" />
-                <text key="ref:gnis" text="Reference GNIS (USA)" />
-                <text key="ref:gnbc" text="Reference GNBC (CA)" />
+                <text key="ref:sandre" text="Reference Sandre (FR)" regions="FR" />
+                <text key="ref:fgkz" text="Reference FGKZ (DE)" regions="DE" />
+                <text key="ref:regine" text="Reference REGINE (NO)" regions="NO" />
+                <text key="ref:gnis" text="Reference GNIS (USA)" regions="US" />
+                <text key="ref:gnbc" text="Reference GNBC (CA)" regions="CA" />
                 <reference ref="wikipedia_wikidata" />
             </optional>

trunk/resources/data/tagging-preset.xsd

@@ -107 +107 @@
             <extension base="tns:group-parent">
                 <attributeGroup ref="tns:attributes.name" />
+                <attributeGroup ref="tns:attributes.regions"/>
             </extension>
         </complexContent>
@@ -122 +123 @@
         <annotation>
             <documentation>
-                Every item is one annotation set to select from. name is required, type and preset_name_label are recommended, icon and name_template are optional attributes.
+                Every item is one annotation set to select from. name is required, type and preset_name_label are recommended and icon, name_template, regions and exclude_regions are optional attributes.
             </documentation>
         </annotation>
@@ -135 +136 @@
         <attributeGroup ref="tns:attributes.name" />
         <attributeGroup ref="tns:attributes.icon" />
+        <attributeGroup ref="tns:attributes.regions"/>
         <attribute name="type" type="string">
             <annotation>
@@ -365 +367 @@
         <annotation>
             <documentation><![CDATA[
-                Used in <combo/> and <multiselect/>. More information see short_descriptions below. The attributes are value, display_value, short_description, icon and icon_size.
+                Used in <combo/> and <multiselect/>. More information see short_descriptions below. The attributes are value, display_value, short_description, icon, icon_size, regions, and exclude_regions.
             ]]></documentation>
         </annotation>
@@ -379 +381 @@
         </attribute>
         <attributeGroup ref="tns:attributes.icon" />
+        <attributeGroup ref="tns:attributes.regions"/>
         <anyAttribute processContents="skip" />
     </complexType>
@@ -490 +493 @@
         <attribute name="match" type="tns:match" />
         <attributeGroup ref="tns:attributes.icon" />
+        <attributeGroup ref="tns:attributes.regions"/>
 
         <attribute name="name" use="prohibited" />
@@ -559 +563 @@
         <annotation>
             <documentation>
-                To specify possible roles of members in relations. The key attribute is required, text, requisite, count, type and member_expression are optional.
+                To specify possible roles of members in relations. The key attribute is required, text, requisite, count, type, member_expression, regions, and exclude_regions are optional.
             </documentation>
         </annotation>
@@ -575 +579 @@
         <attribute name="member_expression" type="string" />
         <attribute name="regexp" type="boolean" />
+        <attributeGroup ref="tns:attributes.regions"/>
         <anyAttribute processContents="skip" />
     </complexType>
@@ -730 +735 @@
     </attributeGroup>
 
+    <attributeGroup name="attributes.regions">
+        <attribute name="regions" type="string">
+            <annotation>
+                <documentation>
+                    Comma separated list of countries this preset group or item is applicable for. If not specified, the preset is applicable for all countries.
+                </documentation>
+            </annotation>
+        </attribute>
+        <attribute name="exclude_regions" type="boolean">
+            <annotation>
+                <documentation>
+                    If true, invert the meaning of regions.
+                </documentation>
+            </annotation>
+        </attribute>
+    </attributeGroup>
+
 </schema>

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -36 +36 @@
     /**
      * Discouraged synonym for {@link #TRUE_VALUE}
-     * @deprecated since xxx, use {@link #TRUE_VALUE} instead.
+     * @deprecated since 18801, use {@link #TRUE_VALUE} instead.
      */
     @Deprecated
@@ -42 +42 @@
     /**
      * Discouraged synonym for {@link #FALSE_VALUE}
-     * @deprecated since xxx, use {@link #FALSE_VALUE} instead.
+     * @deprecated since 18801, use {@link #FALSE_VALUE} instead.
      */
     @Deprecated
@@ -48 +48 @@
     /**
      * Discouraged synonym for {@link #REVERSE_VALUE}
-     * @deprecated since xxx, use {@link #REVERSE_VALUE} instead.
+     * @deprecated since 18801, use {@link #REVERSE_VALUE} instead.
      */
     @Deprecated

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -25 +25 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.OptionalInt;
 import java.util.Set;
@@ -38 +39 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -63 +66 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Check;
 import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
+import org.openstreetmap.josm.gui.tagging.presets.items.ComboMultiSelect;
+import org.openstreetmap.josm.gui.tagging.presets.items.Key;
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.items.PresetListEntry;
+import org.openstreetmap.josm.gui.tagging.presets.items.RegionSpecific;
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -132 +141 @@
      */
     public static final String PREF_CHECK_PRESETS_TYPES = PREFIX + ".checkPresetsTypes";
+    public static final String PREF_CHECK_REGIONS = PREFIX + ".checkPresetsRegions";
 
     /**
@@ -160 +170 @@
      */
     public static final String PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD = PREF_CHECK_PRESETS_TYPES + BEFORE_UPLOAD;
+    public static final String PREF_CHECK_REGIONS_BEFORE_UPLOAD = PREF_CHECK_REGIONS + BEFORE_UPLOAD;
 
     /**
@@ -176 +187 @@
     protected boolean checkFixmes;
     protected boolean checkPresetsTypes;
+    protected boolean checkRegions;
 
     protected JCheckBox prefCheckKeys;
@@ -182 +194 @@
     protected JCheckBox prefCheckFixmes;
     protected JCheckBox prefCheckPresetsTypes;
+    protected JCheckBox prefCheckRegions;
 
     protected JCheckBox prefCheckKeysBeforeUpload;
@@ -188 +201 @@
     protected JCheckBox prefCheckFixmesBeforeUpload;
     protected JCheckBox prefCheckPresetsTypesBeforeUpload;
+    protected JCheckBox prefCheckRegionsBeforeUpload;
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
@@ -211 +225 @@
     protected static final int MULTIPOLYGON_MAYBE_NO_AREA       = 1220;
     protected static final int MULTIPOLYGON_SAME_TAG_ON_OUTER   = 1221;
+    protected static final int INVALID_REGION                   = 1222;
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -560 +575 @@
      * @return {@code true} if the given key is in internal presets
      * @since 9023
-     * @deprecated Use {@link TaggingPresets#isKeyInPresets(String)} instead
+     * @deprecated since 18281 -- use {@link TaggingPresets#isKeyInPresets(String)} instead
      */
     @Deprecated
@@ -653 +668 @@
 
         if (p instanceof Relation && p.hasTag("type", "multipolygon")) {
-        checkMultipolygonTags(p);
-        }
-
-        if (checkPresetsTypes) {
-            TagMap tags = p.getKeys();
-            TaggingPresetType presetType = TaggingPresetType.forPrimitive(p);
-            EnumSet<TaggingPresetType> presetTypes = EnumSet.of(presetType);
-
-            Collection<TaggingPreset> matchingPresets = presetIndex.entrySet().stream()
+            checkMultipolygonTags(p);
+        }
+
+        final Collection<TaggingPreset> matchingPresets;
+        TagMap tags;
+        if (checkPresetsTypes || checkRegions) {
+            tags = p.getKeys();
+            matchingPresets = presetIndex.entrySet().stream()
                     .filter(e -> TaggingPresetItem.matches(e.getValue(), tags))
                     .map(Entry::getKey)
                     .collect(Collectors.toCollection(LinkedHashSet::new));
-            Collection<TaggingPreset> matchingPresetsOK = matchingPresets.stream().filter(
-                    tp -> tp.typeMatches(presetTypes)).collect(Collectors.toList());
-            Collection<TaggingPreset> matchingPresetsKO = matchingPresets.stream().filter(
-                    tp -> !tp.typeMatches(presetTypes)).collect(Collectors.toList());
-
-            for (TaggingPreset tp : matchingPresetsKO) {
-                // Potential error, unless matching tags are all known by a supported preset
-                Map<String, String> matchingTags = tp.data.stream()
+        } else {
+            matchingPresets = null;
+            tags = null;
+        }
+
+        if (checkPresetsTypes) {
+            checkPresetsTypes(p, matchingPresets, tags);
+        }
+
+        if (checkRegions) {
+            checkRegions(p, matchingPresets);
+        }
+    }
+
+    /**
+     * Check that the primitive matches the preset types for the preset
+     * @param p The primitive to check
+     * @param matchingPresets The presets to go through
+     * @param tags Tags from the primitive to check
+     */
+    private void checkPresetsTypes(OsmPrimitive p, Collection<TaggingPreset> matchingPresets, Map<String, String> tags) {
+        TaggingPresetType presetType = TaggingPresetType.forPrimitive(p);
+        EnumSet<TaggingPresetType> presetTypes = EnumSet.of(presetType);
+
+        Collection<TaggingPreset> matchingPresetsOK = matchingPresets.stream().filter(
+                tp -> tp.typeMatches(presetTypes)).collect(Collectors.toList());
+        Collection<TaggingPreset> matchingPresetsKO = matchingPresets.stream().filter(
+                tp -> !tp.typeMatches(presetTypes)).collect(Collectors.toList());
+
+        for (TaggingPreset tp : matchingPresetsKO) {
+            // Potential error, unless matching tags are all known by a supported preset
+            Map<String, String> matchingTags = tp.data.stream()
                     .filter(i -> Boolean.TRUE.equals(i.matches(tags)))
                     .filter(i -> i instanceof KeyedItem).map(i -> ((KeyedItem) i).key)
                     .collect(Collectors.toMap(k -> k, tags::get));
-                if (matchingPresetsOK.stream().noneMatch(
-                        tp2 -> matchingTags.entrySet().stream().allMatch(
-                                e -> tp2.data.stream().anyMatch(
-                                        i -> i instanceof KeyedItem && ((KeyedItem) i).key.equals(e.getKey()))))) {
-                    errors.add(TestError.builder(this, Severity.OTHER, INVALID_PRESETS_TYPE)
-                            .message(tr("Object type not in preset"),
-                                    marktr("Object type {0} is not supported by tagging preset: {1}"),
-                                    tr(presetType.getName()), tp.getLocaleName())
+            if (matchingPresetsOK.stream().noneMatch(
+                    tp2 -> matchingTags.entrySet().stream().allMatch(
+                            e -> tp2.data.stream().anyMatch(
+                                    i -> i instanceof KeyedItem && ((KeyedItem) i).key.equals(e.getKey()))))) {
+                errors.add(TestError.builder(this, Severity.OTHER, INVALID_PRESETS_TYPE)
+                        .message(tr("Object type not in preset"),
+                                marktr("Object type {0} is not supported by tagging preset: {1}"),
+                                tr(presetType.getName()), tp.getLocaleName())
+                        .primitives(p)
+                        .build());
+            }
+        }
+    }
+
+    /**
+     * Check that the preset is valid for the region the primitive is in
+     * @param p The primitive to check
+     * @param matchingPresets The presets to check against
+     */
+    private void checkRegions(OsmPrimitive p, Collection<TaggingPreset> matchingPresets) {
+        LatLon center;
+        if (p instanceof Node) {
+            center = ((Node) p).getCoor();
+        } else {
+            center = p.getBBox().getCenter();
+        }
+        for (TaggingPreset preset : matchingPresets) {
+            if (preset.regions() != null) {
+                boolean isInRegion = false; //true if the object is in an applicable region
+                for (String region : preset.regions()) {
+                    if (Territories.isIso3166Code(region, center)) { //check if center of the object is in a region
+                        isInRegion = true;
+                    }
+                }
+                if (isInRegion == preset.exclude_regions()) {
+                    errors.add(TestError.builder(this, Severity.WARNING, INVALID_REGION)
+                            .message(tr("Invalid region for this preset"),
+                                    marktr("Preset {0} should not be applied in this region"),
+                                    preset.getLocaleName())
                             .primitives(p)
                             .build());
                 }
             }
-        }
+            // Check the tags
+            tagCheck(preset, p, center, preset.data);
+        }
+    }
+
+    /**
+     * Perform the checks against a given preset value
+     * @param preset The originating preset (used for error creation)
+     * @param p The originating primitive (used for error creation)
+     * @param center The center of the primitive or other location of the primitive to check
+     * @param tagInformation The sub items for the preset
+     */
+    private void tagCheck(TaggingPreset preset, OsmPrimitive p, LatLon center, List<? extends TaggingPresetItem> tagInformation) {
+        for (TaggingPresetItem item : tagInformation) {
+            if (item instanceof CheckGroup) {
+                tagCheckReal(preset, p, center, ((CheckGroup) item).checks);
+            } else if (item instanceof ComboMultiSelect) {
+                tagCheckReal(preset, p, center, ((ComboMultiSelect) item).presetListEntries());
+            }
+            if (item instanceof RegionSpecific && ((RegionSpecific) item).regions() != null) {
+                tagCheckReal(preset, p, center, (RegionSpecific) item);
+            }
+        }
+    }
+
+    /**
+     * Perform the checks against a given preset value
+     * @param preset The originating preset (used for error creation)
+     * @param p The originating primitive (used for error creation)
+     * @param center The center of the primitive or other location of the primitive to check
+     * @param data The data for the region specific information
+     */
+    private void tagCheckReal(TaggingPreset preset, OsmPrimitive p, LatLon center, List<? extends RegionSpecific> data) {
+        for (RegionSpecific regionSpecific : data) {
+            if (regionSpecific.regions() != null) {
+                tagCheckReal(preset, p, center, regionSpecific);
+            }
+        }
+    }
+
+    /**
+     * Perform the checks against a given preset value
+     * @param preset The originating preset (used for error creation)
+     * @param p The originating primitive (used for error creation)
+     * @param center The center of the primitive or other location of the primitive to check
+     * @param data The data for the region specific information
+     */
+    private void tagCheckReal(TaggingPreset preset, OsmPrimitive p, LatLon center, RegionSpecific data) {
+        // First, check if we aren't in the region for the tag
+        if (latLonInRegions(center, data.regions()) == data.exclude_regions()) {
+            final String key;
+            final String value;
+            if (data instanceof PresetListEntry) {
+                key = ((PresetListEntry) data).cms.key;
+                value = ((PresetListEntry) data).value;
+            } else if (data instanceof KeyedItem) {
+                key = ((KeyedItem) data).key;
+                if (data instanceof Key) {
+                    value = ((Key) data).value;
+                } else {
+                    value = null;
+                }
+            } else {
+                throw new JosmRuntimeException("Unknown implementor for RegionSpecific");
+            }
+            if (p.hasTag(key) && (value == null || value.equals(p.get(key)))) {
+                final TestError.Builder builder = TestError.builder(this, Severity.WARNING, INVALID_REGION)
+                        .primitives(p);
+                if (value == null) {
+                    builder.message(tr("Invalid region for this preset"),
+                            marktr("Preset {0} should not have the key {1}"),
+                            preset.getLocaleName(), key);
+                } else {
+                    builder.message(tr("Invalid region for this preset"),
+                            marktr("Preset {0} should not have the tag {1}={2}"),
+                            preset.getLocaleName(), key, value);
+                }
+                errors.add(builder.build());
+            }
+        }
+    }
+
+    /**
+     * Check if the specified latlon is inside any of the specified regions
+     * @param latLon The {@link LatLon} to check
+     * @param regions The regions to see if the {@link LatLon} is in
+     * @return {@code true} if the coordinate is inside any of the regions
+     */
+    private static boolean latLonInRegions(LatLon latLon, Collection<String> regions) {
+        if (regions != null) {
+            for (String region : regions) {
+                if (Territories.isIso3166Code(region, latLon)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
@@ -916 +1081 @@
         }
 
-        if (!Utils.isEmpty(fixedKey) && !fixedKey.equals(key)) {
+        if (!Utils.isEmpty(fixedKey) && !Objects.equals(fixedKey, key)) {
             final String proposedKey = fixedKey;
             // misspelled preset key
@@ -1101 +1266 @@
             checkPresetsTypes = checkPresetsTypes && Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD, true);
         }
+
+        checkRegions = includeOtherSeverity && Config.getPref().getBoolean(PREF_CHECK_REGIONS, true);
+        if (isBeforeUpload) {
+            checkRegions = checkRegions && Config.getPref().getBoolean(PREF_CHECK_REGIONS_BEFORE_UPLOAD, true);
+        }
         deprecatedChecker = OsmValidator.getTest(MapCSSTagChecker.class);
         ignoreForOuterMPSameTagCheck.addAll(Config.getPref().getList(PREF_KEYS_IGNORE_OUTER_MP_SAME_TAG, Collections.emptyList()));
@@ -1113 +1283 @@
     @Override
     public void visit(Collection<OsmPrimitive> selection) {
-        if (checkKeys || checkValues || checkComplex || checkFixmes || checkPresetsTypes) {
+        if (checkKeys || checkValues || checkComplex || checkFixmes || checkPresetsTypes || checkRegions) {
             super.visit(selection);
         }
@@ -1178 +1348 @@
         prefCheckPresetsTypesBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD, true));
         testPanel.add(prefCheckPresetsTypesBeforeUpload, a);
+
+        prefCheckRegions = new JCheckBox(tr("Check for regions."), Config.getPref().getBoolean(PREF_CHECK_REGIONS, true));
+        prefCheckRegions.setToolTipText(tr("Validate that objects are in the correct region."));
+        testPanel.add(prefCheckRegions, GBC.std().insets(20, 0, 0, 0));
+
+        prefCheckRegionsBeforeUpload = new JCheckBox();
+        prefCheckRegionsBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_REGIONS_BEFORE_UPLOAD, true));
+        testPanel.add(prefCheckRegionsBeforeUpload, a);
     }
 
@@ -1200 +1378 @@
         Config.getPref().putBoolean(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected());
         Config.getPref().putBoolean(PREF_CHECK_PRESETS_TYPES, prefCheckPresetsTypes.isSelected());
+        Config.getPref().putBoolean(PREF_CHECK_REGIONS, prefCheckRegions.isSelected());
         Config.getPref().putBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected());
         Config.getPref().putBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, prefCheckComplexBeforeUpload.isSelected());
@@ -1205 +1384 @@
         Config.getPref().putBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected());
         Config.getPref().putBoolean(PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD, prefCheckPresetsTypesBeforeUpload.isSelected());
+        Config.getPref().putBoolean(PREF_CHECK_REGIONS_BEFORE_UPLOAD, prefCheckRegionsBeforeUpload.isSelected());
         return Config.getPref().putList(PREF_SOURCES, sourcesList.getItems());
     }

trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java

@@ -53 +53 @@
      * @param icon Icon to display in the action button
      * @param text Default text of the note's comment
-     * @since xxx
+     * @since 18839
      */
     public void showNoteDialog(String message, Icon icon, String text) {

trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -285 +285 @@
      * @param selector The selector to use
      * @return A clone of this environment, with the specified selector
-     * @since xxx
+     * @since 18757
      */
     public Environment withSelector(Selector selector) {
@@ -335 +335 @@
      * Get the selector for this environment
      * @return The selector. May be {@code null}.
-     * @since xxx
+     * @since 18757
      */
     public Selector selector() {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/PlaceholderExpression.java

@@ -15 +15 @@
 /**
  * Used for expressions that contain placeholders
- * @since xxx
+ * @since 18758
  */
 public final class PlaceholderExpression implements Expression {

trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java

@@ -80 +80 @@
      * @param parameters the OAuth parameters. Must not be null.
      * @param accessToken the Access Token. Must not be null.
-     * @since xxx
+     * @since 18764
      */
     public TestAccessTokenTask(Component parent, String apiUrl, IOAuthParameters parameters, IOAuthToken accessToken) {

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

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Space;
+import org.openstreetmap.josm.gui.tagging.presets.items.RegionSpecific;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -89 +90 @@
  * @since 294
  */
-public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, AdaptableAction, Predicate<IPrimitive> {
+public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, AdaptableAction, Predicate<IPrimitive>,
+        RegionSpecific {
 
     /** The user pressed the "Apply" button */
@@ -142 +144 @@
      */
     public transient Set<TaggingPresetType> types;
+    /**
+     * List of regions the preset is applicable for.
+     */
+    private Collection<String> regions;
+    /**
+     * If true, invert the meaning of regions.
+     */
+    private boolean excludeRegions;
     /**
      * The list of preset items
@@ -350 +360 @@
     }
 
+    @Override
+    public final Collection<String> regions() {
+        return this.regions != null || this.group == null ? this.regions : this.group.regions();
+    }
+
+    @Override
+    public final void realSetRegions(Collection<String> regions) {
+        this.regions = regions;
+    }
+
+    @Override
+    public final boolean exclude_regions() {
+        return this.excludeRegions;
+    }
+
+    @Override
+    public final void setExclude_regions(boolean excludeRegions) {
+        this.excludeRegions = excludeRegions;
+    }
+
     private static class PresetPanel extends JPanel {
         private boolean hasElements;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.data.validation.tests.OpeningHourTest;
+import org.openstreetmap.josm.data.validation.tests.TagChecker;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Logging;
@@ -56 +58 @@
             MapCSSTagChecker mapCSSTagChecker = OsmValidator.getTest(MapCSSTagChecker.class);
             OpeningHourTest openingHourTest = OsmValidator.getTest(OpeningHourTest.class);
-            OsmValidator.initializeTests(Arrays.asList(mapCSSTagChecker, openingHourTest));
+            TagChecker tagChecker = OsmValidator.getTest(TagChecker.class);
+            tagChecker.startTest(NullProgressMonitor.INSTANCE); //since initializeTest works if test is enabled
+            OsmValidator.initializeTests(Arrays.asList(mapCSSTagChecker, openingHourTest, tagChecker));
+
 
             List<TestError> errors = new ArrayList<>();
             openingHourTest.addErrorsForPrimitive(primitive, errors);
             errors.addAll(mapCSSTagChecker.getErrorsForPrimitive(primitive, ValidatorPrefHelper.PREF_OTHER.get()));
+            tagChecker.check(primitive);
+            errors.addAll(tagChecker.getErrors());
 
             boolean visible = !errors.isEmpty();

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -310 +311 @@
         }
 
-        if (values_sort && TaggingPresets.SORT_MENU.get()) {
+        if (values_sort && Boolean.TRUE.equals(TaggingPresets.SORT_MENU.get())) {
             presetListEntries.sort((a, b) -> AlphanumComparator.getInstance().compare(a.getDisplayValue(), b.getDisplayValue()));
         }
@@ -341 +342 @@
             initialValue = DIFFERENT;
             originalValue = initialValue;
-        } else if (!usage.hadKeys() || isForceUseLastAsDefault() || PROP_FILL_DEFAULT.get()) {
+        } else if (!usage.hadKeys() || isForceUseLastAsDefault() || Boolean.TRUE.equals(PROP_FILL_DEFAULT.get())) {
             // at this point no primitive had any value for this key
             if (!support.isPresetInitiallyMatches() && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
@@ -404 +405 @@
 
     /**
+     * Get the entries for this {@link ComboMultiSelect} object
+     * @return The {@link PresetListEntry} values for this object
+     */
+    public List<PresetListEntry> presetListEntries() {
+        return Collections.unmodifiableList(this.presetListEntries);
+    }
+
+    /**
      * Adds a preset list entry.
      * @param e list entry to add

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -8 +9 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.SortedMap;
-import java.util.NoSuchElementException;
 import java.util.TreeMap;
 
@@ -25 +26 @@
  * Preset item associated to an OSM key.
  */
-public abstract class KeyedItem extends TextItem {
+public abstract class KeyedItem extends TextItem implements RegionSpecific {
 
     /** The constant value {@code "<different>"}. */
-    protected static final String DIFFERENT = "<different>";
+    protected static final String DIFFERENT = marktr("<different>");
     /** Translation of {@code "<different>"}. */
-    public static final String DIFFERENT_I18N = tr("<different>");
+    public static final String DIFFERENT_I18N = tr(DIFFERENT);
 
     /** True if the default value should also be set on primitives that already have tags.  */
@@ -52 +53 @@
      */
     public String match = getDefaultMatch().getValue(); // NOSONAR
+
+    /**
+     * List of regions the preset is applicable for.
+     */
+    private Collection<String> regions;
+    /**
+     * If true, invert the meaning of regions.
+     */
+    private boolean excludeRegions;
 
     /**
@@ -262 +272 @@
 
     @Override
+    public final Collection<String> regions() {
+        return this.regions;
+    }
+
+    @Override
+    public final void realSetRegions(Collection<String> regions) {
+        this.regions = regions;
+    }
+
+    @Override
+    public final boolean exclude_regions() {
+        return this.excludeRegions;
+    }
+
+    @Override
+    public final void setExclude_regions(boolean excludeRegions) {
+        this.excludeRegions = excludeRegions;
+    }
+
+    @Override
     public String toString() {
         return "KeyedItem [key=" + key + ", text=" + text

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.trc;
 
+import java.util.Collection;
 import java.util.Objects;
 
@@ -21 +22 @@
  * {@link MultiSelect}.
  */
-public class PresetListEntry implements Comparable<PresetListEntry> {
+public class PresetListEntry implements Comparable<PresetListEntry>, RegionSpecific {
     /** Used to display an entry matching several different values. */
     protected static final PresetListEntry ENTRY_DIFFERENT = new PresetListEntry(KeyedItem.DIFFERENT, null);
@@ -48 +49 @@
     public String locale_short_description; // NOSONAR
 
+    /**
+     * List of regions the entry is applicable for.
+     */
+    private Collection<String> regions;
+
+    /**
+     * If true, invert the meaning of regions.
+     */
+    private boolean excludeRegions;
+
     private String cachedDisplayValue;
     private String cachedShortDescription;
@@ -54 +65 @@
     /**
      * Constructs a new {@code PresetListEntry}, uninitialized.
-     *
+     * <p>
      * Public default constructor is needed by {@link org.openstreetmap.josm.tools.XmlObjectParser.Parser#startElement}
      */
@@ -74 +85 @@
     /**
      * Returns the contents displayed in the dropdown list.
-     *
+     * <p>
      * This is the contents that would be displayed in the current view plus a short description to
      * aid the user. The whole content is wrapped to {@code width}.
@@ -164 +175 @@
     }
 
+    @Override
+    public Collection<String> regions() {
+        return this.regions;
+    }
+
+    @Override
+    public void realSetRegions(Collection<String> regions) {
+        this.regions = regions;
+    }
+
+    @Override
+    public boolean exclude_regions() {
+        return this.excludeRegions;
+    }
+
+    @Override
+    public void setExclude_regions(boolean excludeRegions) {
+        this.excludeRegions = excludeRegions;
+    }
+
     // toString is mainly used to initialize the Editor
     @Override

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -165 +165 @@
      * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
      * @throws InvalidPathException if a Path object cannot be constructed for the capabilities cached file
-     * @since xxx
+     * @since 18780
      */
     public WMSImagery(String url, Map<String, String> headers, ProgressMonitor monitor)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -225 +225 @@
         assertEquals("Value 'Residential' for key 'highway' is unknown, maybe 'residential' is meant?",
                 errors.get(0).getDescription());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+    }
+
+    @Test
+    void testRegionKey() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("node highway=crossing crossing_ref=zebra"));
+        assertEquals(1, errors.size());
+        assertEquals("Invalid region for this preset", errors.get(0).getMessage());
+        assertEquals("Preset Pedestrian Crossing should not have the key crossing_ref", errors.get(0).getDescription());
+        assertEquals(Severity.WARNING, errors.get(0).getSeverity());
+        assertFalse(errors.get(0).isFixable());
+
+    }
+
+    @Test
+    void testRegionTag() throws IOException {
+        final List<TestError> errors = test(OsmUtils.createPrimitive("relation type=waterway ref:gnis=123456"));
+        assertEquals(1, errors.size());
+        assertEquals("Invalid region for this preset", errors.get(0).getMessage());
+        assertEquals("Preset Waterway should not have the key ref:gnis", errors.get(0).getDescription());
         assertEquals(Severity.WARNING, errors.get(0).getSeverity());
         assertFalse(errors.get(0).isFixable());

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroupTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link CheckGroup} class.
  */
-class CheckGroupTest {
-    /**
-     * Unit test for {@link CheckGroup#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        CheckGroup cg = new CheckGroup();
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(cg.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class CheckGroupTest implements TaggingPresetItemTest {
+    @Override
+    public TaggingPresetItem getInstance() {
+        return new CheckGroup();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java

@@ -9 +9 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.testutils.annotations.Main;
 
@@ -15 +16 @@
  */
 @Main
-class CheckTest {
+class CheckTest implements RegionSpecificTest, TaggingPresetItemTest {
+    @Override
+    public Check getInstance() {
+        final Check check = new Check();
+        check.key = "crossing:island";
+        return check;
+    }
+
     /**
      * Unit test for {@link Check#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Check().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
+        assertTrue(getInstance().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.annotations.I18n;
@@ -23 +24 @@
 @I18n("de")
 @Main
-class ComboTest {
+class ComboTest implements TaggingPresetItemTest {
+    @Override
+    public Combo getInstance() {
+        return new Combo();
+    }
+
     /**
-     * Unit test for {@link Combo#addToPanel}.
+     * Unit test for {@link Check#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Combo().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
+        assertTrue(getInstance().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }
@@ -40 +47 @@
     @Test
     void testUseLastAsDefault() {
-        Combo combo = new Combo();
+        final Combo combo = getInstance();
         combo.key = "addr:country";
         combo.values_from = "java.util.Locale#getISOCountries";
@@ -119 +126 @@
     @Test
     void testColor() {
-        Combo combo = new Combo();
+        final Combo combo = getInstance();
         combo.key = "colour";
         combo.values = "red;green;blue;black";

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparatorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link ItemSeparator} class.
  */
-class ItemSeparatorTest {
-    /**
-     * Unit test for {@link ItemSeparator#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(new ItemSeparator().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class ItemSeparatorTest implements TaggingPresetItemTest {
+    @Override
+    public ItemSeparator getInstance() {
+        return new ItemSeparator();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/KeyTest.java

@@ -9 +9 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link Key} class.
  */
-class KeyTest {
+class KeyTest implements RegionSpecificTest, TaggingPresetItemTest {
+    @Override
+    public Key getInstance() {
+        final Key key = new Key();
+        key.key = "highway";
+        key.value = "residential";
+        return key;
+    }
+
     /**
      * Unit test for {@link Key#addToPanel}.
      */
     @Test
-    void testAddToPanel() {
+    @Override
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LabelTest.java

@@ -9 +9 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link Label} class.
  */
-class LabelTest {
+class LabelTest implements TaggingPresetItemTest {
+    @Override
+    public Label getInstance() {
+        return new Label();
+    }
+
     /**
-     * Unit test for {@link Label#addToPanel}.
+     * Unit test for {@link Check#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Label().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
+        assertTrue(getInstance().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/LinkTest.java

@@ -10 +10 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.spi.preferences.Config;
 
@@ -15 +16 @@
  * Unit tests of {@link Link} class.
  */
-class LinkTest {
+class LinkTest implements TaggingPresetItemTest {
+    @Override
+    public Link getInstance() {
+        return new Link();
+    }
+
     /**
      * Unit test for {@link Link#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
-        Link l = new Link();
+    public void testAddToPanel() {
+        Link l = getInstance();
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelectTest.java

@@ -9 +9 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.testutils.annotations.Main;
 
@@ -15 +16 @@
  */
 @Main
-class MultiSelectTest {
+class MultiSelectTest implements TaggingPresetItemTest {
+    @Override
+    public MultiSelect getInstance() {
+        return new MultiSelect();
+    }
+
     /**
-     * Unit test for {@link MultiSelect#addToPanel}.
+     * Unit test for {@link Check#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new MultiSelect().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
+        assertTrue(getInstance().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/OptionalTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link Optional} class.
  */
-class OptionalTest {
-    /**
-     * Unit test for {@link Optional#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(new Optional().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class OptionalTest implements TaggingPresetItemTest {
+    @Override
+    public Optional getInstance() {
+        return new Optional();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/PresetLinkTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.testutils.annotations.TaggingPresets;
 
@@ -16 +9 @@
  */
 @TaggingPresets
-class PresetLinkTest {
-    /**
-     * Unit test for {@link PresetLink#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        PresetLink l = new PresetLink();
-        l.preset_name = "River";
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(l.addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class PresetLinkTest implements TaggingPresetItemTest {
+    @Override
+    public PresetLink getInstance() {
+        PresetLink presetLink = new PresetLink();
+        presetLink.preset_name = "River";
+        return presetLink;
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/RolesTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link Roles} class.
  */
-class RolesTest {
-    /**
-     * Unit test for {@link Roles#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(new Roles().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class RolesTest implements TaggingPresetItemTest {
+    @Override
+    public TaggingPresetItem getInstance() {
+        return new Roles();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/SpaceTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets.items;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import javax.swing.JPanel;
-
-import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 
 /**
  * Unit tests of {@link Space} class.
  */
-class SpaceTest {
-    /**
-     * Unit test for {@link Space#addToPanel}.
-     */
-    @Test
-    void testAddToPanel() {
-        JPanel p = new JPanel();
-        assertEquals(0, p.getComponentCount());
-        assertFalse(new Space().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
-        assertTrue(p.getComponentCount() > 0);
+class SpaceTest implements TaggingPresetItemTest {
+    @Override
+    public Space getInstance() {
+        return new Space();
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java

@@ -9 +9 @@
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemGuiSupport;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItemTest;
 import org.openstreetmap.josm.testutils.annotations.Main;
 
@@ -15 +16 @@
  */
 @Main
-class TextTest {
+class TextTest implements TaggingPresetItemTest {
+    @Override
+    public Text getInstance() {
+        return new Text();
+    }
+
     /**
-     * Unit test for {@link Text#addToPanel}.
+     * Unit test for {@link Check#addToPanel}.
      */
+    @Override
     @Test
-    void testAddToPanel() {
+    public void testAddToPanel() {
         JPanel p = new JPanel();
         assertEquals(0, p.getComponentCount());
-        assertTrue(new Text().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
+        assertTrue(getInstance().addToPanel(p, TaggingPresetItemGuiSupport.create(false)));
         assertTrue(p.getComponentCount() > 0);
     }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java

@@ -9 +9 @@
 import java.util.Collection;
 
+import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25 +26 @@
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @BasicPreferences
+@Territories
 @ExtendWith(TaggingPresets.TaggingPresetsExtension.class)
 public @interface TaggingPresets {
 
-    class TaggingPresetsExtension implements BeforeEachCallback {
+    class TaggingPresetsExtension implements BeforeEachCallback, BeforeAllCallback {
         private static int expectedHashcode = 0;
+
+        @Override
+        public void beforeAll(ExtensionContext extensionContext) throws Exception {
+            setup();
+        }
 
         @Override
@@ -37 +44 @@
 
         /**
-         * Setup the tagging presets
+         * Set up the tagging presets
          */
         public static synchronized void setup() {

trunk/tools/pmd/josm-ruleset.xml

@@ -93 +93 @@
   <rule ref="category/java/codestyle.xml/MethodNamingConventions">
     <properties>
-        <property name="violationSuppressXPath" value="//MethodDeclaration/../../..[@SimpleName='Functions' or @SimpleName='PseudoClasses' or @SimpleName='Role' or @SimpleName='TaggingPreset']"/>
+        <property name="violationSuppressXPath" value="//MethodDeclaration/../../..[@SimpleName='Functions' or @SimpleName='PseudoClasses' or @SimpleName='Role' or @SimpleName='TaggingPreset' or @SimpleName='RegionSpecific']"/>
     </properties>
   </rule>