Skip to content

improve correctness of GNSS datetime handling #6502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

improve correctness of GNSS datetime handling #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5874f3a
improve correctness of GNSS datetime handline
edgecase14 Jul 29, 2025
9543d52
forgot another pre-commit hook
edgecase14 Jul 29, 2025
70d1283
commit-hook for real this time
edgecase14 Jul 29, 2025
2c7cebc
Merge branch 'opengisch:master' into null-gnss-time
edgecase14 Aug 13, 2025
0bdbd7d
add comment to trigger MacOS build
edgecase14 Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/positioning/internalgnssreceiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void InternalGnssReceiver::handleSatellitesInUseUpdated( const QList<QGeoSatelli
mSatellitesInfo, 0, 0, 0,
mLastGnssPositionInformation.hacc(),
mLastGnssPositionInformation.vacc(),
mLastGnssPositionInformation.utcDateTime(),
mLastGnssPositionInformation.utcDateTime().isValid() ? mLastGnssPositionInformation.utcDateTime() : QDateTime::currentDateTimeUtc(),
QChar(), 0, -1, static_cast<int>( mSatellitesID.size() ), QChar( 'A' ), mSatellitesID, mSatelliteInformationValid,
mLastGnssPositionInformation.verticalSpeed(),
mLastGnssPositionInformation.magneticVariation(),
Expand Down
2 changes: 1 addition & 1 deletion src/core/positioning/positioningsource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ void PositioningSource::lastGnssPositionInformationChanged( const GnssPositionIn
lastGnssPositionInformation.vdop(),
lastGnssPositionInformation.hacc(),
lastGnssPositionInformation.vacc(),
lastGnssPositionInformation.utcDateTime().isValid() ? lastGnssPositionInformation.utcDateTime() : QDateTime::currentDateTimeUtc(),
lastGnssPositionInformation.utcDateTime(),
lastGnssPositionInformation.fixMode(),
lastGnssPositionInformation.fixType(),
lastGnssPositionInformation.quality(),
Expand Down
7 changes: 4 additions & 3 deletions src/core/tracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,17 @@ void Tracker::processPositionInformation( const GnssPositionInformation &positio
if ( !mIsActive && !mIsReplaying )
return;

mLastDevicePositionTimestampMSecsSinceEpoch = positionInformation.utcDateTime().toMSecsSinceEpoch();
mLastDevicePositionTimestampMSecsSinceEpoch = positionInformation.utcDateTime().isValid() ? positionInformation.utcDateTime().toMSecsSinceEpoch() : QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();

double measureValue = 0.0;
switch ( mMeasureType )
{
case Tracker::SecondsSinceStart:
measureValue = positionInformation.utcDateTime().toSecsSinceEpoch() - mStartPositionTimestamp.toSecsSinceEpoch();
if ( positionInformation.utcDateTime().isValid() && mStartPositionTimestamp.isValid() )
measureValue = positionInformation.utcDateTime().toSecsSinceEpoch() - mStartPositionTimestamp.toSecsSinceEpoch();
break;
case Tracker::Timestamp:
measureValue = positionInformation.utcDateTime().toSecsSinceEpoch();
measureValue = positionInformation.utcDateTime().isValid() ? positionInformation.utcDateTime().toSecsSinceEpoch() : QDateTime::currentDateTimeUtc().toSecsSinceEpoch();
break;
case Tracker::GroundSpeed:
measureValue = positionInformation.speed();
Expand Down
4 changes: 3 additions & 1 deletion src/core/utils/expressioncontextutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ QgsExpressionContextScope *ExpressionContextUtils::positionScope( const GnssPosi
const QgsGeometry point = QgsGeometry( new QgsPoint( positionInformation.longitude(), positionInformation.latitude(), positionInformation.elevation() ) );

addPositionVariable( scope, QStringLiteral( "coordinate" ), QVariant::fromValue<QgsGeometry>( point ), positionLocked );
addPositionVariable( scope, QStringLiteral( "timestamp" ), positionInformation.utcDateTime(), positionLocked );
addPositionVariable( scope, QStringLiteral( "timestamp" ),
positionInformation.utcDateTime().isValid() ? positionInformation.utcDateTime() : QDateTime::currentDateTimeUtc(),
positionLocked );
addPositionVariable( scope, QStringLiteral( "direction" ), positionInformation.direction(), positionLocked ); // Speed direction
addPositionVariable( scope, QStringLiteral( "ground_speed" ), positionInformation.speed(), positionLocked );
addPositionVariable( scope, QStringLiteral( "orientation" ), positionInformation.orientation(), positionLocked ); // Compass/magnetometer orientation
Expand Down
8 changes: 6 additions & 2 deletions src/core/utils/fileutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,12 @@ void FileUtils::addImageMetadata( const QString &imagePath, const GnssPositionIn
metadata["Exif.GPSInfo.GPSSpeedRef"] = "K";
}

metadata["Exif.GPSInfo.GPSDateStamp"] = positionInformation.utcDateTime().date();
metadata["Exif.GPSInfo.GPSTimeStamp"] = positionInformation.utcDateTime().time();
// slight change in behaviour, but more correct
if ( positionInformation.utcDateTime().isValid() )
{
metadata["Exif.GPSInfo.GPSDateStamp"] = positionInformation.utcDateTime().date();
metadata["Exif.GPSInfo.GPSTimeStamp"] = positionInformation.utcDateTime().time();
}

metadata["Exif.GPSInfo.GPSSatellites"] = QString::number( positionInformation.satellitesUsed() ).rightJustified( 2, '0' );

Expand Down
2 changes: 1 addition & 1 deletion src/core/utils/positioningutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ GnssPositionInformation PositioningUtils::averagedPositionInformation( const QLi
double verticalSpeed = std::numeric_limits<double>::quiet_NaN();
double magneticVariation = std::numeric_limits<double>::quiet_NaN();

QDateTime utcDateTime = positionsInformation.last().utcDateTime();
QDateTime utcDateTime = positionsInformation.last().utcDateTime().isValid() ? positionsInformation.last().utcDateTime() : QDateTime::currentDateTimeUtc();

QList<QgsSatelliteInfo> satellitesInView = positionsInformation.at( 0 ).satellitesInView();
int satellitesUsed = satellitesInView.size();
Expand Down
Loading