SDS-2023-0114R02-adding_location_attribute_to_contentInstance

CDT-commonTypes.xsd

@@ -1714,8 +1714,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:element name="announceSyncType" type="m2m:announceSyncType" minOccurs="0" />
 					<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 					<xs:element name="creator" type="m2m:ID" minOccurs="0" />
-					<xs:element name="custodian" type="m2m:ID" minOccurs="0" />
 					<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
+					<xs:element name="custodian" type="m2m:ID" minOccurs="0" />
 					<xs:element name="containerDefinition" type="xs:anyURI" />					
 					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 					<xs:element name="contentSize" type="xs:nonNegativeInteger" />
@@ -1768,6 +1768,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
 					<xs:element name="contentSize" type="xs:nonNegativeInteger" />
 					<xs:element name="originator" type="m2m:ID" />
+					<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
 						
 				</xs:sequence>	
 				<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />				

CDT-contentInstance.xsd

@@ -39,6 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 						<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+						<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
 						<!-- Resource Specific Attributes -->
 						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
 						<xs:element name="contentSize" type="xs:nonNegativeInteger" />
@@ -68,7 +69,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
 						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
-						<!-- Resource Specific Attributes -->
+						<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
+					<!-- Resource Specific Attributes -->
 						<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
 						<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />

CDT-timeSeriesInstance.xsd

@@ -35,6 +35,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:complexContent>
 				<xs:extension base="m2m:announceableSubordinateResource">
 					<xs:sequence>
+						<!-- Common Attributes -->
+						<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
 						<!-- Resource Specific Attributes -->
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" />
 						<xs:element name="content" type="xs:anySimpleType" />
@@ -60,6 +62,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:complexContent>
 				<xs:extension base="m2m:announcedSubordinateResource">
 					<xs:sequence>
+						<!-- Common Attributes -->
+						<xs:element name="location" type="m2m:geoCoordinates" minOccurs="0" />
+						<!-- Resource Specific Attributes -->
 						<xs:element name="dataGenerationTime" type="m2m:absRelTimestamp" minOccurs="0" />
 						<xs:element name="content" type="xs:anySimpleType" minOccurs="0" />
 						<xs:element name="sequenceNr" type="xs:nonNegativeInteger" minOccurs="0" />