Commit 4d8d35cd authored by Jerediah Fevold's avatar Jerediah Fevold
Browse files

Merging NR_UAV-core_R2_125_RIL_W014. Merge conflict resolved by manually...

Merging NR_UAV-core_R2_125_RIL_W014. Merge conflict resolved by manually adoping the time difference language into the merging branch.
parents b693aedc 7199ca42
Loading
Loading
Loading
Loading
+1 −2
Original line number Original line Diff line number Diff line
@@ -18464,8 +18464,7 @@ Editor\'s Note: FFS whether UE should start a timer, e.g., Timer T348.
2\> if *flightPathUpdateDistanceThr* is configured and for at least one waypoint, the 3D distance between the previously provided location and the new location is more than the distance threshold configured by *flightPathUpdateDistanceThr*; or
2\> if *flightPathUpdateDistanceThr* is configured and for at least one waypoint, the 3D distance between the previously provided location and the new location is more than the distance threshold configured by *flightPathUpdateDistanceThr*; or
2\> if *flightPathUpdateTimeThr* is configured and for at least one waypoint, the timestamp was not previously provided but is now available, or the time between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:
2\> if *flightPathUpdateTimeThr* is configured and for at least one waypoint, the timestamp was not previously provided but is now available, or the time difference between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:
2\> if *flightPathUpdateTimeThr* is configured and for at least one waypoint, the timestamp was not previously provided but is now available, or the time between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:
3\> initiate transmission of the *UEAssistanceInformation* message in accordance with 5.7.4.3 to indicate the availability of flight path information;
3\> initiate transmission of the *UEAssistanceInformation* message in accordance with 5.7.4.3 to indicate the availability of flight path information;