Merge branch 'master' into modified

.editorconfig

@@ -16,7 +16,7 @@ indent_style = tab
 [*.{kt,kts}]
 indent_style = space
 indent_size = 4
-disabled_rules = annotation,argument-list-wrapping,chain-wrapping,filename,indent,no-empty-first-line-in-method-block,no-multi-spaces,package-name,paren-spacing,spacing-between-declarations-with-annotations,spacing-between-declarations-with-comments,trailing-comma,wrapping
+disabled_rules = annotation,argument-list-wrapping,chain-wrapping,filename,indent,no-empty-first-line-in-method-block,no-multi-spaces,package-name,paren-spacing,spacing-between-declarations-with-annotations,spacing-between-declarations-with-comments,trailing-comma,wrapping,no-wildcard-imports
 
 [gradlew]
 indent_style = space

app/build.gradle.kts

@@ -35,15 +35,15 @@ android {
         applicationId = "de.westnordost.streetcomplete.expert"
         minSdk = 21
         targetSdk = 33
-        versionCode = 4701
-        versionName = "47.0-beta1_ee"
+        versionCode = 4702
+        versionName = "47.0_ee"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         all {
             isMinifyEnabled = true
-            isShrinkResources = true
+            isShrinkResources = false
             // don't use proguard-android-optimize.txt, it is too aggressive, it is more trouble than it is worth
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
@@ -52,8 +52,6 @@ android {
             buildConfigField("boolean", "IS_GOOGLE_PLAY", "false")
         }
         getByName("debug") {
-            isMinifyEnabled = true
-            isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
             applicationIdSuffix = ".debug"
             buildConfigField("boolean", "IS_GOOGLE_PLAY", "false")
@@ -70,13 +68,13 @@ android {
 
     bundle {
         language {
-            enableSplit = false
+            enableSplit = false // because language is selectable in-app
         }
     }
 
     lint {
         disable += listOf(
-            "MissingTranslation",
+            "MissingTranslation", // crowd-contributed translations are incomplete all the time
             "UseCompatLoadingForDrawables" // doesn't make sense for minSdk >= 21
         )
         abortOnError = false
@@ -207,7 +205,7 @@ val bcp47ExportLanguages = setOf(
 )
 
 // see https://github.com/osmlab/name-suggestion-index/tags for latest version
-val nsiVersion = "v6.0.20220919"
+val nsiVersion = "v6.0.20220926"
 // see https://github.com/openstreetmap/id-tagging-schema/releases for latest version
 val presetsVersion = "v3.5.1"
 

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "de.westnordost.streetcomplete",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 4701,
+      "versionName": "47.0-beta1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>

app/src/main/assets/country_metadata/FO.yml

@@ -1,5 +1,5 @@
 # Do not edit. Data is from res/country/metadata and https://github.com/streetcomplete/countrymetadata
 centerLineStyle: white
 edgeLineStyle: white
-officialLanguages: [fo, dk]
+officialLanguages: [fo, da]
 atmOperators: [BankNordik, Bank Nordik, Betri]

app/src/main/assets/osmfeatures/brands/presets-KH.json

@@ -1 +1 @@
-{"amenity/fast_food/marugameudon-a3c3a3":{"name":"Marugame Udon","locationSet":{"include":["gb","id","kh","ph","ru","us","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["marugame seimen"],"tags":{"amenity":"fast_food","brand:wikidata":"Q10877253"},"addTags":{"alt_name":"Marugame Seimen","amenity":"fast_food","brand":"Marugame Seimen","brand:wikidata":"Q10877253","cuisine":"noodle","name":"Marugame Udon","takeaway":"yes"}},"amenity/fast_food/secretrecipe-541408":{"name":"Secret Recipe","locationSet":{"include":["bd","bn","cn","id","kh","mm","mv","my","sg","th"]},"geometry":["point","area"],"matchScore":2,"terms":["secret recipe"],"tags":{"amenity":"fast_food","brand:wikidata":"Q7444079"},"addTags":{"amenity":"fast_food","brand":"Secret Recipe","brand:wikidata":"Q7444079","cuisine":"cake;malaysian","name":"Secret Recipe","takeaway":"yes"}},"amenity/fast_food/pizza/thepizzacompany-abbb1f":{"name":"The Pizza Company","locationSet":{"include":["ae","bh","cn","jo","kh","la","mm","my","sa","th","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["pizza company","the pizza company"],"reference":{"key":"cuisine","value":"pizza"},"tags":{"amenity":"fast_food","brand:wikidata":"Q2413520","cuisine":"pizza"},"addTags":{"alt_name":"Pizza Company","amenity":"fast_food","brand":"The Pizza Company","brand:wikidata":"Q2413520","cuisine":"pizza","name":"The Pizza Company","takeaway":"yes"}},"amenity/fuel/sokimex-dc29c2":{"name":"Sokimex","locationSet":{"include":["kh"]},"geometry":["point","area"],"matchScore":2,"terms":["sokimex"],"fields":["name","brand","{amenity/fuel}"],"tags":{"amenity":"fuel","brand:wikidata":"Q1149575"},"addTags":{"amenity":"fuel","brand":"Sokimex","brand:wikidata":"Q1149575","name":"Sokimex"}},"amenity/fuel/tela-dc29c2":{"name":"Tela","locationSet":{"include":["kh"]},"geometry":["point","area"],"matchScore":2,"terms":["tela"],"fields":["name","brand","{amenity/fuel}"],"tags":{"amenity":"fuel","brand:wikidata":"Q62534875"},"addTags":{"amenity":"fuel","brand":"Tela","brand:wikidata":"Q62534875","name":"Tela"}},"amenity/pharmacy/guardian-c3738d":{"name":"Guardian (Asia)","locationSet":{"include":["bn","id","kh","my","sg","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["guardian"],"reference":{"key":"amenity","value":"pharmacy"},"tags":{"amenity":"pharmacy","brand:wikidata":"Q63371124"},"addTags":{"amenity":"pharmacy","brand":"Guardian","brand:wikidata":"Q63371124","healthcare":"pharmacy","name":"Guardian"}},"amenity/restaurant/sushi/bonchonchicken-b76b63":{"name":"Bonchon Chicken","locationSet":{"include":["bh","kh","kr","kw","my","ph","sg","th","us"]},"geometry":["point","area"],"matchScore":2,"terms":["bonchon","bonchon chicken","bonchon fried chicken"],"reference":{"key":"cuisine","value":"sushi"},"tags":{"amenity":"restaurant","brand:wikidata":"Q4941248","cuisine":"chicken;korean;sushi"},"addTags":{"amenity":"restaurant","brand":"Bonchon Chicken","brand:wikidata":"Q4941248","cuisine":"chicken;korean;sushi","name":"Bonchon Chicken"}},"shop/bakery/touslesjours-e39ddb":{"name":"Tous Les Jours","locationSet":{"include":["id","kh","my","ph","us","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["tous les jours"],"tags":{"brand:wikidata":"Q3535609","shop":"bakery"},"addTags":{"brand":"Tous Les Jours","brand:wikidata":"Q3535609","name":"Tous Les Jours","shop":"bakery"}},"shop/jewelry/lukfookjewellery-7fe408":{"name":"六福珠宝","locationSet":{"include":["au","ca","cn","kh","my","sg","us"],"exclude":["hk","mo"]},"geometry":["point","area"],"matchScore":2,"terms":["lukfook jewellery","六福珠宝"],"tags":{"brand:wikidata":"Q10893397","shop":"jewelry"},"addTags":{"brand":"六福珠宝","brand:en":"LukFook Jewellery","brand:wikidata":"Q10893397","brand:zh":"六福珠宝","name":"六福珠宝","name:en":"LukFook Jewellery","name:zh":"六福珠宝","shop":"jewelry"}},"shop/tyres/tyreplus-99cc81":{"name":"Tyreplus","locationSet":{"include":["ae","au","bh","cn","id","kh","kw","my","om","ph","qa","ru","sa","sg","th","tw"]},"geometry":["point","area"],"matchScore":2,"terms":["tyreplus"],"tags":{"brand:wikidata":"Q110959120","shop":"tyres"},"addTags":{"brand":"Tyreplus","brand:wikidata":"Q110959120","name":"Tyreplus","shop":"tyres"}},"tourism/hotel/avanihotelsandresorts-e9c192":{"name":"AVANI","locationSet":{"include":["ae","au","bw","id","kh","kr","la","lk","ls","my","mz","na","nz","om","pt","sc","th","vn","zm"]},"geometry":["point","area"],"matchScore":2,"terms":["avani hotels & resorts"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q48989823","tourism":"hotel"},"addTags":{"brand":"Avani Hotels & Resorts","brand:wikidata":"Q48989823","name":"Avani Hotels & Resorts","tourism":"hotel"}},"tourism/hotel/raffles-771760":{"name":"Raffles","locationSet":{"include":["ae","bh","cn","fr","gb","id","in","kh","mv","ph","pl","qa","ru","sa","sc","sg","us"]},"geometry":["point","area"],"matchScore":2,"terms":["raffles"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q4306661","tourism":"hotel"},"addTags":{"brand":"Raffles","brand:wikidata":"Q4306661","name":"Raffles","tourism":"hotel"}}}
+{"amenity/fast_food/marugameudon-a3c3a3":{"name":"Marugame Udon","locationSet":{"include":["gb","id","kh","ph","ru","us","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["marugame seimen"],"tags":{"amenity":"fast_food","brand:wikidata":"Q10877253"},"addTags":{"alt_name":"Marugame Seimen","amenity":"fast_food","brand":"Marugame Seimen","brand:wikidata":"Q10877253","cuisine":"noodle","name":"Marugame Udon","takeaway":"yes"}},"amenity/fast_food/secretrecipe-541408":{"name":"Secret Recipe","locationSet":{"include":["bd","bn","cn","id","kh","mm","mv","my","sg","th"]},"geometry":["point","area"],"matchScore":2,"terms":["secret recipe"],"tags":{"amenity":"fast_food","brand:wikidata":"Q7444079"},"addTags":{"amenity":"fast_food","brand":"Secret Recipe","brand:wikidata":"Q7444079","cuisine":"cake;malaysian","name":"Secret Recipe","takeaway":"yes"}},"amenity/fast_food/pizza/thepizzacompany-abbb1f":{"name":"The Pizza Company","locationSet":{"include":["ae","bh","cn","jo","kh","la","mm","my","sa","th","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["pizza company","the pizza company"],"reference":{"key":"cuisine","value":"pizza"},"tags":{"amenity":"fast_food","brand:wikidata":"Q2413520","cuisine":"pizza"},"addTags":{"alt_name":"Pizza Company","amenity":"fast_food","brand":"The Pizza Company","brand:wikidata":"Q2413520","cuisine":"pizza","name":"The Pizza Company","takeaway":"yes"}},"amenity/fuel/sokimex-dc29c2":{"name":"Sokimex","locationSet":{"include":["kh"]},"geometry":["point","area"],"matchScore":2,"terms":["sokimex"],"fields":["name","brand","{amenity/fuel}"],"tags":{"amenity":"fuel","brand:wikidata":"Q1149575"},"addTags":{"amenity":"fuel","brand":"Sokimex","brand:wikidata":"Q1149575","name":"Sokimex"}},"amenity/fuel/tela-dc29c2":{"name":"Tela","locationSet":{"include":["kh"]},"geometry":["point","area"],"matchScore":2,"terms":["tela"],"fields":["name","brand","{amenity/fuel}"],"tags":{"amenity":"fuel","brand:wikidata":"Q62534875"},"addTags":{"amenity":"fuel","brand":"Tela","brand:wikidata":"Q62534875","name":"Tela"}},"amenity/pharmacy/guardian-c3738d":{"name":"Guardian (Asia)","locationSet":{"include":["bn","id","kh","my","sg","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["guardian"],"reference":{"key":"amenity","value":"pharmacy"},"tags":{"amenity":"pharmacy","brand:wikidata":"Q63371124"},"addTags":{"amenity":"pharmacy","brand":"Guardian","brand:wikidata":"Q63371124","healthcare":"pharmacy","name":"Guardian"}},"amenity/restaurant/sushi/bonchonchicken-b76b63":{"name":"Bonchon Chicken","locationSet":{"include":["bh","kh","kr","kw","my","ph","sg","th","us"]},"geometry":["point","area"],"matchScore":2,"terms":["bonchon","bonchon chicken","bonchon fried chicken"],"reference":{"key":"cuisine","value":"sushi"},"tags":{"amenity":"restaurant","brand:wikidata":"Q4941248","cuisine":"chicken;korean;sushi"},"addTags":{"amenity":"restaurant","brand":"Bonchon Chicken","brand:wikidata":"Q4941248","cuisine":"chicken;korean;sushi","name":"Bonchon Chicken"}},"shop/bakery/touslesjours-e39ddb":{"name":"Tous Les Jours","locationSet":{"include":["id","kh","my","ph","us","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["tous les jours"],"tags":{"brand:wikidata":"Q3535609","shop":"bakery"},"addTags":{"brand":"Tous Les Jours","brand:wikidata":"Q3535609","name":"Tous Les Jours","shop":"bakery"}},"shop/convenience/jiffy-c8e053":{"name":"Jiffy","locationSet":{"include":["kh","la","ph","th"]},"geometry":["point","area"],"matchScore":2,"terms":["jiffy","จิฟฟี่"],"tags":{"brand:wikidata":"Q16770436","shop":"convenience"},"addTags":{"brand":"Jiffy","brand:en":"Jiffy","brand:th":"จิฟฟี่","brand:wikidata":"Q16770436","name":"Jiffy","name:en":"Jiffy","name:th":"จิฟฟี่","shop":"convenience"}},"shop/jewelry/lukfookjewellery-7fe408":{"name":"六福珠宝","locationSet":{"include":["au","ca","cn","kh","my","sg","us"],"exclude":["hk","mo"]},"geometry":["point","area"],"matchScore":2,"terms":["lukfook jewellery","六福珠宝"],"tags":{"brand:wikidata":"Q10893397","shop":"jewelry"},"addTags":{"brand":"六福珠宝","brand:en":"LukFook Jewellery","brand:wikidata":"Q10893397","brand:zh":"六福珠宝","name":"六福珠宝","name:en":"LukFook Jewellery","name:zh":"六福珠宝","shop":"jewelry"}},"shop/tyres/tyreplus-99cc81":{"name":"Tyreplus","locationSet":{"include":["ae","au","bh","cn","id","kh","kw","my","om","ph","qa","ru","sa","sg","th","tw"]},"geometry":["point","area"],"matchScore":2,"terms":["tyreplus"],"tags":{"brand:wikidata":"Q110959120","shop":"tyres"},"addTags":{"brand":"Tyreplus","brand:wikidata":"Q110959120","name":"Tyreplus","shop":"tyres"}},"tourism/hotel/avanihotelsandresorts-e9c192":{"name":"AVANI","locationSet":{"include":["ae","au","bw","id","kh","kr","la","lk","ls","my","mz","na","nz","om","pt","sc","th","vn","zm"]},"geometry":["point","area"],"matchScore":2,"terms":["avani hotels & resorts"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q48989823","tourism":"hotel"},"addTags":{"brand":"Avani Hotels & Resorts","brand:wikidata":"Q48989823","name":"Avani Hotels & Resorts","tourism":"hotel"}},"tourism/hotel/raffles-771760":{"name":"Raffles","locationSet":{"include":["ae","bh","cn","fr","gb","id","in","kh","mv","ph","pl","qa","ru","sa","sc","sg","us"]},"geometry":["point","area"],"matchScore":2,"terms":["raffles"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q4306661","tourism":"hotel"},"addTags":{"brand":"Raffles","brand:wikidata":"Q4306661","name":"Raffles","tourism":"hotel"}}}

app/src/main/assets/osmfeatures/brands/presets-LA.json

@@ -1 +1 @@
-{"amenity/fast_food/pizza/thepizzacompany-abbb1f":{"name":"The Pizza Company","locationSet":{"include":["ae","bh","cn","jo","kh","la","mm","my","sa","th","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["pizza company","the pizza company"],"reference":{"key":"cuisine","value":"pizza"},"tags":{"amenity":"fast_food","brand:wikidata":"Q2413520","cuisine":"pizza"},"addTags":{"alt_name":"Pizza Company","amenity":"fast_food","brand":"The Pizza Company","brand:wikidata":"Q2413520","cuisine":"pizza","name":"The Pizza Company","takeaway":"yes"}},"office/telecommunication/beeline-9919f7":{"name":"Beeline","locationSet":{"include":["am","au","ge","kg","kz","la","ru","ua","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["beeline"],"tags":{"brand:wikidata":"Q402880","office":"telecommunication"},"addTags":{"brand":"Beeline","brand:wikidata":"Q402880","name":"Beeline","office":"telecommunication"}},"shop/department_store/parkson-6dcedc":{"name":"Parkson","locationSet":{"include":["id","la","mm","my","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["parkson","百盛"],"tags":{"brand:wikidata":"Q835145","shop":"department_store"},"addTags":{"brand":"Parkson","brand:en":"Parkson","brand:wikidata":"Q835145","brand:zh":"百盛","name":"Parkson","name:en":"Parkson","name:zh":"百盛","shop":"department_store"}},"tourism/hotel/avanihotelsandresorts-e9c192":{"name":"AVANI","locationSet":{"include":["ae","au","bw","id","kh","kr","la","lk","ls","my","mz","na","nz","om","pt","sc","th","vn","zm"]},"geometry":["point","area"],"matchScore":2,"terms":["avani hotels & resorts"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q48989823","tourism":"hotel"},"addTags":{"brand":"Avani Hotels & Resorts","brand:wikidata":"Q48989823","name":"Avani Hotels & Resorts","tourism":"hotel"}}}
+{"amenity/fast_food/pizza/thepizzacompany-abbb1f":{"name":"The Pizza Company","locationSet":{"include":["ae","bh","cn","jo","kh","la","mm","my","sa","th","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["pizza company","the pizza company"],"reference":{"key":"cuisine","value":"pizza"},"tags":{"amenity":"fast_food","brand:wikidata":"Q2413520","cuisine":"pizza"},"addTags":{"alt_name":"Pizza Company","amenity":"fast_food","brand":"The Pizza Company","brand:wikidata":"Q2413520","cuisine":"pizza","name":"The Pizza Company","takeaway":"yes"}},"office/telecommunication/beeline-9919f7":{"name":"Beeline","locationSet":{"include":["am","au","ge","kg","kz","la","ru","ua","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["beeline"],"tags":{"brand:wikidata":"Q402880","office":"telecommunication"},"addTags":{"brand":"Beeline","brand:wikidata":"Q402880","name":"Beeline","office":"telecommunication"}},"shop/convenience/jiffy-c8e053":{"name":"Jiffy","locationSet":{"include":["kh","la","ph","th"]},"geometry":["point","area"],"matchScore":2,"terms":["jiffy","จิฟฟี่"],"tags":{"brand:wikidata":"Q16770436","shop":"convenience"},"addTags":{"brand":"Jiffy","brand:en":"Jiffy","brand:th":"จิฟฟี่","brand:wikidata":"Q16770436","name":"Jiffy","name:en":"Jiffy","name:th":"จิฟฟี่","shop":"convenience"}},"shop/department_store/parkson-6dcedc":{"name":"Parkson","locationSet":{"include":["id","la","mm","my","vn"]},"geometry":["point","area"],"matchScore":2,"terms":["parkson","百盛"],"tags":{"brand:wikidata":"Q835145","shop":"department_store"},"addTags":{"brand":"Parkson","brand:en":"Parkson","brand:wikidata":"Q835145","brand:zh":"百盛","name":"Parkson","name:en":"Parkson","name:zh":"百盛","shop":"department_store"}},"tourism/hotel/avanihotelsandresorts-e9c192":{"name":"AVANI","locationSet":{"include":["ae","au","bw","id","kh","kr","la","lk","ls","my","mz","na","nz","om","pt","sc","th","vn","zm"]},"geometry":["point","area"],"matchScore":2,"terms":["avani hotels & resorts"],"fields":["name","brand","{tourism/hotel}"],"tags":{"brand:wikidata":"Q48989823","tourism":"hotel"},"addTags":{"brand":"Avani Hotels & Resorts","brand:wikidata":"Q48989823","name":"Avani Hotels & Resorts","tourism":"hotel"}}}