Move positioning activation around to allow for project load tracker …

…launch
opengisch · Feb 29, 2024 · 2f2f1ae · 2f2f1ae
1 parent 2914c9b
commit 2f2f1ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/core/trackingmodel.cpp b/src/core/trackingmodel.cpp
@@ -264,13 +264,15 @@ void TrackingModel::createProjectTrackers( QgsProject *project )
         const bool sensorDataRequirementActive = layer->customProperty( "QFieldSync/tracking_sensor_data_requirement_active", false ).toBool();
         const bool allRequirementsActive = layer->customProperty( "QFieldSync/tracking_all_requirements_active", false ).toBool();
         const bool erroneousDistanceSafeguardActive = layer->customProperty( "QFieldSync/tracking_erroneous_distance_safeguard_active", false ).toBool();
+        const bool erroneousDistanceSafeguardMaximumMeters = layer->customProperty( "QFieldSync/tracking_erroneous_distance_safeguard_maximum_meters", 250 ).toInt();
         const int measurementType = layer->customProperty( "QFieldSync/tracking_measurement_type", false ).toInt();
 
         Tracker *tracker = new Tracker( vl );
         tracker->setTimeInterval( timeRequirementActive ? timeRequirementIntervalSeconds : 0 );
         tracker->setMinimumDistance( distanceRequirementActive ? distanceRequirementMinimumMeters : 0 );
         tracker->setSensorCapture( sensorDataRequirementActive );
         tracker->setConjunction( allRequirementsActive );
+        tracker->setMaximumDistance( erroneousDistanceSafeguardActive ? erroneousDistanceSafeguardMaximumMeters : 0 );
         tracker->setMeasureType( static_cast<Tracker::MeasureType>( measurementType ) );
 
         QgsExpressionContext context = vl->createExpressionContext();

diff --git a/src/qml/LayerTreeItemProperties.qml b/src/qml/LayerTreeItemProperties.qml
@@ -304,10 +304,6 @@ Popup {
               trackingModel.stopTracker(layer);
               displayToast(qsTr('Track on layer %1 stopped').arg(layer.name))
             } else {
-              if (!positionSource.active) {
-                positioningSettings.positioningActivated = true
-              }
-
               var tracker;
               var idx = projectInfo.restoreTracker(layer)
               if (idx.valid) {

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -591,6 +591,15 @@ ApplicationWindow {
         id: trackings
         model: trackingModel
 
+        onCountChanged: {
+          if (count > 0) {
+            // Start positioning if not yet active
+            if (!positionSource.active) {
+              positioningSettings.positioningActivated = true
+            }
+          }
+        }
+
         TrackingSession {}
     }