Changeset 7503 in josm for trunk/data


Ignore:
Timestamp:
2014-09-05T15:39:03+02:00 (10 years ago)
Author:
Don-vip
Message:

fix #10478 - update preset XSD to allow list_entry in chunk (JOSM already supports it)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/tagging-preset.xsd

    r7171 r7503  
    8787
    8888    <complexType name="chunk">
    89         <sequence>
    90             <choice minOccurs="1" maxOccurs="unbounded">
    91                 <group ref="tns:optional_elements" />
    92                 <element name="key" type="tns:key" />
    93                 <element name="optional" type="tns:optional" minOccurs="0" />
    94             </choice>
    95         </sequence>
     89        <choice minOccurs="1" maxOccurs="1">
     90            <sequence>
     91                <choice minOccurs="1" maxOccurs="unbounded">
     92                    <group ref="tns:optional_elements" />
     93                    <element name="key" type="tns:key" />
     94                    <element name="optional" type="tns:optional" minOccurs="0" />
     95                </choice>
     96            </sequence>
     97            <sequence>
     98                <!-- Cannot use tns:list_elements here because reference is present both in optional_elements and list_elements
     99                so it violates cos-nonambig: Unique Particle Attribution :
     100                <group ref="tns:list_elements" minOccurs="1" maxOccurs="unbounded" />-->
     101                <element name="list_entry" type="tns:list_entry" minOccurs="1" maxOccurs="unbounded" />
     102            </sequence>
     103        </choice>
    96104        <attribute name="id" type="ID" use="required" />
    97105    </complexType>
    … …  
    117125        </group>
    118126
     127    <group name="list_elements">
     128        <choice>
     129            <element name="list_entry" type="tns:list_entry" />
     130            <element name="reference" type="tns:reference" />
     131        </choice>
     132    </group>
     133
    119134        <complexType name="key">
    120135                <attribute name="key" type="string" use="required" />
    … …  
    122137                <attribute name="match" type="string" />
    123138        </complexType>
    124 
    125139
    126140        <complexType name="link">
    … …  
    179193                <!-- use either list_entry's or a combination of values/display_values -->
    180194                <sequence>
    181                         <element name="list_entry" type="tns:list_entry" minOccurs="0" maxOccurs="unbounded" />
     195            <group ref="tns:list_elements" minOccurs="0" maxOccurs="unbounded" />
    182196                </sequence>
    183197                <attribute name="key" type="string" use="required" />
    … …  
    207221                <!-- use either list_entry's or a combination of values/display_values -->
    208222                <sequence>
    209                         <element name="list_entry" type="tns:list_entry" minOccurs="0" maxOccurs="unbounded" />
     223            <group ref="tns:list_elements" minOccurs="0" maxOccurs="unbounded" />
    210224                </sequence>
    211225                <attribute name="key" type="string" use="required" />
Note: See TracChangeset for help on using the changeset viewer.