diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 10da9cfc2348d79c26fb18c938e21d2aefb3692d..dbabf8b20871466c334fb38efabbb1e40c4492d5 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -9,7 +9,8 @@ IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) -- from ETSI TS 103 280 [44] - LIID + LIID, + WGS84CoordinateDecimal FROM Common-Parameters {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)} @@ -678,12 +679,13 @@ EncryptedPayloadType ::= ENUMERATED Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, - threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL, + cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -693,6 +695,12 @@ WlanLocationAttributes ::= SEQUENCE ... } +CPEProvidedLocationAttributes ::= SEQUENCE +{ + wGS84CoordinateDecimal [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL, + ... +} + IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in diff --git a/testing/asn_process.py b/testing/asn_process.py index 8c4394cd6456364706a95c238554f8164137ba7c..5ca7aa5bf880d352c0ef9de3b7a3181fd0c680b5 100644 --- a/testing/asn_process.py +++ b/testing/asn_process.py @@ -81,7 +81,7 @@ duplicateObjects = { def fixDuplicateObjects(filename): stringContent = filename.read_text() for object in duplicateObjects[filename.as_posix()]: - stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=') + stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=', 1) stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent)