crash fixes, new version

mnalis · Nov 29, 2023 · a9784f5 · a9784f5
1 parent 5922b94
commit a9784f5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -34,8 +34,8 @@ android {
         applicationId = "de.westnordost.streetcomplete.expert"
         minSdk = 21
         targetSdk = 33
-        versionCode = 5501
-        versionName = "55.1"
+        versionCode = 5502
+        versionName = "55.11"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/MapDataWithEditsSource.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/MapDataWithEditsSource.kt
@@ -495,6 +495,8 @@ class MapDataWithEditsSource internal constructor(
         }
         return sequence {
             val waysContainingNode = getWaysForNode(movedNode.id)
+            if (waysContainingNode.any { getWayComplete(it.id) == null })
+                return@sequence // maybe this helps?
             val relationsContainingNode = getRelationsForNode(movedNode.id)
             val relationsContainingWayContainingNode = waysContainingNode.flatMap { getRelationsForWay(it.id) }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmQuestController.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmQuestController.kt
@@ -88,7 +88,7 @@ class OsmQuestController internal constructor(
     // must be valid names!
     // todo: use actual class names, or better re-evaluate whether this is worth it and maybe invert to blacklist
     private val questsRequiringElementsWithoutTags = hashSetOf("AddBarrierOnRoad", "AddBarrierOnPath", "AddCrossing",
-        "AddMaxHeight", "AddEntrance", "AddEntranceReference", "AddHousenumber", "AddDestination", "AddPisteDifficulty", "AddPisteRef")
+        "AddMaxHeight", "AddEntrance", "AddEntranceReference", "AddHousenumber", "AddDestination", "AddPisteDifficulty", "AddPisteRef", "AddPisteLit")
 
     private val hiddenCache by lazy { synchronized(this) { hiddenDB.getAllIds().toHashSet() } }
 

diff --git a/...src/main/java/de/westnordost/streetcomplete/quests/piste_difficulty/AddPisteDifficulty.kt b/...src/main/java/de/westnordost/streetcomplete/quests/piste_difficulty/AddPisteDifficulty.kt
@@ -22,7 +22,7 @@ class AddPisteDifficulty : OsmFilterQuestType<PisteDifficulty>() {
     override val defaultDisabledMessage: Int = R.string.default_disabled_msg_ee
 
     override fun getApplicableElements(mapData: MapDataWithGeometry): Iterable<Element> {
-        return if (isWinter(mapData.nodes.first().position)) mapData.filter(filter).asIterable()
+        return if (isWinter(mapData.nodes.firstOrNull()?.position)) mapData.filter(filter).asIterable()
             else emptyList()
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/piste_lit/AddPisteLit.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/piste_lit/AddPisteLit.kt
@@ -29,7 +29,7 @@ class AddPisteLit : OsmFilterQuestType<Boolean>() {
     override val defaultDisabledMessage = R.string.default_disabled_msg_ee
 
     override fun getApplicableElements(mapData: MapDataWithGeometry): Iterable<Element> {
-        return if (isWinter(mapData.nodes.first().position)) mapData.filter(filter).asIterable()
+        return if (isWinter(mapData.nodes.firstOrNull()?.position)) mapData.filter(filter).asIterable()
         else emptyList()
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/piste_ref/AddPisteRef.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/piste_ref/AddPisteRef.kt
@@ -23,7 +23,7 @@ class AddPisteRef : OsmFilterQuestType<PisteRefAnswer>() {
     override val defaultDisabledMessage = R.string.default_disabled_msg_ee
 
     override fun getApplicableElements(mapData: MapDataWithGeometry): Iterable<Element> {
-        return if (isWinter(mapData.nodes.first().position)) mapData.filter(filter).asIterable()
+        return if (isWinter(mapData.nodes.firstOrNull()?.position)) mapData.filter(filter).asIterable()
             else emptyList()
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/util/Winter.kt b/app/src/main/java/de/westnordost/streetcomplete/util/Winter.kt
@@ -5,7 +5,8 @@ import de.westnordost.streetcomplete.util.ktx.systemTimeNow
 import de.westnordost.streetcomplete.util.ktx.toLocalDate
 import java.time.Month.*
 
-fun isWinter(location: LatLon): Boolean {
+fun isWinter(location: LatLon?): Boolean {
+    if (location == null) return false
     val now = systemTimeNow().toLocalDate()
     val winterSeason = if (location.latitude > 0)
         listOf(NOVEMBER, DECEMBER, JANUARY, FEBRUARY, MARCH, APRIL)