Changeset 18918 in josm for trunk/resources/data/tagging-preset.xsd

Timestamp:

2023-12-19T17:09:19+01:00 (2 years 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

File:

• trunk/resources/data/tagging-preset.xsd (modified) (9 diffs)

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>