Commit af785d5a authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Resolving merge conflict

parents 0d882d3a bbbb81b2

103976/ts_103976.schema.json

+44 −2
Original line number Diff line number Diff line
@@ -126,6 +126,36 @@ 
            },

            "required" : ["Location", "TimeOfLocation"]

        },

        "VINtoUniquePartNumberRecord" : {

            "type" : "object",

            "properties" : {

                "UniquePartNumber" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" },

                "PartType" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"},

                "PartTypeFreeText" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" }

            },

            "required" : ["UniquePartNumber"]

        },

        "UniquePartNumbertoVINRecord" : {

            "type" : "object",

            "properties" : {

                "VIN" : { "$ref" : "ts_103280_2017_07#/$defs/VIN" }

            },

            "required" : ["VIN"]

        },

        "VINtoSubscribedServicesRecord" : {

            "type" : "object",

            "properties" : {

                "NameOfService" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" },

                "FirstPaymentDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" },

                "MostRecentPaymentDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" },

                "TerminationDate" : { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" },

                "UserID" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" },

                "CustomerName" : { "$ref" : "ts_103280_2017_07#/$defs/ShortString" },

                "CustomerAddress": { "$ref" : "ts_103280_2017_07#/$defs/LongString" },

                "TypeOfPaymentMethod" : { "$ref" : "ts_103120_Common_2016_02#/$defs/DictionaryEntry"} 

            },

            "required" : []

        },

        "ResultRecords" : {

            "type" : "object",

            "properties" : {
@@ -140,6 +170,18 @@ 
                "VINtoLocationRecords" : {

                    "type" : "array",

                    "items" : { "$ref" : "#/$defs/VINtoLocationRecord"}

                },

                "VINtoUniquePartNumberRecords" : {

                    "type" : "array",

                    "items" : { "$ref" : "#/$defs/VINtoUniquePartNumberRecord"}

                },

                "UniquePartNumbertoVINRecords" : {

                    "type" : "array",

                    "items" : { "$ref" : "#/$defs/UniquePartNumbertoVINRecord"}

                },

                "VINtoSubscribedServicesRecords" : {

                    "type" : "array",

                    "items" : { "$ref" : "#/$defs/VINtoSubscribedServicesRecord"}

                }

            }

        }

103976/ts_103976_ETSIDictionaryDefinitions.xml

0 → 100644
+73 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Dictionaries xmlns="http://uri.etsi.org/03280/common/2019/10/Dictionaries">

    <Dictionary>

        <Owner>ETSI</Owner>

        <Name>TS103976RequestType</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>VINtoCommsID</Value>

                <Meaning>VINtoCommsID request, as defined in clause 7.2.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>CommsIDtoVIN</Value>

                <Meaning>CommsIDtoVIN request, as defined in clause 7.3.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>VINtoLocation</Value>

                <Meaning>VINtoLocation request, as defined in clause 7.4.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>VINtoUniquePartNumber</Value>

                <Meaning>VINtoUniquePartNumber request, as defined in clause 7.5</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>UniquePartNumbertoVIN</Value>

                <Meaning>UniquePartNumbertoVIN request, as defined in clause 7.6</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>VINtoSubscribedServices</Value>

                <Meaning>VINtoSubscribedServices request, as defined in clause 7.7</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <Owner>ETSI</Owner>

        <Name>TS103976PartType</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>Gearbox</Value>

                <Meaning>Part that the RPS considers to be a gearbox</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Engine</Value>

                <Meaning>Part that the RPS considers to be an engine</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Airbag</Value>

                <Meaning>Part that the RPS considers to be an airbag</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Multimedia</Value>

                <Meaning>Components of the vehicle used for providing information or entertainment capabilities, including an automotive head unit.</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Other</Value>

                <Meaning>Component not meeting any of the other entries of this list.</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

    <Dictionary>

        <Owner>ETSI</Owner>

        <Name>TS103976TypeOfPayment</Name>

        <DictionaryEntries>

            <DictionaryEntry>

                <Value>CreditCard</Value>

                <Meaning>Payment made using credit card</Meaning>

            </DictionaryEntry>

            <DictionaryEntry>

                <Value>Other</Value>

                <Meaning>Item not covered by other entries in this dictionary</Meaning>

            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

</Dictionaries>