Add track total distance calculations

qgis · Nov 11, 2022 · 32db68b · 32db68b
1 parent dc755b6
commit 32db68b
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 2 deletions.
diff --git a/src/app/gps/qgsappgpsdigitizing.cpp b/src/app/gps/qgsappgpsdigitizing.cpp
@@ -89,6 +89,11 @@ QgsAppGpsDigitizing::QgsAppGpsDigitizing( QgsAppGpsConnection *connection, QgsMa
   {
     QgsProject::instance()->gpsSettings()->setDestinationLayer( qobject_cast< QgsVectorLayer *> ( QgisApp::instance()->activeLayer() ) );
   }
+
+  connect( QgsProject::instance(), &QgsProject::transformContextChanged, this, &QgsAppGpsDigitizing::updateDistanceArea );
+  connect( QgsProject::instance(), &QgsProject::ellipsoidChanged, this, &QgsAppGpsDigitizing::updateDistanceArea );
+
+  updateDistanceArea();
 }
 
 QgsAppGpsDigitizing::~QgsAppGpsDigitizing()
@@ -97,6 +102,21 @@ QgsAppGpsDigitizing::~QgsAppGpsDigitizing()
   mRubberBand = nullptr;
 }
 
+double QgsAppGpsDigitizing::totalTrackLength() const
+{
+  QVector<QgsPointXY> points;
+  QgsGeometry::convertPointList( mCaptureListWgs84, points );
+  return mDa.measureLine( points );
+}
+
+double QgsAppGpsDigitizing::trackDirectLength() const
+{
+  if ( mCaptureListWgs84.empty() )
+    return 0;
+
+  return mDa.measureLine( { QgsPointXY( mCaptureListWgs84.constFirst() ), QgsPointXY( mCaptureListWgs84.constLast() )} );
+}
+
 void QgsAppGpsDigitizing::addVertex()
 {
   if ( !mRubberBand )
@@ -136,6 +156,8 @@ void QgsAppGpsDigitizing::addVertex()
 
   if ( trackWasEmpty )
     emit trackIsEmptyChanged( false );
+
+  emit trackChanged();
 }
 
 void QgsAppGpsDigitizing::resetTrack()
@@ -149,6 +171,7 @@ void QgsAppGpsDigitizing::resetTrack()
 
   if ( !trackWasEmpty )
     emit trackIsEmptyChanged( true );
+  emit trackChanged();
 }
 
 void QgsAppGpsDigitizing::createFeature()
@@ -356,6 +379,8 @@ void QgsAppGpsDigitizing::createFeature()
       if ( mCaptureListWgs84.empty() )
         emit trackIsEmptyChanged( true );
 
+      emit trackChanged();
+
       break;
     }
 
@@ -593,6 +618,12 @@ void QgsAppGpsDigitizing::stopLogging()
   }
 }
 
+void QgsAppGpsDigitizing::updateDistanceArea()
+{
+  mDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
+  mDa.setSourceCrs( mWgs84CRS, QgsProject::instance()->transformContext() );
+}
+
 void QgsAppGpsDigitizing::createRubberBand()
 {
   delete mRubberBand;

diff --git a/src/app/gps/qgsappgpsdigitizing.h b/src/app/gps/qgsappgpsdigitizing.h
@@ -50,6 +50,20 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
     QgsAppGpsDigitizing( QgsAppGpsConnection *connection, QgsMapCanvas *canvas, QObject *parent = nullptr );
     ~QgsAppGpsDigitizing() override;
 
+    /**
+     * Returns the total length of the current digitized track (in meters).
+     *
+     * The returned length is calculated using ellipsoidal calculations.
+     */
+    double totalTrackLength() const;
+
+    /**
+     * Returns the direct length from the first vertex in the track to the last (in meters).
+     *
+     * The returned length is calculated using ellipsoidal calculations.
+     */
+    double trackDirectLength() const;
+
   public slots:
     void addVertex();
     void resetTrack();
@@ -64,6 +78,11 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
      */
     void trackIsEmptyChanged( bool isEmpty );
 
+    /**
+     * Emitted whenever the recorded track is changed.
+     */
+    void trackChanged();
+
   private slots:
     void gpsSettingsChanged();
     void updateTrackAppearance();
@@ -79,6 +98,8 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
     void startLogging();
     void stopLogging();
 
+    void updateDistanceArea();
+
   private:
     void createRubberBand();
     QVariant timestamp( QgsVectorLayer *vlayer, int idx );
@@ -119,6 +140,8 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
     std::unique_ptr< QFile > mLogFile;
     QTextStream mLogFileTextStream;
 
+    QgsDistanceArea mDa;
+
     friend class TestQgsGpsIntegration;
 };
 

diff --git a/src/app/layers/qgsapplayerhandling.cpp b/src/app/layers/qgsapplayerhandling.cpp
@@ -36,8 +36,6 @@
 #include "qgslayertreenode.h"
 #include "qgslayertree.h"
 #include "qgslayertreeview.h"
-#include "qgslayertreemodel.h"
-#include "qgslayertreeutils.h"
 #include "qgsgui.h"
 #include "qgsmbtiles.h"
 #include "qgsmessagelog.h"

diff --git a/tests/src/app/testqgsgpsintegration.cpp b/tests/src/app/testqgsgpsintegration.cpp
@@ -26,6 +26,7 @@
 #include "gps/qgsappgpssettingsmenu.h"
 #include "options/qgsgpsoptions.h"
 #include "qgsprojectgpssettings.h"
+#include "qgsgpsconnection.h"
 #include "nmeatime.h"
 
 #include <QSignalSpy>
@@ -50,6 +51,7 @@ class TestQgsGpsIntegration : public QgsTest
     void testTimestampWrite();
     void testMultiPartLayers();
     void testFollowActiveLayer();
+    void testTrackDistance();
 
   private:
     QDateTime _testWrite( QgsVectorLayer *vlayer, QgsAppGpsDigitizing &gpsDigitizing, const QString &fieldName, Qt::TimeSpec timeSpec, bool commit = false );
@@ -433,6 +435,64 @@ void TestQgsGpsIntegration::testFollowActiveLayer()
   QCOMPARE( QgsProject::instance()->gpsSettings()->destinationLayer(), tempLayerLineString );
 }
 
+void TestQgsGpsIntegration::testTrackDistance()
+{
+  QgsVectorLayer *lineString = new QgsVectorLayer( QStringLiteral( "Linestring?crs=epsg:4326&field=intf:int&field=stringf:string" ),
+      QStringLiteral( "vl" ),
+      QStringLiteral( "memory" ) );
+  QgsProject::instance()->addMapLayer( lineString );
+
+  QgsMapCanvas *canvas = mQgisApp->mapCanvas();
+  QgsAppGpsConnection connection( nullptr );
+
+  QgsAppGpsDigitizing gpsDigitizing( &connection, canvas );
+  QgsProject::instance()->gpsSettings()->setDestinationFollowsActiveLayer( true );
+  mQgisApp->setActiveLayer( lineString );
+  QCOMPARE( QgsProject::instance()->gpsSettings()->destinationLayer(), lineString );
+  lineString->startEditing();
+
+  QSignalSpy spy( &gpsDigitizing, &QgsAppGpsDigitizing::trackChanged );
+
+  QgsGpsInformation info;
+  info.latitude = 45;
+  info.longitude = 100;
+
+  gpsDigitizing.gpsStateChanged( info );
+  gpsDigitizing.addVertex();
+  QCOMPARE( spy.count(), 1 );
+
+  QCOMPARE( gpsDigitizing.totalTrackLength(), 0 );
+  QCOMPARE( gpsDigitizing.trackDirectLength(), 0 );
+
+  info.latitude = 46;
+  info.longitude = 100;
+
+  gpsDigitizing.gpsStateChanged( info );
+  gpsDigitizing.addVertex();
+  QCOMPARE( spy.count(), 2 );
+
+  QgsProject::instance()->setCrs( QgsCoordinateReferenceSystem( "EPSG:3857" ) );
+  QCOMPARE( QgsProject::instance()->ellipsoid(), QStringLiteral( "NONE" ) );
+  QGSCOMPARENEAR( gpsDigitizing.totalTrackLength(), 1, 0.01 );
+  QGSCOMPARENEAR( gpsDigitizing.trackDirectLength(), 1, 0.01 );
+  QgsProject::instance()->setEllipsoid( QStringLiteral( "EPSG:7030" ) );
+  QCOMPARE( QgsProject::instance()->ellipsoid(), QStringLiteral( "EPSG:7030" ) );
+  QGSCOMPARENEAR( gpsDigitizing.totalTrackLength(), 111141.548, 1 );
+  QGSCOMPARENEAR( gpsDigitizing.trackDirectLength(), 111141.548, 1 );
+
+  info.latitude = 46;
+  info.longitude = 101;
+
+  gpsDigitizing.gpsStateChanged( info );
+  gpsDigitizing.addVertex();
+  QCOMPARE( spy.count(), 3 );
+  QGSCOMPARENEAR( gpsDigitizing.totalTrackLength(), 188604.338, 1 );
+  QGSCOMPARENEAR( gpsDigitizing.trackDirectLength(), 135869.0912, 1 );
+
+  gpsDigitizing.resetTrack();
+  QCOMPARE( spy.count(), 4 );
+}
+
 
 QGSTEST_MAIN( TestQgsGpsIntegration )
 #include "testqgsgpsintegration.moc"