Reintroduction of centering to GPS when starting to record new feature (

#3509)
MerginMaps · Jun 19, 2024 · eb2b626 · eb2b626 · inputapp-bot · Jun 19, 2024
1 parent 55b8aef
commit eb2b626
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 31 deletions.
diff --git a/app/appsettings.cpp b/app/appsettings.cpp
@@ -31,6 +31,7 @@ AppSettings::AppSettings( QObject *parent ): QObject( parent )
   bool autosync = settings.value( QStringLiteral( "autosyncAllowed" ), false ).toBool();
   double gpsHeight = settings.value( "gpsHeight", 0 ).toDouble();
   QString ignoreMigrateVersion = settings.value( QStringLiteral( "ignoreMigrateVersion" ) ).toString();
+  bool autolockPosition = settings.value( QStringLiteral( "autolockPosition" ), true ).toBool();
 
   settings.endGroup();
 
@@ -46,6 +47,7 @@ AppSettings::AppSettings( QObject *parent ): QObject( parent )
   setAutosyncAllowed( autosync );
   setGpsAntennaHeight( gpsHeight );
   setIgnoreMigrateVersion( ignoreMigrateVersion );
+  setAutolockPosition( autolockPosition );
 }
 
 QString AppSettings::defaultLayer() const
@@ -279,6 +281,21 @@ void AppSettings::setAutosyncAllowed( bool newAutosyncAllowed )
   emit autosyncAllowedChanged( mAutosyncAllowed );
 }
 
+bool AppSettings::autolockPosition() const
+{
+  return mAutolockPosition;
+}
+
+void AppSettings::setAutolockPosition( bool autolockPosition )
+{
+  if ( mAutolockPosition == autolockPosition )
+    return;
+
+  mAutolockPosition = autolockPosition;
+  setValue( QStringLiteral( "autolockPosition" ), autolockPosition );
+  emit autolockPositionChanged( mAutolockPosition );
+}
+
 double AppSettings::gpsAntennaHeight() const
 {
   return mGpsAntennaHeight;

diff --git a/app/appsettings.h b/app/appsettings.h
@@ -34,6 +34,7 @@ class AppSettings: public QObject
     Q_PROPERTY( bool autosyncAllowed READ autosyncAllowed WRITE setAutosyncAllowed NOTIFY autosyncAllowedChanged )
     Q_PROPERTY( double gpsAntennaHeight READ gpsAntennaHeight WRITE setGpsAntennaHeight NOTIFY gpsAntennaHeightChanged )
     Q_PROPERTY( QString ignoreMigrateVersion READ ignoreMigrateVersion WRITE setIgnoreMigrateVersion NOTIFY ignoreMigrateVersionChanged )
+    Q_PROPERTY( bool autolockPosition READ autolockPosition WRITE setAutolockPosition NOTIFY autolockPositionChanged )
 
   public:
     explicit AppSettings( QObject *parent = nullptr );
@@ -82,6 +83,9 @@ class AppSettings: public QObject
 
     static const QString POSITION_PROVIDERS_GROUP;
 
+    bool autolockPosition() const;
+    void setAutolockPosition( bool autolockPosition );
+
   public slots:
     void setReuseLastEnteredValues( bool reuseLastEnteredValues );
 
@@ -99,6 +103,7 @@ class AppSettings: public QObject
     void activePositionProviderIdChanged( const QString & );
 
     void autosyncAllowedChanged( bool autosyncAllowed );
+    void autolockPositionChanged( bool autolockPosition );
 
     void ignoreMigrateVersionChanged();
 
@@ -132,6 +137,7 @@ class AppSettings: public QObject
     QVariant value( const QString &key, const QVariant &defaultValue = QVariant() );
     QString mActivePositionProviderId;
     bool mAutosyncAllowed = false;
+    bool mAutolockPosition = true;
     double mGpsAntennaHeight = 0;
     QString mIgnoreMigrateVersion;
 };

diff --git a/app/qml/map/MMMapController.qml b/app/qml/map/MMMapController.qml
@@ -97,44 +97,53 @@ Item {
     updatePosition()
 
     switch ( state ) {
+      case "record": {
+        if ( __appSettings.autolockPosition ) { // center to GPS
+          if ( gpsStateGroup.state === "unavailable" ) {
+            __notificationModel.addError( "GPS currently unavailable." )
+          }
+          else {
+            root.centeredToGPS = true
+            updatePosition()
+          }
+        }
 
-    case "record": {
-      root.recordingStarted()
-      break
-    }
+        root.recordingStarted()
+        break
+      }
 
-    case "recordInLayer": {
-      root.recordInLayerFeatureStarted()
-      root.hideHighlight()
-      break
-    }
+      case "recordInLayer": {
+        root.recordInLayerFeatureStarted()
+        root.hideHighlight()
+        break
+      }
 
-    case "edit": {
-      root.editingGeometryStarted()
-      root.hideHighlight()
-      break
-    }
+      case "edit": {
+        root.editingGeometryStarted()
+        root.hideHighlight()
+        break
+      }
 
-    case "split": {
-      root.showInfoTextMessage( qsTr( "Create line to split the selected feature" ) )
-      root.splittingStarted()
-      break
-    }
+      case "split": {
+        root.showInfoTextMessage( qsTr( "Create line to split the selected feature" ) )
+        root.splittingStarted()
+        break
+      }
 
-    case "view": {
-      root.hideHighlight()
-      break
-    }
+      case "view": {
+        root.hideHighlight()
+        break
+      }
 
-    case "stakeout": {
-      root.hideHighlight()
-      root.stakeoutStarted( internal.stakeoutTarget )
-      break
-    }
+      case "stakeout": {
+        root.hideHighlight()
+        root.stakeoutStarted( internal.stakeoutTarget )
+        break
+      }
 
-    case "inactive": {
-      break
-    }
+      case "inactive": {
+        break
+      }
     }
   }
 

diff --git a/app/qml/settings/MMSettingsPage.qml b/app/qml/settings/MMSettingsPage.qml
@@ -172,6 +172,17 @@ MMPage {
         onClicked: __appSettings.autosyncAllowed = !checked
       }
 
+      MMLine {}
+
+      MMSettingsComponents.MMSettingsSwitch {
+        width: parent.width
+        title: qsTr("Auto-lock position")
+        description: qsTr("Each time you start recording, the app centers to GPS")
+        checked: __appSettings.autolockPosition
+
+        onClicked: __appSettings.autolockPosition = !checked
+      }
+
       Item { width: 1; height: 1 }
 
       Text {