AllThePlaces quests

CONTRIBUTING.md

@@ -139,6 +139,7 @@ Materials in [`res/documentation`](res/documentation) also may be useful, it inc
 * [sc-photo-service](https://github.com/streetcomplete/sc-photo-service) by [@exploide](https://github.com/exploide) allows StreetComplete to upload photos associated with OSM Notes
 * [sc-statistics-service](https://github.com/streetcomplete/sc-statistics-service) by [@westnordost](https://github.com/westnordost) aggregates and provides StreetComplete-related statistics about users.
 * [StreetComplete-taginfo-categorize](https://github.com/mnalis/StreetComplete-taginfo-categorize) by [@mnalis](https://github.com/mnalis) generates tags listed in [KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED](https://github.com/streetcomplete/StreetComplete/blob/master/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt#L244)
+* [All The Places <-> OpenStreetMap matcher](https://codeberg.org/matkoniecz/list_how_openstreetmap_can_be_improved_with_alltheplaces_data#all-the-places-openstreetmap-matcher) - for comparison between OpenStreetMap and All The Places. Produced dataset is listed at [this website](https://matkoniecz.codeberg.page/improving_openstreetmap_using_alltheplaces_dataset/) and powers quests that detect missing points of interests
 
 You may find more projects under [the StreetComplete tag](https://github.com/topics/streetcomplete) on GitHub.
 

README.md

@@ -50,10 +50,11 @@ This software is released under the terms of the [GNU General Public License](ht
 ## Sponsors
 
 <a href="https://nlnet.nl/discovery/"><img src=".github/images/logo_nlnet.svg" alt="nlnet" height="100"/></a><br/>
-The **NLnet foundation** sponsored development on this app in four individual grants with funds from the European Commission:<br/>
+The **NLnet foundation** sponsored development on this app in five individual grants with funds from the European Commission:<br/>
 - A grant from <a href="https://nlnet.nl/project/StreetComplete-multiplatform/">2025</a> will allow Tobias Zwick to finish migrating the app to a multiplatform, so that it runs also on iOS (see <a href="https://github.com/streetcomplete/StreetComplete/issues/5421">ticket</a>)
 - In <a href="https://nlnet.nl/project/StreetComplete-Together/">2021</a>, a grant enabled Tobias Zwick to work about five months on the app - most notably, implement the overlays functionality and measuring with AR.
 - In <a href="https://www.openstreetmap.org/user/Mateusz%20Konieczny/diary/368849">2019</a> and <a href="https://www.openstreetmap.org/user/Mateusz%20Konieczny/diary/397825">2021</a>, Mateusz Konieczny each got a grant to work on StreetComplete with a focus on improvements on UI and data collection
+- In 2025, Mateusz Konieczny got a grant to work on [attempt to use All The Places dataset](https://github.com/streetcomplete/StreetComplete/pull/6302) within StreetComplete
 <br/>
 
 <a href="https://github.com/sponsors/westnordost"><picture><source media="(prefers-color-scheme: dark)" srcset=".github/images/logo_github_dark.svg"><img alt="GitHub Sponsors" width="80" src=".github/images/logo_github.svg"></picture></a> <a href="https://liberapay.com/westnordost"><img src=".github/images/logo_liberapay.svg" alt="Liberapay" width="80"/></a> <a href="https://www.patreon.com/westnordost"><picture><source media="(prefers-color-scheme: dark)" srcset=".github/images/logo_patreon_dark.svg"><img alt="Patreon" width="80" src=".github/images/logo_patreon.svg"></picture></a><br/>

app/src/androidInstrumentedTest/kotlin/de/westnordost/streetcomplete/data/atp/AtpDaoTest.kt

@@ -0,0 +1,124 @@
+package de.westnordost.streetcomplete.data.atp
+
+import de.westnordost.streetcomplete.data.ApplicationDbTestCase
+import de.westnordost.streetcomplete.data.osm.mapdata.BoundingBox
+import de.westnordost.streetcomplete.data.osm.mapdata.Element
+import de.westnordost.streetcomplete.data.osm.mapdata.ElementKey
+import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.NODE
+import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.WAY
+import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.RELATION
+import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
+import de.westnordost.streetcomplete.util.ktx.containsExactlyInAnyOrder
+import de.westnordost.streetcomplete.util.ktx.nowAsEpochMilliseconds
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class AtpDaoTest : ApplicationDbTestCase() {
+    private lateinit var dao: AtpDao
+
+    @BeforeTest fun createDao() {
+        dao = AtpDao(database)
+    }
+
+    @Test fun putGet() {
+        val entry = createAtpEntry()
+
+        dao.put(entry)
+        val dbAtp = dao.get(entry.id)!!
+        assertEquals(entry, dbAtp)
+    }
+
+    @Test fun putAll() {
+        dao.putAll(listOf(createAtpEntry(1), createAtpEntry(2)))
+        assertNotNull(dao.get(1))
+        assertNotNull(dao.get(2))
+    }
+
+
+    @Test fun deleteButNothingIsThere() {
+        assertFalse(dao.delete(1))
+    }
+
+    @Test fun delete() {
+        val entry = createAtpEntry()
+        dao.put(entry)
+        assertTrue(dao.delete(entry.id))
+        assertNull(dao.get(entry.id))
+        assertFalse(dao.delete(entry.id))
+    }
+
+    @Test fun getAllPositions() {
+        val thisIsIn = createAtpEntry(1, LatLon(0.5, 0.5))
+        val thisIsOut = createAtpEntry(2, LatLon(-0.5, 0.5))
+        dao.putAll(listOf(thisIsIn, thisIsOut))
+
+        val positions = dao.getAllPositions(BoundingBox(0.0, 0.0, 1.0, 1.0))
+        assertEquals(LatLon(0.5, 0.5), positions.single())
+    }
+
+    @Test fun getAllByBbox() {
+        val thisIsIn = createAtpEntry(1, LatLon(0.5, 0.5))
+        val thisIsOut = createAtpEntry(2, LatLon(-0.5, 0.5))
+        dao.putAll(listOf(thisIsIn, thisIsOut))
+
+        val entries = dao.getAll(BoundingBox(0.0, 0.0, 1.0, 1.0))
+        assertEquals(thisIsIn, entries.single())
+    }
+
+    @Test fun getAllByIds() {
+        val first = createAtpEntry(1)
+        val second = createAtpEntry(2)
+        val third = createAtpEntry(3)
+        dao.putAll(listOf(first, second, third))
+
+        assertEquals(listOf(first, second), dao.getAll(listOf(1, 2)))
+    }
+
+    @Test fun deleteAllByIds() {
+        dao.putAll(listOf(createAtpEntry(1), createAtpEntry(2), createAtpEntry(3)))
+
+        assertEquals(2, dao.deleteAll(listOf(1, 2)))
+        assertNull(dao.get(1))
+        assertNull(dao.get(2))
+        assertNotNull(dao.get(3))
+    }
+
+    @Test fun getUnusedAndOldIds() {
+        dao.putAll(listOf(createAtpEntry(1), createAtpEntry(2), createAtpEntry(3)))
+        val unusedIds = dao.getIdsOlderThan(nowAsEpochMilliseconds() + 10)
+        assertTrue(unusedIds.containsExactlyInAnyOrder(listOf(1L, 2L, 3L)))
+    }
+
+    @Test fun getUnusedAndOldIdsButAtMostX() {
+        dao.putAll(listOf(createAtpEntry(1), createAtpEntry(2), createAtpEntry(3)))
+        val unusedIds = dao.getIdsOlderThan(nowAsEpochMilliseconds() + 10, 2)
+        assertEquals(2, unusedIds.size)
+    }
+
+    @Test fun clear() {
+        dao.putAll(listOf(createAtpEntry(1), createAtpEntry(2), createAtpEntry(3)))
+        dao.clear()
+        assertTrue(dao.getAll(listOf(1L, 2L, 3L)).isEmpty())
+    }
+}
+
+private fun createAtpEntry(
+    id: Long = 5,
+    position: LatLon = LatLon(1.0, 1.0),
+    osmMatch: ElementKey = ElementKey(NODE, 1),
+    tagsInATP: Map<String, String> = mapOf(),
+    tagsInOSM: Map<String, String> = mapOf(),
+    reportType: ReportType = ReportType.OPENING_HOURS_REPORTED_AS_OUTDATED_IN_OPENSTREETMAP,
+) = AtpEntry(
+        position = position,
+        id = id,
+        osmMatch = osmMatch,
+        tagsInATP = tagsInATP,
+        tagsInOSM = tagsInOSM,
+        reportType = reportType,
+    )

app/src/androidInstrumentedTest/kotlin/de/westnordost/streetcomplete/data/atp/atpquests/AtpQuestsHiddenDaoTest.kt

@@ -0,0 +1,63 @@
+package de.westnordost.streetcomplete.data.atp.atpquests
+
+import de.westnordost.streetcomplete.data.ApplicationDbTestCase
+import de.westnordost.streetcomplete.util.ktx.nowAsEpochMilliseconds
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class AtpQuestsHiddenDaoTest : ApplicationDbTestCase() {
+    private lateinit var dao: AtpQuestsHiddenDao
+
+    @BeforeTest fun createDao() {
+        dao = AtpQuestsHiddenDao(database)
+    }
+
+    @Test fun addGetDelete() {
+        assertFalse(dao.delete(123L))
+        dao.add(123L)
+        assertNotNull(dao.getTimestamp(123L))
+        assertTrue(dao.delete(123L))
+        assertFalse(dao.delete(123L))
+        assertNull(dao.getTimestamp(123L))
+    }
+
+    @Test fun getAll() {
+        dao.add(1L)
+        dao.add(2L)
+        assertEquals(
+            setOf(1L, 2L),
+            dao.getAll().map { it.allThePlacesEntryId }.toSet()
+        )
+    }
+
+    @Test fun getNewerThan() = runBlocking {
+        dao.add(1L)
+        delay(200)
+        val time = nowAsEpochMilliseconds()
+        dao.add(2L)
+        val result = dao.getNewerThan(time - 100).single()
+        assertEquals(2L, result.allThePlacesEntryId)
+    }
+
+    @Test fun deleteAll() {
+        assertEquals(0, dao.deleteAll())
+        dao.add(1L)
+        dao.add(2L)
+        assertEquals(2, dao.deleteAll())
+        assertNull(dao.getTimestamp(1L))
+        assertNull(dao.getTimestamp(2L))
+    }
+
+    @Test fun countAll() {
+        assertEquals(0, dao.countAll())
+        dao.add(3L)
+        assertEquals(1, dao.countAll())
+    }
+}

app/src/androidMain/kotlin/de/westnordost/streetcomplete/StreetCompleteApplication.kt

@@ -14,6 +14,9 @@ import de.westnordost.streetcomplete.data.CacheTrimmer
 import de.westnordost.streetcomplete.data.CleanerWorker
 import de.westnordost.streetcomplete.data.Preloader
 import de.westnordost.streetcomplete.data.allEditTypesModule
+import de.westnordost.streetcomplete.data.atp.atpEditsModule
+import de.westnordost.streetcomplete.data.atp.atpModule
+import de.westnordost.streetcomplete.data.atp.atpquests.atpQuestModule
 import de.westnordost.streetcomplete.data.download.downloadModule
 import de.westnordost.streetcomplete.data.download.tiles.DownloadedTilesController
 import de.westnordost.streetcomplete.data.edithistory.EditHistoryController
@@ -120,6 +123,9 @@ class StreetCompleteApplication : Application() {
                 messagesModule,
                 osmApiModule,
                 osmNoteQuestModule,
+                atpEditsModule,
+                atpModule,
+                atpQuestModule,
                 osmQuestModule,
                 preferencesModule,
                 questModule,

app/src/androidMain/kotlin/de/westnordost/streetcomplete/data/quest/QuestModule.kt

@@ -4,5 +4,5 @@ import org.koin.dsl.module
 
 val questModule = module {
     single { QuestAutoSyncer(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
-    single { VisibleQuestsSource(get(), get(), get(), get(), get(), get(), get()) }
+    single { VisibleQuestsSource(get(), get(), get(), get(), get(), get(), get(), get()) }
 }

app/src/androidMain/kotlin/de/westnordost/streetcomplete/data/quest/atp/AtpCreateForm.kt

@@ -0,0 +1,153 @@
+package de.westnordost.streetcomplete.data.quest.atp
+
+import android.location.Location
+import android.os.Bundle
+import android.view.View
+import androidx.core.os.bundleOf
+import de.westnordost.osmfeatures.FeatureDictionary
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.data.atp.AtpEntry
+import de.westnordost.streetcomplete.data.location.SurveyChecker
+import de.westnordost.streetcomplete.data.osm.edits.AddElementEditsController
+import de.westnordost.streetcomplete.data.osm.edits.ElementEditAction
+import de.westnordost.streetcomplete.data.osm.edits.ElementEditType
+import de.westnordost.streetcomplete.data.osm.edits.ElementEditsController
+import de.westnordost.streetcomplete.data.osm.edits.create.CreateNodeAction
+import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
+import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
+import de.westnordost.streetcomplete.data.osm.mapdata.Node
+import de.westnordost.streetcomplete.data.quest.QuestKey
+import de.westnordost.streetcomplete.data.visiblequests.HideQuestController
+import de.westnordost.streetcomplete.data.visiblequests.QuestsHiddenController
+import de.westnordost.streetcomplete.quests.AbstractQuestForm
+import de.westnordost.streetcomplete.quests.AnswerItem
+import de.westnordost.streetcomplete.util.getNameAndLocationSpanned
+import de.westnordost.streetcomplete.util.ktx.viewLifecycleScope
+import de.westnordost.streetcomplete.view.confirmIsSurvey
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
+import kotlin.getValue
+
+class AtpCreateForm : AbstractQuestForm() {
+    private val hiddenQuestsController: QuestsHiddenController by inject()
+    private val featureDictionaryLazy: Lazy<FeatureDictionary> by inject(named("FeatureDictionaryLazy"))
+    private val elementEditsController: ElementEditsController by inject()
+    private val surveyChecker: SurveyChecker by inject()
+
+    private lateinit var entry: AtpEntry private set
+    private val featureDictionary: FeatureDictionary get() = featureDictionaryLazy.value
+    var hideQuestController: HideQuestController = hiddenQuestsController
+    var selectedLocation: LatLon? = null
+    var addElementEditsController: AddElementEditsController = elementEditsController
+
+    override fun onClickMapAt(position: LatLon, clickAreaSizeInMeters: Double): Boolean {
+        selectedLocation = position
+        checkIsFormComplete()
+        return true
+    }
+
+    override fun onClickOk() {
+        if(selectedLocation == null) {
+            return
+        } else {
+            viewLifecycleScope.launch { // viewLifecycleScope is here via cargo cult - what it is doing and is it needed TODO
+                applyEdit(CreateNodeAction(selectedLocation!!, entry.tagsInATP))
+            }
+        }
+    }
+
+    protected fun applyEdit(answer: ElementEditAction, geometry: ElementGeometry = this.geometry) {
+        viewLifecycleScope.launch {
+            solve(answer, geometry)
+        }
+    }
+
+    private suspend fun solve(action: ElementEditAction, geometry: ElementGeometry) {
+        setLocked(true)
+        val isSurvey = surveyChecker.checkIsSurvey(geometry)
+        if (!isSurvey && !confirmIsSurvey(requireContext())) {
+            setLocked(false)
+            return
+        }
+
+        withContext(Dispatchers.IO) {
+            addElementEditsController.add(CreatePoiBasedOnAtp, geometry, "survey", action, isSurvey)
+        }
+        listener?.onEdited(CreatePoiBasedOnAtp, geometry)
+    }
+    override fun isFormComplete(): Boolean {
+        return selectedLocation != null
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val args = requireArguments()
+        entry = Json.decodeFromString(args.getString(ATP_ENTRY)!!)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // TODO: maybe should be more prominent?
+        setTitleHintLabel(getNameAndLocationSpanned(Node(
+            1,
+            position = entry.position,
+            tags = entry.tagsInATP,
+            version = 1,
+            timestampEdited = 1,
+        ), resources, featureDictionary))
+    }
+
+    override fun onStart() {
+        super.onStart()
+        updateButtonPanel()
+    }
+
+    protected fun updateButtonPanel() {
+        // TODO: create answers to send to API, not just hide quests
+        val mappedAlready = AnswerItem(R.string.quest_atp_add_missing_poi_mapped_already) { /*applyAnswer(false)*/ hideQuest() }
+        val missing = AnswerItem(R.string.quest_atp_add_missing_poi_does_not_exist) { /*applyAnswer(true)*/ hideQuest() }
+        val cantSay = AnswerItem(R.string.quest_generic_answer_notApplicable) { hideQuest() /* no option to leave note */ }
+
+        setButtonPanelAnswers(listOf(mappedAlready, missing, cantSay))
+    }
+
+    interface Listener {
+        /** The GPS position at which the user is displayed at */
+        val displayedMapLocation: Location?
+
+        /** Called when the user successfully answered the quest */
+        fun onEdited(editType: ElementEditType, geometry: ElementGeometry)
+
+        /** Called when the user successfully answered the quest */
+        // TODO actually use that (or remove, if not needed)
+        fun onRejectedAtpEntry(editType: ElementEditType, geometry: ElementGeometry)
+
+        /** Called when the user chose to move the node */
+        fun onMoveNode(editType: ElementEditType, node: Node)
+
+        /** Called when the user chose to hide the quest instead */
+        fun onQuestHidden(questKey: QuestKey)
+    }
+    private val listener: Listener? get() = parentFragment as? Listener ?: activity as? Listener
+
+    protected fun hideQuest() {
+        viewLifecycleScope.launch {
+            withContext(Dispatchers.IO) { hideQuestController.hide(questKey) }
+            listener?.onQuestHidden(questKey)
+        }
+    }
+
+    companion object {
+        private const val ATP_ENTRY = "atp_entry"
+
+        fun createArguments(entry: AtpEntry) = bundleOf(
+            ATP_ENTRY to Json.encodeToString(entry)
+        )
+    }
+}