Measurement Tool

.github/workflows/android.yml

@@ -272,7 +272,6 @@ jobs:
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [v7 + v8a]
 
       - name: build AAB
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
           ANDROID_NDK_HOST: darwin-x86_64
@@ -286,14 +285,12 @@ jobs:
             find . | grep .aab
 
       - name: Rename AAB artefacts
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         run: |
           mv \
             ${{ github.workspace }}/build-Input/app/android-build/build/outputs/bundle/release/android-build-release.aab \
             ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
 
       - name: Upload AAB to Artifacts
-        if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         uses: actions/upload-artifact@v3
         with:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab

app/CMakeLists.txt

@@ -27,6 +27,7 @@ set(MM_SRCS
     maptools/abstractmaptool.cpp
     maptools/recordingmaptool.cpp
     maptools/splittingmaptool.cpp
+    maptools/measurementmaptool.cpp
     ios/iosimagepicker.cpp
     ios/iosutils.cpp
     position/providers/abstractpositionprovider.cpp
@@ -109,6 +110,7 @@ set(MM_HDRS
     maptools/abstractmaptool.h
     maptools/recordingmaptool.h
     maptools/splittingmaptool.h
+    maptools/measurementmaptool.h
     ios/iosimagepicker.h
     ios/iosutils.h
     position/providers/abstractpositionprovider.h

app/icons/icons.qrc

@@ -97,5 +97,7 @@
         <file>ZoomToProject.svg</file>
         <file>StakeOut.svg</file>
         <file>Student.svg</file>
+        <file>Measure.svg</file>
+        <file>CloseShape.svg</file>
     </qresource>
 </RCC>

app/images/images.qrc

@@ -23,6 +23,7 @@
         <file>ExternalGpsGreen.svg</file>
         <file>NegativeMMSymbol.svg</file>
         <file>PositiveMMSymbol.svg</file>
+        <file>NeutralMMSymbol.svg</file>
         <file>CloseAccount.svg</file>
         <file>Attention.svg</file>
         <file>Bubble.svg</file>

app/inpututils.cpp

@@ -168,27 +168,50 @@ QString InputUtils::formatNumber( const double number, int precision )
   return QString::number( number, 'f', precision );
 }
 
-QString InputUtils::formatDistanceInProjectUnit( const double distanceInMeters, int precision, Qgis::DistanceUnit destUnit )
+QString InputUtils::formatDistanceInProjectUnit( const double distanceInMeters, int precision, QgsProject *activeProject )
 {
-  Qgis::DistanceUnit distUnit = destUnit;
+  if ( !activeProject )
+    return QString();
 
-  if ( distUnit == Qgis::DistanceUnit::Unknown )
-  {
-    distUnit = QgsProject::instance()->distanceUnits();
-  }
+  return InputUtils::formatDistanceHelper( distanceInMeters, precision, activeProject->distanceUnits() );
+}
 
-  if ( distUnit == Qgis::DistanceUnit::Unknown )
+QString InputUtils::formatDistanceHelper( const double distanceInMeters, int precision, Qgis::DistanceUnit destUnit )
+{
+  if ( destUnit == Qgis::DistanceUnit::Unknown )
   {
-    return QString::number( distanceInMeters, 'f', precision );
+    destUnit = Qgis::DistanceUnit::Meters;
   }
 
-  double factor = QgsUnitTypes::fromUnitToUnitFactor( Qgis::DistanceUnit::Meters, distUnit );
+  double factor = QgsUnitTypes::fromUnitToUnitFactor( Qgis::DistanceUnit::Meters, destUnit );
   double distance = distanceInMeters * factor;
-  QString abbreviation = QgsUnitTypes::toAbbreviatedString( distUnit );
+  QString abbreviation = QgsUnitTypes::toAbbreviatedString( destUnit );
 
   return QString( "%1 %2" ).arg( QString::number( distance, 'f', precision ), abbreviation );
 }
 
+QString InputUtils::formatAreaInProjectUnit( const double areaInSquareMeters, int precision, QgsProject *activeProject )
+{
+  if ( !activeProject )
+    return QString();
+
+  return InputUtils::formatAreaHelper( areaInSquareMeters, precision, activeProject->areaUnits() );
+}
+
+QString InputUtils::formatAreaHelper( const double areaInSquareMeters, int precision, Qgis::AreaUnit destUnit )
+{
+  if ( destUnit == Qgis::AreaUnit::Unknown )
+  {
+    destUnit = Qgis::AreaUnit::SquareMeters;
+  }
+
+  double factor = QgsUnitTypes::fromUnitToUnitFactor( Qgis::AreaUnit::SquareMeters, destUnit );
+  double area = areaInSquareMeters * factor;
+  QString abbreviation = QgsUnitTypes::toAbbreviatedString( destUnit );
+
+  return QString( "%1 %2" ).arg( QString::number( area, 'f', precision ), abbreviation );
+}
+
 QString InputUtils::formatDateTimeDiff( const QDateTime &tMin, const QDateTime &tMax )
 {
   qint64 daysDiff = tMin.daysTo( tMax );
@@ -2194,3 +2217,8 @@ bool InputUtils::openLink( const QString &homePath, const QString &link )
 
   return true;
 }
+
+double InputUtils::pixelDistanceBetween( const QPointF &p1, const QPointF &p2 )
+{
+  return std::hypot( p1.x() - p2.x(), p1.y() - p2.y() );
+}

app/inpututils.h

@@ -75,7 +75,12 @@ class InputUtils: public QObject
     Q_INVOKABLE QString getFileName( const QString &filePath );
     Q_INVOKABLE QString formatProjectName( const QString &fullProjectName );
     Q_INVOKABLE QString formatNumber( const double number, int precision = 1 );
-    Q_INVOKABLE QString formatDistanceInProjectUnit( const double distanceInMeters, int precision = 1, Qgis::DistanceUnit destUnit = Qgis::DistanceUnit::Unknown );
+    Q_INVOKABLE QString formatDistanceInProjectUnit( const double distanceInMeters, int precision, QgsProject *activeProject );
+    Q_INVOKABLE QString formatAreaInProjectUnit( const double areaInSquareMeters, int precision, QgsProject *activeProject );
+
+    static QString formatDistanceHelper( const double distanceInMeters, int precision, Qgis::DistanceUnit destUnit );
+    static QString formatAreaHelper( const double areaInSquareMeters, int precision, Qgis::AreaUnit destUnit );
+
     Q_INVOKABLE void setExtentToFeature( const FeatureLayerPair &pair, InputMapSettings *mapSettings );
 
     /**
@@ -579,6 +584,11 @@ class InputUtils: public QObject
      */
     static QVector<QString> qgisProfilerLog();
 
+    /**
+     * Calculates the Euclidean distance between two pixel points
+     */
+    static double pixelDistanceBetween( const QPointF &p1, const QPointF &p2 );
+
   public slots:
     void onQgsLogMessageReceived( const QString &message, const QString &tag, Qgis::MessageLevel level );
 

app/main.cpp

@@ -114,6 +114,7 @@
 #include "maptools/abstractmaptool.h"
 #include "maptools/recordingmaptool.h"
 #include "maptools/splittingmaptool.h"
+#include "maptools/measurementmaptool.h"
 
 #include "layer/layertreemodel.h"
 #include "layer/layertreemodelpixmapprovider.h"
@@ -348,6 +349,7 @@ void initDeclarative()
   qmlRegisterUncreatableType< AbstractMapTool >( "mm", 1, 0, "AbstractMapTool", "Instantiate one of child map tools instead" );
   qmlRegisterType< RecordingMapTool >( "mm", 1, 0, "RecordingMapTool" );
   qmlRegisterType< SplittingMapTool >( "mm", 1, 0, "SplittingMapTool" );
+  qmlRegisterType< MeasurementMapTool >( "mm", 1, 0, "MeasurementMapTool" );
 }
 
 void addQmlImportPath( QQmlEngine &engine )

app/maptools/abstractmaptool.cpp

@@ -26,6 +26,10 @@ void AbstractMapTool::setMapSettings( InputMapSettings *newMapSettings )
 {
   if ( mMapSettings == newMapSettings )
     return;
+
+  emit onAboutToChangeMapSettings();
+
   mMapSettings = newMapSettings;
+
   emit mapSettingsChanged( mMapSettings );
 }

app/maptools/abstractmaptool.h

@@ -30,11 +30,10 @@ class AbstractMapTool : public QObject
     void setMapSettings( InputMapSettings *newMapSettings );
 
   signals:
-
+    void onAboutToChangeMapSettings();
     void mapSettingsChanged( InputMapSettings *mapSettings );
 
   private:
-
     InputMapSettings *mMapSettings = nullptr;
 };