In Qt we cannot trust, revert "In Qt we shall trust, let it deal with…

… screen orientation"

This reverts commit 3e5e8c0.

src/core/positioning/positioning.cpp

@@ -198,7 +198,27 @@ GnssPositionInformation Positioning::positionInformation() const
 
 double Positioning::orientation() const
 {
-  return mPositioningSourceReplica->property( "orientation" ).toDouble();
+  return adjustOrientation( mPositioningSourceReplica->property( "orientation" ).toDouble() );
+}
+
+double Positioning::adjustOrientation( double orientation ) const
+{
+  // Take into account the orientation of the device
+  QScreen *screen = QgsApplication::instance()->primaryScreen();
+  switch ( screen->orientation() )
+  {
+    case Qt::LandscapeOrientation:
+      orientation += 90;
+      break;
+    case Qt::InvertedLandscapeOrientation:
+      orientation += 270;
+      break;
+    case Qt::PortraitOrientation:
+    default:
+      break;
+  }
+
+  return std::fmod( orientation, 360 );
 }
 
 void Positioning::setCoordinateTransformer( QgsQuickCoordinateTransformer *coordinateTransformer )
@@ -250,6 +270,11 @@ void Positioning::processGnssPositionInformation()
     mCoordinateTransformer->setSourcePosition( mSourcePosition );
   }
 
+  if ( mPositionInformation.orientationValid() )
+  {
+    mPositionInformation.setOrientation( adjustOrientation( mPositionInformation.orientation() ) );
+  }
+
   emit positionInformationChanged();
 }
 

src/core/positioning/positioningsource.cpp

@@ -34,10 +34,8 @@ PositioningSource::PositioningSource( QObject *parent )
   // Setup internal gnss receiver by default
   setupDevice();
 
-  // Setup the compass to respect screen orientation
-  mCompass.setAxesOrientationMode( QSensor::AxesOrientationMode::AutomaticOrientation );
-
-  // Use a timer instead of the compass's readingChanged signal to avoid handling too many signals
+  // Setup the compass, use a timer instead of the compass's readingChanged signal to avoid handling
+  // too many signals
   mCompassTimer.setInterval( 200 );
   connect( &mCompassTimer, &QTimer::timeout, this, &PositioningSource::processCompassReading );
 }