From cb7a4b2b5cf611fb33ae118e329257e75d62c378 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 14:36:16 +0200
Subject: [PATCH] XSD v2_19_0 baseline

---
 CDT-enumerationTypes.xsd | 28 ++++++++++++++++++++++++++++
 CDT-locationPolicy.xsd   |  6 ++++++
 2 files changed, 34 insertions(+)

diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 71238b8..bcac57c 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -1220,5 +1220,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 	
+	<xs:simpleType name="locationInformationType">
+		<xs:annotation>
+			<xs:documentation>Used in the  locationInformationType attribute of the locationPolicy resource</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:integer">
+			<!-- Position fix -->
+			<xs:enumeration value="1" />
+			<!-- Geofence event -->
+			<xs:enumeration value="2" />
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="geofenceEventCriteria">
+		<xs:annotation>
+			<xs:documentation>Used in the geofenceEventCriteria attribute of the locationPolicy resource</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:integer">
+			<!-- Entering -->
+			<xs:enumeration value="1" />
+			<!-- Leaving -->
+			<xs:enumeration value="2" />
+			<!-- Inside -->
+			<xs:enumeration value="3" />
+			<!-- Outside -->
+			<xs:enumeration value="4" />
+		</xs:restriction>
+	</xs:simpleType>
+	
 </xs:schema>
 
diff --git a/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd
index 610cd70..889352a 100644
--- a/CDT-locationPolicy.xsd
+++ b/CDT-locationPolicy.xsd
@@ -38,12 +38,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" />
+						<xs:element name="locationInformationType" type="m2m:locationInformationType" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
 						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
 						<xs:element name="locationStatus" type="xs:string" />
+						<xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
+						<xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
@@ -66,12 +69,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
+						<xs:element name="locationInformationType" type="m2m:locationInformationType" minOccurs="0" />
 						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
 						<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
 						<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
+						<xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
+						<xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
 
 						<!-- No Child Resources -->
 					</xs:sequence>
-- 
GitLab