Merge branch 'master' of https://github.com/streetcomplete/StreetComp…

…lete
streetcomplete · Sep 25, 2023 · 34e000b · 34e000b
2 parents 7195781 + 9390586
commit 34e000b
Show file tree

Hide file tree

Showing 4 changed files with 366 additions and 375 deletions.
diff --git a/.github/workflows/generate-quest-list.yml b/.github/workflows/generate-quest-list.yml
@@ -10,12 +10,12 @@ jobs:
     name: Generate quest list
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: set up JDK 11
+      - uses: actions/checkout@v4
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt
@@ -134,5 +134,5 @@ abstract class AGroupedImageListQuestForm<I, T> : AbstractOsmQuestForm<T>() {
 
     abstract fun onClickOk(value: I)
 
-    override fun isFormComplete() = selectedItem != null
+    override fun isFormComplete() = selectedItem?.value != null
 }
diff --git a/...a/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt b/...a/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt
@@ -12,7 +12,7 @@ import de.westnordost.streetcomplete.screens.main.map.tangram.toLngLat
 class DownloadedAreaMapComponent(private val ctrl: KtMapController) {
     private var layer: MapData? = null
 
-    fun set(tiles: Collection<TilePos>) {
+    fun set(tiles: Collection<TilePos>) = synchronized(this) {
         // tangram does not clear a layer properly on re-setting features on it, so let's remove
         // and re-add the whole layer
         layer?.remove()