Repository navigation
Conversation
Coverage Report for CI Build 37486743244Coverage increased (+0.1%) to 59.659%Details
Uncovered ChangesNo uncovered changes found. Coverage Regressions625 previously-covered lines in 8 files lost coverage.
Coverage Stats
💛 - Coveralls |
📦 Build Artifacts Ready
|
Withalion
reviewed
Aug 20, 2026
Withalion
left a comment
Withalion
left a comment
Collaborator
There was a problem hiding this comment.
Great job, it looks very promising! There are some trivial things, a bit more refactoring is needed, but mainly unit tests.
UI/UX
- It would be nice to navigate to the geometry you will be recording further after you open the draft
- After user is done recording geometry and doesn't fill out anything in the form yet, application crashes. We should open the form right away and not the geometry recording
- When a draft is available and an existing feature is clicked to edit the warning drawer opens and closes right away
- When a draft is available and "add" button is clicked, the drawer opens correctly, but discarding draft doesn't start recording mode, but stays in "view" mode of map
Withalion
reviewed
Aug 20, 2026
Withalion
left a comment
Withalion
left a comment
Collaborator
There was a problem hiding this comment.
Great job, it looks very promising! There are some trivial things, a bit more refactoring is needed, but mainly unit tests.
UI/UX
- It would be nice to navigate to the geometry you will be recording further after you open the draft
- After user is done recording geometry and doesn't fill out anything in the form yet, application crashes. We should open the form right away and not the geometry recording
- When a draft is available and an existing feature is clicked to edit the warning drawer opens and closes right away
- When a draft is available and "add" button is clicked, the drawer opens correctly, but discarding draft doesn't start recording mode, but stays in "view" mode of map
xkello
force-pushed
the
feature/feature-drafts
branch
from
September 23, 2026 16:00
b242e2a to
d02dcfb
Compare
📦 Build Artifacts Ready
|
tomasMizera
requested changes
Sep 29, 2026
tomasMizera
left a comment
tomasMizera
left a comment
Collaborator
There was a problem hiding this comment.
Nice! :)
When testing, let's try it out on some low-end devices to see if the 1 second interval is not causing too much slowness in UI. If so, we might need to move the saving part to another thread.
In general, this is going in a very good direction, I believe we will have this ready for testing soon.
Comment on lines
+48
to
+51
| connect( this, &RecordingMapTool::recordedGeometryChanged, this, [ this ]() | ||
| { | ||
| mDraftSaveTimer->start(); | ||
| } ); |
Collaborator
There was a problem hiding this comment.
The signal sounds good to me too for now.
|
|
||
| void FeatureDraftController::checkForDraft() | ||
| { | ||
| const QString projectId = QgsProject::instance()->homePath(); |
Collaborator
There was a problem hiding this comment.
This one's not resolved and I am +1 to use project IDs instead of homepath.
📦 Build Artifacts Ready
|
Contributor
Author
|
@Withalion everything should be resolved. |
📦 Build Artifacts Ready
|
📦 Build Artifacts Ready
|
Withalion
reviewed
Oct 14, 2026
Withalion
left a comment
Withalion
left a comment
Collaborator
There was a problem hiding this comment.
Few more comments after your changes. I'll let @tomasMizera have the final review
| bool isEmpty() const { return layerId.isEmpty(); } | ||
|
|
||
| // Whether this draft belongs to an existing feature being edited, rather than a new one being added | ||
| bool isExistingFeature() const { return !FID_IS_NULL( featureId ) && !FID_IS_NEW( featureId ); } |
Collaborator
There was a problem hiding this comment.
I would call here InputUtils::isFeatureIdValid()
Comment on lines
+51
to
+56
| enum DraftStage | ||
| { | ||
| GeometryCapture, | ||
| AttributeForm | ||
| }; | ||
| Q_ENUM( DraftStage ) |
Collaborator
There was a problem hiding this comment.
Keep this enum instead of FeatureDraft::Stage and if necessary reuse it in FeatureDraft. Also define the enum as enum class DraftStage
Comment on lines
+35
to
+36
| //! Name of the layer the pending draft belongs to (only meaningful when hasDraft is true) | ||
| Q_PROPERTY( QString draftLayerName READ draftLayerName NOTIFY hasDraftChanged ) |
Collaborator
There was a problem hiding this comment.
is it necessary to expose it separately to the layer object? draftLayer.name should return the same value. Or is there some QML limitation?
We could as well expose the property, but internally just keep the reference to the layer instead of another object property.
| QString mDraftLayerName; | ||
| QgsVectorLayer *mDraftLayer = nullptr; // not owned | ||
| DraftStage mDraftStage = AttributeForm; | ||
| bool mDraftIsExistingFeature = false; |
Collaborator
There was a problem hiding this comment.
i would remove mDraftIsExistingFeature as well just query FeatureDraft for this info
Comment on lines
+231
to
+234
| FeatureDraftController::DraftStage FeatureDraftController::toQmlStage( FeatureDraft::Stage stage ) | ||
| { | ||
| return stage == FeatureDraft::GeometryCapture ? GeometryCapture : AttributeForm; | ||
| } |
Collaborator
There was a problem hiding this comment.
This smells you should not have to do it
| import QtQuick.Layouts | ||
|
|
||
| import "../../components" as MMComponents | ||
| import "." |
Collaborator
There was a problem hiding this comment.
"local" components should be available by default without this import
|
|
||
| property var project | ||
| property var featureLayerPair | ||
| property bool restoringDraft: false // see AttributeController.restoringDraft |
Collaborator
There was a problem hiding this comment.
this could be just alias then
Comment on lines
+35
to
+38
| // action to run after the draft is discarded: "record" or "addFeature" | ||
| property string pendingAction: "" | ||
| property var pendingActionLayer: null // layer for "addFeature" | ||
|
|
Collaborator
There was a problem hiding this comment.
I don't like this here and ApplicationWindow doesn't look like the right place for it. Let's hide it at least to internal QtObject or think about some other way.
| const pair = controller.loadDraft() | ||
|
|
||
| // the draft is no longer valid and was discarded | ||
| if ( !pair.layer ) { |
Collaborator
There was a problem hiding this comment.
Suggested change
| if ( !pair.layer ) { | |
| if ( !pair.valid ) { |
| qRegisterMetaType< FeatureLayerPair * >( "FeatureLayerPair*" ); | ||
| qRegisterMetaType< AttributeController * >( "AttributeController*" ); | ||
| qmlRegisterUncreatableType<NotificationType>( "mm", 1, 0, "NotificationType", "NotificationType Enum" ); | ||
| qmlRegisterUncreatableType<FeatureDraftController>( "mm", 1, 0, "FeatureDraftController", "FeatureDraftController Enum" ); |
Collaborator
There was a problem hiding this comment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Adds automatic recovery of in-progress feature edits. If the app closes unexpectedly while you're editing a feature - a crash, an incoming call, a dead battery - your unsaved geometry and attribute changes are no longer lost. On the next launch you're offered the chance to resume exactly where you left off, or discard the changes.
Fixes: #4585
What changed
FeatureDraftStorage/FeatureDraftController(app/drafts/) persist an in-progress edit (geometry + attributes) as a JSON blob viaQSettings, debounced by ~1s so it isn't written on every keystroke/vertex.AttributeControllerandRecordingMapToolwrite a draft whenever attributes or geometry are edited, and clear it once the feature is saved, deleted, or the edit is cancelled.ActiveProjectexposes the draft controller to QML.Behaviour
Screen_Recording_20260818-082140_One.UI.Home.mp4
Screen_Recording_20260818-082018_One.UI.Home.mp4
Screen_Recording_20260818-082039.mp4
TLDR @Withalion
Feature edits are now drafted automatically so a crash, call, or dead battery doesn't cost you your unsaved work - surfaced via a notification and resume/discard drawers.