Commit 979a8083 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Removing non-XML-compliant comments and aligning whitespace (2 spaces, no tabs)

parent 2d7ddce1

103120/examples/vehicle_1_REQ_LEA_RPS_Use_Case_last_pos_by_ignition_off.xml

+0 −9
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">

  

  <Header>

  <Header>



    <SenderIdentifier>

    <SenderIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>	  

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>	  

    </SenderIdentifier>

    </SenderIdentifier>





    <ReceiverIdentifier>

    <ReceiverIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

    </ReceiverIdentifier>

    </ReceiverIdentifier>

	



    <TransactionIdentifier>2b36a78b-b628-416d-bd22-404e1212ff99</TransactionIdentifier>

    <TransactionIdentifier>2b36a78b-b628-416d-bd22-404e1212ff99</TransactionIdentifier>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Version>

    <Version>
@@ -22,9 +16,7 @@ 
      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

    </Version>

    </Version>



  </Header>

  </Header>

  

   <Payload>

   <Payload>

    <RequestPayload>

    <RequestPayload>

      <ActionRequests>

      <ActionRequests>
@@ -72,6 +64,5 @@ 
      </ActionRequests>

      </ActionRequests>

    </RequestPayload>

    </RequestPayload>

  </Payload>

  </Payload>



</HI1Message>

</HI1Message>

103120/examples/vehicle_2_RES_RPS_LEA.xml

+0 −6
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">

  <Header>

  <Header>

//Sender OEM

    <SenderIdentifier>

    <SenderIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

    </SenderIdentifier>

    </SenderIdentifier>



//Receiver LEA

    <ReceiverIdentifier>

    <ReceiverIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

    </ReceiverIdentifier>

    </ReceiverIdentifier>

	

//Information about transaction

    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>

    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Version>

    <Version>
@@ -21,7 +16,6 @@ 
      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

    </Version>

    </Version>



  </Header>

  </Header>

  <Payload>

  <Payload>

    <ResponsePayload>

    <ResponsePayload>

103120/examples/vehicle_3_REQ_RPS_LEA_Use_Case_last_pos_by_ignition_off.xml

+80 −133
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">

  

  <Header>

  <Header>

//Sender OEM

    <SenderIdentifier>

    <SenderIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

    </SenderIdentifier>

    </SenderIdentifier>



//Receiver LEA

    <ReceiverIdentifier>

    <ReceiverIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

    </ReceiverIdentifier>

    </ReceiverIdentifier>

	

//Information about transaction

    <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>

    <TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Version>

    <Version>
@@ -22,33 +16,25 @@ 
      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

    </Version>

    </Version>



  </Header>

  </Header>

//Request Payload

  <Payload>

  <Payload>

    <RequestPayload>

    <RequestPayload>

      <ActionRequests>

      <ActionRequests>

        <ActionRequest>

        <ActionRequest>

          <ActionIdentifier>0</ActionIdentifier>

          <ActionIdentifier>0</ActionIdentifier>

          <DELIVER>

          <DELIVER>

						//Object: Responce ID

            <Identifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</Identifier>

            <Identifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</Identifier>

            <HI1Object xsi:type="delivery:DeliveryObject">

            <HI1Object xsi:type="delivery:DeliveryObject">

							//More objects possible

              <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>

              <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>

              <AssociatedObjects>

              <AssociatedObjects>

								//Reference to Request ID

                <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>

                <AssociatedObject>2b36a78b-b628-416d-bd22-404e68a0cd36</AssociatedObject>

              </AssociatedObjects>

              </AssociatedObjects>

              <delivery:Reference>

              <delivery:Reference>

                <delivery:LDID>DE-LEA01-1234567890</delivery:LDID>

                <delivery:LDID>DE-LEA01-1234567890</delivery:LDID>

              </delivery:Reference>

              </delivery:Reference>

              <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>

              <delivery:DeliveryID>d1079830-8e9a-4731-8fb7-36b9b961eb72</delivery:DeliveryID>

							//SequenceNumber until Last Sequence

              <delivery:SequenceNumber>1</delivery:SequenceNumber>

              <delivery:SequenceNumber>1</delivery:SequenceNumber>

              <delivery:LastSequence>true</delivery:LastSequence>

              <delivery:LastSequence>true</delivery:LastSequence>

							

							//Automotive based Manifest: Each OEM, common Dicitonaries

              <delivery:Manifest>

              <delivery:Manifest>

                <delivery:Specification>

                <delivery:Specification>

                  <task:DictionaryOwner>3GPP</task:DictionaryOwner>

                  <task:DictionaryOwner>3GPP</task:DictionaryOwner>
@@ -56,38 +42,25 @@ 
                  <task:Value>CARDBResponse</task:Value>

                  <task:Value>CARDBResponse</task:Value>

                </delivery:Specification>

                </delivery:Specification>

              </delivery:Manifest>

              </delivery:Manifest>



							//######################################

							//From here Automotive specific

							//######################################

							

							//Example: Answer of Req: Last known position

              <delivery:Delivery>

              <delivery:Delivery>

                <delivery:XMLData>

                <delivery:XMLData>

									<carMessage> xmlns="http://uri.etsi.org/XXX658XXX">

                  <carMessage> xmlns=&quot;http://uri.etsi.org/XXX658XXX&quot;&gt;

									

										//More items on each sequence possible

										<recordNumber>1</recordNumber>

										<recordNumber>1</recordNumber>

                    <vehicleRecord>

                    <vehicleRecord>

                      <vehicleServiceUsage>

                      <vehicleServiceUsage>

                        <VehiclePartyInformation>

                        <VehiclePartyInformation>

                          <Type>

                          <Type>

													// Data type <GPS/>

                            <GPS/>

                            <other>GPS</other>

                            <other>GPS</other>

                          </Type>

                          </Type>

                        </VehiclePartyInformation>

                        </VehiclePartyInformation>

                      </vehicleServiceUsage>

                      </vehicleServiceUsage>

											//Can also be covered with the countryCode

                      <countryCode>DE</countryCode>

                      <countryCode>DE</countryCode>

											

                      <Access>

                      <Access>

												//Data Source 

                        <nwAccessType>

                        <nwAccessType>

                          <Backend/>

                          <Backend/>

                        </nwAccessType>

                        </nwAccessType>

												//Primary request data

                        <naDeviceId>VIN=WAZZQ3589423894</naDeviceId>

                        <naDeviceId>VIN=WAZZQ3589423894</naDeviceId>

											

                        <location>

                        <location>

                          <geoCoordinates>

                          <geoCoordinates>

                            <latitude>N520103</latitude>

                            <latitude>N520103</latitude>
@@ -99,55 +72,29 @@ 
                          </geoCoordinates>

                          </geoCoordinates>

                          <userLocationInformation>abcdefg</userLocationInformation>

                          <userLocationInformation>abcdefg</userLocationInformation>

                        </location>

                        </location>

												

												//Additional information 

                        <gprsInformation>

                        <gprsInformation>

                          <iMSI>5555555555555555f7</iMSI>

                          <iMSI>5555555555555555f7</iMSI>

                          <mSISDN>xxxxxxxxxxxx</mSISDN>

                          <mSISDN>xxxxxxxxxxxx</mSISDN>

                        </gprsInformation>

                        </gprsInformation>

												

                        <triggerevent>EVENT_IGNITION_OFF</triggerevent>

                        <triggerevent>EVENT_IGNITION_OFF</triggerevent>

												

												

                      </Access>

                      </Access>



                    </vehicleRecord>

                    </vehicleRecord>

										

										//nationalRecord - Reference to Request ID

                    <nationalRecordPayload>

                    <nationalRecordPayload>

                      <STPO>

                      <STPO>

                        <stpo100k>2022JS55555</stpo100k>

                        <stpo100k>2022JS55555</stpo100k>

                      </STPO>

                      </STPO>

                    </nationalRecordPayload>

                    </nationalRecordPayload>



                    <nationalResponsePayload>

                    <nationalResponsePayload>

                      <countryCode>DE</countryCode>

                      <countryCode>DE</countryCode>

											<additionalInformation>"Searchvalue"="VIN=WAZZQ3589423894";"Searchevent"="EVENT_IGNITION_OFF"</additionalInformation>

                      <additionalInformation>&quot;Searchvalue&quot;=&quot;VIN=WAZZQ3589423894&quot;;&quot;Searchevent&quot;=&quot;EVENT_IGNITION_OFF&quot;</additionalInformation>

                    </nationalResponsePayload>

                    </nationalResponsePayload>

                  </carMessage>

                  </carMessage>

															

                </delivery:XMLData>

                </delivery:XMLData>

								

              </delivery:Delivery>

              </delivery:Delivery>

							

							//######################################

							//End specific automotive area

							//######################################		

							

							

            </HI1Object>

            </HI1Object>

          </DELIVER>

          </DELIVER>

        </ActionRequest>

        </ActionRequest>

			

				<ActionRequest>

					<ActionIdentifier>1</ActionIdentifier>

					<DELIVER>

					//...

					</DELIVER>

				</ActionRequest>

			

      </ActionRequests>

      </ActionRequests>

    </RequestPayload>

    </RequestPayload>

  </Payload>

  </Payload>

</HI1Message>
 
</HI1Message>
 
 No newline at end of file

103120/examples/vehicle_4_RES_LEA_RPS.xml

+0 −6
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">

  <Header>

  <Header>

//Sender OEM

    <SenderIdentifier>

    <SenderIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

      <UniqueIdentifier>LEA01-IC01</UniqueIdentifier>

    </SenderIdentifier>

    </SenderIdentifier>



//Receiver LEA

    <ReceiverIdentifier>

    <ReceiverIdentifier>

      <CountryCode>DE</CountryCode>

      <CountryCode>DE</CountryCode>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

      <UniqueIdentifier>OEM01-IQF01</UniqueIdentifier>

    </ReceiverIdentifier>

    </ReceiverIdentifier>

	

//Information about transaction

    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea4e</TransactionIdentifier>

    <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea4e</TransactionIdentifier>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Timestamp>2021-01-11T13:37:01.000000Z</Timestamp>

    <Version>

    <Version>
@@ -21,7 +16,6 @@ 
      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileOwner>DE</NationalProfileOwner>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

      <NationalProfileVersion>v1.0</NationalProfileVersion>

    </Version>

    </Version>



  </Header>

  </Header>

  <Payload>

  <Payload>

    <ResponsePayload>

    <ResponsePayload>