TS 103 280 v2.2.1 (2018-09-07) agreed at LI#48 (Bergen, 2018-06-26)

28809372 · markc · 26ee34dc · 28809372 · 28809372 · 28809372
Commit 28809372 authored Jun 15, 2020 by markc
4 changed files
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
 Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
+{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}

 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN

 -- Object Identifier definitions

-commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
+commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}

 -- Common Parameter: LIID (as defined in clause 6)

@@ -51,4 +51,44 @@ PortRange ::= CHOICE
    uDPPortRange [1] UDPPortRange
 }

+-- Common Parameter: QualifiedDateTime (as defined in clause 6)
+
+QualifiedDateTime ::= GeneralizedTime
+
+-- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6)
+
+QualifiedMicrosecondDateTime ::= GeneralizedTime
+
+-- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6)
+
+WGS84CoordinateDecimal ::= SEQUENCE
+{
+    latitude  [0] WGS84LatitudeDecimal,
+    longitude [1] WGS84LongitudeDecimal
+}
+
+-- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6)
+
+WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10))
+
+-- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6)
+
+WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11))
+
+-- Common Parameter: WGS84CoordinateAngular (as defined in clause 6)
+
+WGS84CoordinateAngular ::= SEQUENCE
+{
+    latitude  [0] WGS84LatitudeAngular,
+    longitude [1] WGS84LongitudeAngular
+}
+
+-- Common Parameter: WGS84LatitudeAngular (as defined in clause 6)
+
+WGS84LatitudeAngular ::= OCTET STRING (SIZE (10))
+
+-- Common Parameter: WGS8LongitudeAngular (as defined in clause 6)
+
+WGS84LongitudeAngular ::= OCTET STRING (SIZE (11))
+
 END
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.2.1" elementFormDefault="qualified">
    <xs:simpleType name="ShortString">
        <xs:restriction base="xs:string">
            <xs:maxLength value="255"/>
@@ -70,7 +70,7 @@
            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
        </xs:restriction>
    </xs:simpleType>
-     <xs:simpleType name="IPv6CIDR">
+    <xs:simpleType name="IPv6CIDR">
        <xs:restriction base="xs:token">
            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))"/>
        </xs:restriction>
@@ -86,7 +86,7 @@
            <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
            <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:simpleType name="TCPPort">
        <xs:restriction base="xs:integer">
            <xs:minExclusive value="1"/>
@@ -116,25 +116,25 @@
            <xs:element name="TCPPort" type="TCPPort"/>
            <xs:element name="UDPPort" type="UDPPort"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="PortRange">
        <xs:choice>
            <xs:element name="TCPPortRange" type="TCPPortRange"/>
            <xs:element name="UDPPortRange" type="UDPPortRange"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="IPAddressPort">
        <xs:sequence>
            <xs:element name="address" type="IPAddress"/>
            <xs:element name="port" type="Port"/>
        </xs:sequence>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="IPAddressPortRange">
        <xs:sequence>
            <xs:element name="address" type="IPAddress"/>
            <xs:element name="portRange" type="PortRange"/>
        </xs:sequence>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:simpleType name="MACAddress">
        <xs:restriction base="xs:token">
            <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
@@ -165,4 +165,36 @@
            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
        </xs:restriction>
    </xs:simpleType>
+   <xs:complexType name="WGS84CoordinateDecimal">
+        <xs:sequence>
+            <xs:element name="latitude" type="WGS84LatitudeDecimal"/>
+            <xs:element name="longitude" type="WGS84LongitudeDecimal"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="WGS84LatitudeDecimal">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[NS][0-9]{2}\.[0-9]{6}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WGS84LongitudeDecimal">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[EW][0-9]{3}\.[0-9]{6}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="WGS84CoordinateAngular">
+        <xs:sequence>
+            <xs:element name="latitude" type="WGS84LatitudeAngular"/>
+            <xs:element name="longitude" type="WGS84LongitudeAngular"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="WGS84LatitudeAngular">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[NS][0-9]{6}\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WGS84LongitudeAngular">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[EW][0-9]{7}\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>
--- a/103280/portal/TS_103_280_v020101.asn1
+++ b/103280/portal/TS_103_280_v020101.asn1
 Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
+{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}

 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN

 -- Object Identifier definitions

-commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
+commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)}

 -- Common Parameter: LIID (as defined in clause 6)

@@ -51,4 +51,44 @@ PortRange ::= CHOICE
    uDPPortRange [1] UDPPortRange
 }

+-- Common Parameter: QualifiedDateTime (as defined in clause 6)
+
+QualifiedDateTime ::= GeneralizedTime
+
+-- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6)
+
+QualifiedMicrosecondDateTime ::= GeneralizedTime
+
+-- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6)
+
+WGS84CoordinateDecimal ::= SEQUENCE
+{
+    latitude  [0] WGS84LatitudeDecimal,
+    longitude [1] WGS84LongitudeDecimal
+}
+
+-- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6)
+
+WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10))
+
+-- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6)
+
+WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11))
+
+-- Common Parameter: WGS84CoordinateAngular (as defined in clause 6)
+
+WGS84CoordinateAngular ::= SEQUENCE
+{
+    latitude  [0] WGS84LatitudeAngular,
+    longitude [1] WGS84LongitudeAngular
+}
+
+-- Common Parameter: WGS84LatitudeAngular (as defined in clause 6)
+
+WGS84LatitudeAngular ::= OCTET STRING (SIZE (10))
+
+-- Common Parameter: WGS8LongitudeAngular (as defined in clause 6)
+
+WGS84LongitudeAngular ::= OCTET STRING (SIZE (11))
+
 END
--- a/103280/portal/TS_103_280_v020101.xsd
+++ b/103280/portal/TS_103_280_v020101.xsd
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.1.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.2.1" elementFormDefault="qualified">
    <xs:simpleType name="ShortString">
        <xs:restriction base="xs:string">
            <xs:maxLength value="255"/>
@@ -70,7 +70,7 @@
            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
        </xs:restriction>
    </xs:simpleType>
-     <xs:simpleType name="IPv6CIDR">
+    <xs:simpleType name="IPv6CIDR">
        <xs:restriction base="xs:token">
            <xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))"/>
        </xs:restriction>
@@ -86,7 +86,7 @@
            <xs:element name="IPv4CIDR" type="IPv4CIDR"/>
            <xs:element name="IPv6CIDR" type="IPv6CIDR"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:simpleType name="TCPPort">
        <xs:restriction base="xs:integer">
            <xs:minExclusive value="1"/>
@@ -116,25 +116,25 @@
            <xs:element name="TCPPort" type="TCPPort"/>
            <xs:element name="UDPPort" type="UDPPort"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="PortRange">
        <xs:choice>
            <xs:element name="TCPPortRange" type="TCPPortRange"/>
            <xs:element name="UDPPortRange" type="UDPPortRange"/>
        </xs:choice>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="IPAddressPort">
        <xs:sequence>
            <xs:element name="address" type="IPAddress"/>
            <xs:element name="port" type="Port"/>
        </xs:sequence>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:complexType name="IPAddressPortRange">
        <xs:sequence>
            <xs:element name="address" type="IPAddress"/>
            <xs:element name="portRange" type="PortRange"/>
        </xs:sequence>
-    </xs:complexType>
+    </xs:complexType> 
    <xs:simpleType name="MACAddress">
        <xs:restriction base="xs:token">
            <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
@@ -165,4 +165,36 @@
            <xs:pattern value="tel:[a-zA-Z0-9!#$&amp;-;=?-\[\]_~%]+"/>
        </xs:restriction>
    </xs:simpleType>
+   <xs:complexType name="WGS84CoordinateDecimal">
+        <xs:sequence>
+            <xs:element name="latitude" type="WGS84LatitudeDecimal"/>
+            <xs:element name="longitude" type="WGS84LongitudeDecimal"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="WGS84LatitudeDecimal">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[NS][0-9]{2}\.[0-9]{6}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WGS84LongitudeDecimal">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[EW][0-9]{3}\.[0-9]{6}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="WGS84CoordinateAngular">
+        <xs:sequence>
+            <xs:element name="latitude" type="WGS84LatitudeAngular"/>
+            <xs:element name="longitude" type="WGS84LongitudeAngular"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="WGS84LatitudeAngular">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[NS][0-9]{6}\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WGS84LongitudeAngular">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[EW][0-9]{7}\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>