Commit 107339e9 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 103 976 CR002 - Schema fixes

parent bf9d58fb
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
{
    "CommsIDtoVINRecords" : [
        { "VIN" : "1G9Y817H34LSP7293" }
    ]
}
 No newline at end of file
+67 −0
Original line number Original line Diff line number Diff line
{
    "VINtoCommsIDRecords" : [
        {
            "CommsID" : { "IMEI" : "00440123456789" },
            "AssociationTime" : {
                "PeriodInTime" : {
                    "StartTime" : "2022-01-16T15:57:00Z",
                    "EndTime" : "2022-01-16T15:57:00Z"
                }
            }        
        },
        {
            "CommsID" : { "IMSI" : "999990123456789" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "ICCID" : "89999012345678901234" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "PEIIMEI" : "00440123456789" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "SUPIIMSI" : "999990123456789" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "SUPINAI" : "example@example.com" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "MSISDN" : "491713920000" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "GPSIMSISDN" : "491713920000" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "MACAddress" : "00:00:5e:00:53:00" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        },
        {
            "CommsID" : { "EUI164" : "00:00:5e:ef:10:00:00:00" },
            "AssociationTime" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            }        
        }
    ]
}
 No newline at end of file
+28 −0
Original line number Original line Diff line number Diff line
@@ -3,22 +3,26 @@
        {
        {
            "Location" : {
            "Location" : {
                "WGS84CoordinateDecimal" : {
                "WGS84CoordinateDecimal" : {
                    "etsi280:latitude" : "N54.123456",
                    "etsi280:latitude" : "N43.617003",
                    "etsi280:longitude" : "W001.123456"
                    "etsi280:longitude" : "E007.053222"
                }
                }
            },
            },
            "TimeOfLocation" : {
            "TimeOfLocation" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
                "PointInTime" : "2022-01-16T15:57:00Z"
            },
            "CommunicationsIdentifier" : {
                "IMSI" : "0123456"
            },
            "AssociationTime" : {
                "PeriodInTime" : {
                    "StartTime" : "2022-01-16T15:57:00Z",
                    "EndTime" : "2022-01-16T15:57:00Z"
            }
            }
        },
        {
            "Location" : {
                "WGS84CoordinateDecimal" : {
                    "etsi280:latitude" : "N43.617003",
                    "etsi280:longitude" : "E007.053222"
                }
                }
            },
            "TimeOfLocation" : {
                "PointInTime" : "2022-01-16T15:57:00Z"
            },
            "SourceOfLocation" : "GNSS",
            "LocationRecordReason" : "Location record reason"
        }
        }
    ]
    ]
}
}
 No newline at end of file
+13 −11
Original line number Original line Diff line number Diff line
{
{
    "$id": "ts_103976_core",
    "$id": "ts_103976_core",
    "$schema": "https://json-schema.org/draft/2020-12/schema",    
    "$defs": { 
    "$defs": { 
        "AssociationPeriod" : {
        "AssociationPeriod" : {
            "type" : "object",
            "type" : "object",
@@ -41,47 +42,47 @@
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/ICCID"} },
                    "properties" : { "ICCID" : { "$ref" : "ts_103280_2017_07#/$defs/ICCID"} },
                    "required" : ["ICCID"]                    
                    "required" : ["ICCID"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/PEIIMEI"} },
                    "properties" : { "PEIIMEI" : { "$ref" : "ts_103280_2017_07#/$defs/PEIIMEI"} },
                    "required" : ["PEIIMEI"]                    
                    "required" : ["PEIIMEI"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPIIMSI"} },
                    "properties" : { "SUPIIMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPIIMSI"} },
                    "required" : ["SUPIIMSI"]                    
                    "required" : ["SUPIIMSI"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPINAI"} },
                    "properties" : { "SUPINAI" : { "$ref" : "ts_103280_2017_07#/$defs/SUPINAI"} },
                    "required" : ["SUPINAI"]                    
                    "required" : ["SUPINAI"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/InternationalE164"} },
                    "properties" : { "MSISDN" : { "$ref" : "ts_103280_2017_07#/$defs/InternationalE164"} },
                    "required" : ["MSISDN"]                    
                    "required" : ["MSISDN"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSIMSISDN"} },
                    "properties" : { "GPSIMSISDN" : { "$ref" : "ts_103280_2017_07#/$defs/GPSIMSISDN"} },
                    "required" : ["GPSIMSISDN"]                    
                    "required" : ["GPSIMSISDN"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSINAI"} },
                    "properties" : { "GPSINAI" : { "$ref" : "ts_103280_2017_07#/$defs/GPSINAI"} },
                    "required" : ["GPSINAI"]                    
                    "required" : ["GPSINAI"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/MACAddress"} },
                    "properties" : { "MACAddress" : { "$ref" : "ts_103280_2017_07#/$defs/MACAddress"} },
                    "required" : ["MACAddress"]                    
                    "required" : ["MACAddress"]                    
                },
                },
                {
                {
                    "type" : "object",
                    "type" : "object",
                    "properties" : { "IMSI" : { "$ref" : "ts_103280_2017_07#/$defs/EUI64"} },
                    "properties" : { "EUI164" : { "$ref" : "ts_103280_2017_07#/$defs/EUI64"} },
                    "required" : ["EUI164"]
                    "required" : ["EUI164"]
                }
                }
            ]
            ]
@@ -92,7 +93,8 @@
                    "type"  : "object",
                    "type"  : "object",
                    "properties" : {
                    "properties" : {
                        "WGS84CoordinateDecimal" : { "$ref"  : "ts_103280_2017_07#/$defs/WGS84CoordinateDecimal"}
                        "WGS84CoordinateDecimal" : { "$ref"  : "ts_103280_2017_07#/$defs/WGS84CoordinateDecimal"}
                    }
                    },
                    "required" : ["WGS84CoordinateDecimal"]
                }
                }
            ]
            ]
        },
        },
@@ -131,7 +133,7 @@
                    "type" : "array",
                    "type" : "array",
                    "items" : { "$ref" : "#/$defs/VINtoCommsIDRecord"}
                    "items" : { "$ref" : "#/$defs/VINtoCommsIDRecord"}
                },
                },
                "CommsIDToVINRecords" : {
                "CommsIDtoVINRecords" : {
                    "type" : "array",
                    "type" : "array",
                    "items" : { "$ref" : "#/$defs/CommsIDToVINRecord"}
                    "items" : { "$ref" : "#/$defs/CommsIDToVINRecord"}
                },
                },