Check note state online before asking whether to close notes

Fixes #25
kmpoppe · Apr 15, 2023 · 9664258 · 9664258
1 parent 771f7a2
commit 9664258
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/notesolver/src/main/java/org/openstreetmap/josm/plugins/notesolver/NoteSolverPlugin.java b/notesolver/src/main/java/org/openstreetmap/josm/plugins/notesolver/NoteSolverPlugin.java
@@ -84,9 +84,19 @@ public NoteSolverPlugin(final PluginInformation info) {
 		@Override
 		public boolean checkUpload(APIDataSet apiDataSet) {
 			boolean returnValue = true;
+			MainApplication.getLayerManager().getEditDataSet().getChangeSetTags().remove("closed:note");
+			// check online status before asking whether to close notes
 			if (rememberedNotes != null && rememberedNotes.size() > 0) {
+				for (Note note : rememberedNotes) {
+					String cOnlineStatus = getOnlineNoteStatus(note.getId());
+					if (note.getState() == State.CLOSED || cOnlineStatus.toLowerCase().trim().equals("closed")) {
+						solvedNotes.add(note);
+					}
+				}
 				for (Note note : solvedNotes)
 					if (rememberedNotes.containsNote(note)) rememberedNotes.remove(note);
+			}
+			if (rememberedNotes != null && rememberedNotes.size() > 0) {
 
 				StringBuilder noteList = new StringBuilder();
 				rememberedNotes.forEach((n) -> noteList.append("\n" + NoteText.noteShortText(n)));
@@ -120,7 +130,13 @@ public boolean checkUpload(APIDataSet apiDataSet) {
 						}
 						MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", "noteSolver_plugin/" + myPluginInformation.version);
 						MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("comment", comment);
-						MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("closed:note", closedNoteTag);
+						if (closedNoteTag == "")
+						{
+							MainApplication.getLayerManager().getEditDataSet().getChangeSetTags().remove("closed:note");
+						} else 
+						{
+							MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("closed:note", closedNoteTag);
+						}
 					}
 					returnValue = true;
 				}