Merge branch 'mnalis-westnordost-profiles' into mnalis-westnordost-pr…

…ofiles-helium314
mnalis · Jul 26, 2021 · 73df584 · 73df584
2 parents 009c6b7 + 6a80607
commit 73df584
Show file tree

Hide file tree

Showing 44 changed files with 1,418 additions and 195 deletions.
diff --git a/CHANGES-mnalis.md b/CHANGES-mnalis.md
@@ -71,4 +71,6 @@ Also:
 * Surface smoothness quest
   https://github.com/westnordost/StreetComplete/issues/1630
 * re-enable or manually hardcode quest ordering if it will be removed
-  https://github.com/streetcomplete/StreetComplete/issues/3034#issuecomment-879866839
+  https://github.com/streetcomplete/StreetComplete/issues/3034#issuecomment-879866839
+* enable pedastrian crossing checks on more ways?
+  https://github.com/streetcomplete/StreetComplete/issues/398#issuecomment-869151327
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -36,8 +36,8 @@ android {
         applicationId = "de.westnordost.streetcomplete"
         minSdkVersion(17)
         targetSdkVersion(30)
-        versionCode = 3302
-        versionName = "33.1"
+        versionCode = 3303
+        versionName = "33.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true
     }
@@ -102,6 +102,9 @@ dependencies {
 
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
+    // only necessary for Android 4.x (KitKat etc, before Lollipop)
+    implementation("androidx.multidex:multidex:2.0.1")
+
     // tests
     testImplementation("junit:junit:4.13.2")
     testImplementation("org.mockito:mockito-core:$mockitoVersion")
@@ -177,7 +180,7 @@ dependencies {
 
 /** Localizations that should be pulled from POEditor etc. */
 val bcp47ExportLanguages = setOf(
-    "ar","ast","bg","bs","ca","cs","da","de","el","en","en-AU","en-GB","es","eu",
+    "am","ar","ast","bg","bs","ca","cs","da","de","el","en","en-AU","en-GB","es","eu",
     "fa","fi","fr","gl","hr","hu","id","it", "ja","ko","lt","ml","nb","no","nl","nn",
     "pl","pt","pt-BR","ro","ru","sk","sr-cyrl","sv","th","tr","uk","zh","zh-CN","zh-HK","zh-TW"
 )

diff --git a/app/src/main/assets/osmfeatures/default/am.json b/app/src/main/assets/osmfeatures/default/am.json
@@ -0,0 +1,3 @@
+{
+    "am": {}
+}
diff --git a/app/src/main/java/de/westnordost/streetcomplete/StreetCompleteApplication.kt b/app/src/main/java/de/westnordost/streetcomplete/StreetCompleteApplication.kt
@@ -1,8 +1,8 @@
 package de.westnordost.streetcomplete
 
-import android.app.Application
 import android.content.SharedPreferences
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDexApplication
 import de.westnordost.streetcomplete.data.Cleaner
 import de.westnordost.streetcomplete.data.Preloader
 import de.westnordost.streetcomplete.data.download.tiles.DownloadedTilesDao
@@ -11,7 +11,7 @@ import de.westnordost.streetcomplete.util.CrashReportExceptionHandler
 import kotlinx.coroutines.*
 import javax.inject.Inject
 
-class StreetCompleteApplication : Application() {
+class StreetCompleteApplication : MultiDexApplication() {
 
     @Inject lateinit var preloader: Preloader
     @Inject lateinit var cleaner: Cleaner

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddKosher.kt
@@ -21,6 +21,7 @@ class AddKosher : OsmFilterQuestType<DietAvailability>() {
     override val commitMessage = "Add kosher status"
     override val wikiLink = "Key:diet:kosher"
     override val icon = R.drawable.ic_quest_kosher
+    override val isReplaceShopEnabled = true
     override val defaultDisabledMessage = R.string.default_disabled_msg_go_inside_regional_warning
 
     override fun getTitle(tags: Map<String, String>) = R.string.quest_dietType_kosher_name_title

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/diet_type/AddVegetarian.kt
@@ -9,7 +9,7 @@ class AddVegetarian : OsmFilterQuestType<DietAvailability>() {
 
     override val elementFilter = """
         nodes, ways with amenity ~ restaurant|cafe|fast_food
-        and name and (
+        and name and diet:vegan != only and (
           !diet:vegetarian
           or diet:vegetarian != only and diet:vegetarian older today -2 years
         )

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/existence/CheckExistence.kt
@@ -28,7 +28,7 @@ class CheckExistence(
             or amenity = vending_machine and vending !~ fuel|parking_tickets|public_transport_tickets
             or amenity = public_bookcase
           )
-          and (${lastChecked(2.0)})
+          and (${lastChecked(2.0)}) and (!seasonal or seasonal=no)
         ) or (
           (
             amenity = clock
@@ -48,18 +48,19 @@ class CheckExistence(
               and !highway
             )
           )
-          and (${lastChecked(4.0)})
+          and (${lastChecked(4.0)}) and (!seasonal or seasonal=no)
         ) or (
           (
             amenity = bench
+            or amenity = lounger
             or amenity = waste_basket
             or traffic_calming ~ bump|hump|island|cushion|choker|rumble_strip|chicane|dip
             or traffic_calming = table and !highway and !crossing
             or amenity = recycling and recycling_type = container
             or amenity = toilets
           )
           and (${lastChecked(6.0)})
-        )) and access !~ no|private
+        )) and access !~ no|private and (!seasonal or seasonal=no)
     """.toElementFilterExpression()
     }
     // traffic_calming = table is often used as a property of a crossing: we don't want the app

diff --git a/app/src/main/res/raw/changelog.yml b/app/src/main/res/raw/changelog.yml
@@ -8,6 +8,26 @@ v34.0-beta1: |
      a much requested feature: (#1301, #1654, #1746, #1987, #2054, #2069, #2279, #2565, #2308, #3034, ...)</li>
   <li>Inform new users once about the possibility to change quest presets</li>
   <li>Added search/filter function for the quest presets settings (#3008)</li>
+
+v33.2: |
+  <h3>Fixes</h3>
+  <ul>
+  <li>Fix that the app wouldn't start on Android 4.x (#3069) which was broken since v32.0. <br/>
+      Android 4.x support will be dropped in an upcoming version.
+  </li>
+  </ul>
+  <h3>Other Enhancements</h3>
+  <ul>
+  <li>Amharic (አማርኛ) translation by Anteneh Belayneh, Alexander Menk (www.AddisMap.com)</li>
+  </ul>
+  <h3>Quest Enhancements</h3>
+  <ul>
+  <li>Number of lanes: Don't ask if they have been recorded for both sides individually already (#3038), by @FloEdelmann</li>
+  <li>Enable cycleways and tactile pavings quest for Croatia (#3041), by @mnalis</li>
+  <li>Allow to split the way on asking whether a set of steps has a handrail (#3037), by @peternewman</li>
+  <li>Allow answering that a place does not exist when asking whether it offers Kosher food (#3073), by @peternewman</li>
+  <li>Don't ask whether a place offers vegetarian food if it only offers vegan food (#3072, #3081), by @starsep</li>
+  <li>Don't ask for the existence of things that are seasonal, f.e. loungers that can only be found in the park during summer (#3089), by @matkoniecz</li>
   </ul>
 
 v33.1: |

diff --git a/app/src/main/res/raw/credits_translations.yml b/app/src/main/res/raw/credits_translations.yml
@@ -1,3 +1,4 @@
+አማርኛ: Anteneh Belayneh, Alexander Menk (www.AddisMap.com)
 اَلْعَرَبِيَّةُ‎: Charbel Bechara, Ibrahim Saed, Modar2018
 Asturianu: Víctor Suárez, Xuacu Saturio
 bahasa Indonesia: Froyobread dan banyak lagi