on updating a key with check date, also update the general check date…

… if there is one (fixes #5674)

app/src/main/java/de/westnordost/streetcomplete/osm/ResurveyUtils.kt

@@ -61,6 +61,7 @@ fun Tags.updateCheckDateForKey(key: String) {
 fun Tags.setCheckDateForKey(key: String, date: LocalDate) {
     removeCheckDatesForKey(key)
     set("$SURVEY_MARK_KEY:$key", date.toCheckDateString())
+    if (hasCheckDate()) setCheckDate(date)
 }
 
 /** Return whether a check date is set for the given key */
@@ -75,8 +76,12 @@ fun Tags.removeCheckDatesForKey(key: String) {
 /** Set/update solely the check date for the entire item to today, this also removes other less
  *  preferred check date keys for the entire item. */
 fun Tags.updateCheckDate() {
+    setCheckDate(systemTimeNow().toLocalDate())
+}
+
+fun Tags.setCheckDate(date: LocalDate) {
     removeCheckDates()
-    set(SURVEY_MARK_KEY, nowAsCheckDateString())
+    set(SURVEY_MARK_KEY, date.toCheckDateString())
 }
 
 /** Return whether any check dates are set */

app/src/test/java/de/westnordost/streetcomplete/data/meta/ResurveyUtilsTest.kt

@@ -84,6 +84,20 @@ class ResurveyUtilsTest {
         ), changes)
     }
 
+    @Test fun `updateWithCheckDate updates general check date`() {
+        val builder = Tags(mapOf("key" to "value", "survey:date" to "1999-01-01"))
+        builder.updateWithCheckDate("key", "value")
+        val changes = builder.create().changes
+
+        assertEquals(setOf(
+            StringMapEntryModify("key", "value", "value"),
+            StringMapEntryAdd("check_date:key", nowAsCheckDateString()),
+            StringMapEntryDelete("survey:date", "1999-01-01"),
+            StringMapEntryAdd("check_date", nowAsCheckDateString()),
+        ), changes)
+    }
+
+
     @Test fun `updateWithCheckDate modifies old check date on modifying key`() {
         val builder = Tags(mapOf(
             "key" to "old value",