From 28809372017987073807b8a86264a630b49bfbc8 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 15 Jun 2020 12:34:10 +0100
Subject: [PATCH] TS 103 280 v2.2.1 (2018-09-07) agreed at LI#48 (Bergen,
 2018-06-26)

---
 103280/TS_103_280.asn1                        | 44 ++++++++-
 103280/TS_103_280.xsd                         | 46 +++++++--
 103280/portal/TS_103_280_v020101.asn1         | 54 -----------
 103280/portal/TS_103_280_v020201.asn1         | 94 +++++++++++++++++++
 ...280_v020101.xsd => TS_103_280_v020201.xsd} | 46 +++++++--
 5 files changed, 214 insertions(+), 70 deletions(-)
 delete mode 100644 103280/portal/TS_103_280_v020101.asn1
 create mode 100644 103280/portal/TS_103_280_v020201.asn1
 rename 103280/portal/{TS_103_280_v020101.xsd => TS_103_280_v020201.xsd} (81%)

diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index e1d9936..0e186a9 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -1,11 +1,11 @@
 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
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 23d5c12..3313fa3 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -1,5 +1,5 @@
 <?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>
diff --git a/103280/portal/TS_103_280_v020101.asn1 b/103280/portal/TS_103_280_v020101.asn1
deleted file mode 100644
index e1d9936..0000000
--- a/103280/portal/TS_103_280_v020101.asn1
+++ /dev/null
@@ -1,54 +0,0 @@
-Common-Parameters
-{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)}
-
-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)}
-
--- Common Parameter: LIID (as defined in clause 6)
-
-LIID ::= OCTET STRING (SIZE (1..25))
-
--- Common Parameter: TCPPort (as defined in clause 6)
-
-TCPPort ::= INTEGER (1..65535)
-
--- Common Parameter: TCPPortRange (as defined in clause 6)
-
-TCPPortRange ::= SEQUENCE
-{
-    start [0] TCPPort,
-    end   [1] TCPPort
-}
-
--- Common Parameter: UDPPort (as defined in clause 6)
-
-UDPPort ::= INTEGER (0..65535)
-
--- Common Parameter: UDPPortRange (as defined in clause 6)
-
-UDPPortRange ::= SEQUENCE
-{
-    start [0] UDPPort,
-    end   [1] UDPPort
-}
-
--- Common Parameter: Port (as defined in clause 6)
-
-Port ::= CHOICE
-{
-    tCPPort [0] TCPPort,
-    uDPPort [1] UDPPort
-}
-
--- Common Parameter: PortRange (as defined clause 6)
-
-PortRange ::= CHOICE
-{
-    tCPPortRange [0] TCPPortRange,
-    uDPPortRange [1] UDPPortRange
-}
-
-END
diff --git a/103280/portal/TS_103_280_v020201.asn1 b/103280/portal/TS_103_280_v020201.asn1
new file mode 100644
index 0000000..0e186a9
--- /dev/null
+++ b/103280/portal/TS_103_280_v020201.asn1
@@ -0,0 +1,94 @@
+Common-Parameters
+{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) version221(221)}
+
+-- Common Parameter: LIID (as defined in clause 6)
+
+LIID ::= OCTET STRING (SIZE (1..25))
+
+-- Common Parameter: TCPPort (as defined in clause 6)
+
+TCPPort ::= INTEGER (1..65535)
+
+-- Common Parameter: TCPPortRange (as defined in clause 6)
+
+TCPPortRange ::= SEQUENCE
+{
+    start [0] TCPPort,
+    end   [1] TCPPort
+}
+
+-- Common Parameter: UDPPort (as defined in clause 6)
+
+UDPPort ::= INTEGER (0..65535)
+
+-- Common Parameter: UDPPortRange (as defined in clause 6)
+
+UDPPortRange ::= SEQUENCE
+{
+    start [0] UDPPort,
+    end   [1] UDPPort
+}
+
+-- Common Parameter: Port (as defined in clause 6)
+
+Port ::= CHOICE
+{
+    tCPPort [0] TCPPort,
+    uDPPort [1] UDPPort
+}
+
+-- Common Parameter: PortRange (as defined clause 6)
+
+PortRange ::= CHOICE
+{
+    tCPPortRange [0] TCPPortRange,
+    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
diff --git a/103280/portal/TS_103_280_v020101.xsd b/103280/portal/TS_103_280_v020201.xsd
similarity index 81%
rename from 103280/portal/TS_103_280_v020101.xsd
rename to 103280/portal/TS_103_280_v020201.xsd
index 23d5c12..3313fa3 100644
--- a/103280/portal/TS_103_280_v020101.xsd
+++ b/103280/portal/TS_103_280_v020201.xsd
@@ -1,5 +1,5 @@
 <?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>
-- 
GitLab