Commit a6f44af73e4d4650975065a48db4a2f162080bd6

Authored by Wolfgang Granzow
1 parent 01d57b43

Changes agreed at PRO#37/TP#37 for Rel-2

See deteiled list of changes in PRO-2018-0238-PRO37_changes_of_XML_schemas_to_align_with_TS-0004
... ... @@ -1220,5 +1220,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1220 1220 </xs:restriction>
1221 1221 </xs:simpleType>
1222 1222  
  1223 + <xs:simpleType name="locationInformationType">
  1224 + <xs:annotation>
  1225 + <xs:documentation>Used in the locationInformationType attribute of the locationPolicy resource</xs:documentation>
  1226 + </xs:annotation>
  1227 + <xs:restriction base="xs:integer">
  1228 + <!-- Position fix -->
  1229 + <xs:enumeration value="1" />
  1230 + <!-- Geofence event -->
  1231 + <xs:enumeration value="2" />
  1232 + </xs:restriction>
  1233 + </xs:simpleType>
  1234 +
  1235 + <xs:simpleType name="geofenceEventCriteria">
  1236 + <xs:annotation>
  1237 + <xs:documentation>Used in the geofenceEventCriteria attribute of the locationPolicy resource</xs:documentation>
  1238 + </xs:annotation>
  1239 + <xs:restriction base="xs:integer">
  1240 + <!-- Entering -->
  1241 + <xs:enumeration value="1" />
  1242 + <!-- Leaving -->
  1243 + <xs:enumeration value="2" />
  1244 + <!-- Inside -->
  1245 + <xs:enumeration value="3" />
  1246 + <!-- Outside -->
  1247 + <xs:enumeration value="4" />
  1248 + </xs:restriction>
  1249 + </xs:simpleType>
  1250 +
1223 1251 </xs:schema>
1224 1252  
... ...
... ... @@ -38,12 +38,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
38 38 <xs:sequence>
39 39 <!-- Resource Specific Attributes -->
40 40 <xs:element name="locationSource" type="m2m:locationSource" />
  41 + <xs:element name="locationInformationType" type="m2m:locationInformationType" />
41 42 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
42 43 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
43 44 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
44 45 <xs:element name="locationContainerID" type="xs:anyURI" />
45 46 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
46 47 <xs:element name="locationStatus" type="xs:string" />
  48 + <xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
  49 + <xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
47 50  
48 51 <!-- Child Resources -->
49 52 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -66,12 +69,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
66 69 <xs:sequence>
67 70 <!-- Resource Specific Attributes -->
68 71 <xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
  72 + <xs:element name="locationInformationType" type="m2m:locationInformationType" minOccurs="0" />
69 73 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
70 74 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
71 75 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
72 76 <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
73 77 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
74 78 <xs:element name="locationStatus" type="xs:string" minOccurs="0" />
  79 + <xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
  80 + <xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
75 81  
76 82 <!-- No Child Resources -->
77 83 </xs:sequence>
... ...