Commit 9c0a9890 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'fix/280-asn1' into 'meeting/LI71' 

Corrections in TS 102 232-1 andTS 103 280 ASN.1, TS 103 120 XSD

See merge request !301
parents 5f23dffa 139d8666

102232-1/LI-PS-PDU.asn

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ IMPORTS 
    WGS84CoordinateDecimal,

    GNSSLocation

        FROM Common-Parameters

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version261(261)}



        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}



    -- previously from ETSI TS 101 671 [4]; now provided with this specification

    IRI-Parameters,

103120/schema/xsd/ts_103120_IRIPolicy.xsd

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2022/07/IRIPolicy" targetNamespace="http://uri.etsi.org/03120/common/2022/07/IRIPolicy" elementFormDefault="qualified" attributeFormDefault="unqualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2026/01/IRIPolicy" targetNamespace="http://uri.etsi.org/03120/common/2026/01/IRIPolicy" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

103280/TS_103_280.asn1

+14 −14
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ WGS84Location ::= SEQUENCE 


WGS84Coordinate ::= CHOICE

{

    decimal [0] Common-Parameters.WGS84CoordinateDecimal,

    angular [1] Common-Parameters.WGS84CoordinateAngular

    decimal [0] WGS84CoordinateDecimal,

    angular [1] WGS84CoordinateAngular

}



GeoShape ::= SEQUENCE