make it compile

Helium314 · Jan 12, 2025 · fa39541 · fa39541
1 parent d4724a5
commit fa39541
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/...ain/java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestController.kt b/...ain/java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestController.kt
@@ -241,7 +241,7 @@ private fun Note.shouldShowAsQuest(
     if (
         (
             comments.last().isReplyFromUser(userId) ||
-            (probablyCreatedByUserInThisApp(userId) && !hasReplies)
+            (probablyCreatedByUserInThisApp(userId, !showOnlyNotesPhrasedAsQuestions) && !hasReplies)
         )
         && !comments.last().containsSurveyRequiredMarker()
     ) {

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainActivity.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainActivity.kt
@@ -10,6 +10,7 @@ import android.content.IntentFilter
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.graphics.Color
 import android.graphics.PointF
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/MapStyleCreator.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/MapStyleCreator.kt
@@ -576,21 +576,14 @@ fun createMapStyle(name: String, accessToken: String, languages: List<String>, c
         Layer("labels-housenumbers",
             src = "housenum_label",
             minZoom = 18.0,
-            paint = defaultTextStyle.copy(
-                text = "[\"get\", \"house_num\"]",
-                sortKey = "15",
-            )
+            paint = defaultTextStyle.copy(text = "[\"get\", \"house_num\"]")
         ),
 
         Layer("labels-road",
             src = "road",
             minZoom = 14.0,
             filter = listOf(isLines),
-            paint = defaultTextStyle.copy(
-                wrap = 25,
-                placement = "line-center",
-                sortKey = "10",
-            )
+            paint = defaultTextStyle.copy(wrap = 25, placement = "line-center")
         ),
 
         Layer("labels-rivers",
@@ -600,10 +593,7 @@ fun createMapStyle(name: String, accessToken: String, languages: List<String>, c
                 tagIsNot("structure", "tunnel"),
                 tagIn("class", "river", "canal")
             ),
-            paint = waterTextStyle.copy(
-                placement = "line-center",
-                sortKey = "11",
-            )
+            paint = waterTextStyle.copy(placement = "line-center",)
         ),
 
         Layer("labels-streams",
@@ -613,10 +603,7 @@ fun createMapStyle(name: String, accessToken: String, languages: List<String>, c
                 tagIsNot("structure", "tunnel"),
                 tagIn("class", "stream", "ditch", "drain")
             ),
-            paint = waterTextStyle.copy(
-                placement = "line-center",
-                sortKey = "12"
-            )
+            paint = waterTextStyle.copy(placement = "line-center")
         ),
 
         /*