Merge branch 'master' into bicycle-rental-capacity

streetcomplete · May 15, 2022 · 51314f5 · 51314f5
2 parents df83881 + fdb8b96
commit 51314f5
Show file tree

Hide file tree

Showing 269 changed files with 9,744 additions and 2,229 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -79,7 +79,7 @@ You can also help to keep the OpenStreetMap wiki **up-to-date** for StreetComple
 
 If you would like to help and are able to contribute code, you are most welcome.
 
-There are many reasonable feature requests and ideas for new question types in the issue tracker which you can use. If you have own ideas on how to improve this app and want to make sure that the pull request will be merged, it is strongly suggested you **open an issue first** to discuss the feature, especially if you aim to add a new quest, [see below](#developing-new-quests).
+There are many feature requests and ideas for new question types in the issue tracker which you can use. If you have own ideas on how to improve this app and want to make sure that the pull request will be merged, it is strongly suggested you **open an issue first** to discuss the feature, especially if you aim to add a new quest, [see below](#developing-new-quests).
 
 Note that StreetComplete also uses [some dependencies](#issues-with-dependencies), where contributions are likely also accepted and help StreetComplete, too.
 
@@ -96,6 +96,8 @@ In case you **don't have an idea of a quest?** Look [at the existing issues](htt
 
 Always remember to pay attention to [the quest guidelines](https://github.com/streetcomplete/StreetComplete/blob/master/QUEST_GUIDELINES.md) of StreetComplete! It also has tips for implementing a quest.
 
+See also [this far more detailed guide to making a new quest](CONTRIBUTING_A_NEW_QUEST.md).
+
 ### Code style
 
 Inheritance and class hierarchy should be avoided if possible. It is preferable to extract shared code to helper file such as [KerbUtil.kt](app/src/main/java/de/westnordost/streetcomplete/osm/kerb/KerbUtil.kt).

diff --git a/CONTRIBUTING_A_NEW_QUEST.md b/CONTRIBUTING_A_NEW_QUEST.md
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -35,8 +35,8 @@ android {
         applicationId = "de.westnordost.streetcomplete"
         minSdk = 21
         targetSdk = 31
-        versionCode = 4301
-        versionName = "43.0"
+        versionCode = 4302
+        versionName = "43.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -206,12 +206,12 @@ dependencies {
 val bcp47ExportLanguages = setOf(
     "am", "ar", "ast", "bg", "bs", "ca", "cs", "da", "de", "el",
     "en", "en-AU", "en-GB", "eo", "es", "eu", "fa", "fi", "fr", "gl", "hr", "hu", "hy",
-    "id", "it", "ja", "ko", "lt", "ml", "nb", "no", "nl", "nn", "pl", "pt", "pt-BR",
+    "id", "it", "ja", "ko", "lt", "lv", "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"
 )
 
 // see https://github.com/osmlab/name-suggestion-index/tags for latest version
-val nsiVersion = "v6.0.20220421"
+val nsiVersion = "v6.0.20220503"
 // see https://github.com/openstreetmap/id-tagging-schema/releases for latest version
 val presetsVersion = "v3.2.2"
 

diff --git a/app/src/main/assets/country_metadata/AR.yml b/app/src/main/assets/country_metadata/AR.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 mobileCountryCode: 722
+noEntrySignStyle: default
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd latin
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/AU.yml b/app/src/main/assets/country_metadata/AU.yml
@@ -8,6 +8,7 @@ hasSlowZone: true
 isLeftHandTraffic: true
 livingStreetSignStyle: australia
 mobileCountryCode: 505
+noEntrySignStyle: no entry
 noParkingSignStyle: australia
 noStoppingSignStyle: australia
 officialLanguages: [en]

diff --git a/app/src/main/assets/country_metadata/BR.yml b/app/src/main/assets/country_metadata/BR.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 mobileCountryCode: 724
+noEntrySignStyle: arrow
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd latin
 officialLanguages: [pt]

diff --git a/app/src/main/assets/country_metadata/CL.yml b/app/src/main/assets/country_metadata/CL.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: white
 mobileCountryCode: 730
+noEntrySignStyle: arrow
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd latin
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/CO.yml b/app/src/main/assets/country_metadata/CO.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 mobileCountryCode: 732
+noEntrySignStyle: no entre
 noParkingSignStyle: mutcd
 noStoppingSignStyle: colombia
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/FI.yml b/app/src/main/assets/country_metadata/FI.yml
@@ -5,6 +5,7 @@ hasLivingStreet: true
 hasSlowZone: true
 livingStreetSignStyle: vienna
 mobileCountryCode: 244
+noEntrySignStyle: yellow
 officialLanguages: [fi, sv]
 popularSports: [soccer, tennis, basketball, beachvolleyball, shooting, ice_hockey]
 atmOperators: [Otto, Suomen Automatia Oy, Nosto, Otto., Automatia Pankkiautomaatit Oy, Osuuspankki, TalletusOtto, OttoPlus, Nordea, Nokas CMS Oy, Automatia, bittiraha.fi, OP, atm, Aktia, Ottopiste, Otto-automaatti]

diff --git a/app/src/main/assets/country_metadata/FJ.yml b/app/src/main/assets/country_metadata/FJ.yml
@@ -2,6 +2,7 @@
 centerLineStyle: white
 isLeftHandTraffic: true
 mobileCountryCode: 542
+noEntrySignStyle: no entry on white
 officialLanguages: [en, fj, hif]
 popularReligions: [christian, hindu]
 atmOperators: [ANZ, BSP, Westpac, BSP ATM]

diff --git a/app/src/main/assets/country_metadata/IE.yml b/app/src/main/assets/country_metadata/IE.yml
@@ -4,6 +4,7 @@ edgeLineStyle: short yellow dashes
 hasAdvisorySpeedLimitSign: false
 isLeftHandTraffic: true
 mobileCountryCode: 272
+noEntrySignStyle: default
 noParkingLineStyle: double yellow
 noParkingSignStyle: mutcd
 noStoppingSignStyle: mutcd

diff --git a/app/src/main/assets/country_metadata/IN.yml b/app/src/main/assets/country_metadata/IN.yml
@@ -2,6 +2,7 @@
 additionalStreetsignLanguages: [en]
 isLeftHandTraffic: true
 mobileCountryCode: 404
+noEntrySignStyle: arrow
 noParkingLineStyle: yellow
 noParkingSignStyle: vienna variant
 noStoppingSignStyle: vienna

diff --git a/app/src/main/assets/country_metadata/IS.yml b/app/src/main/assets/country_metadata/IS.yml
@@ -5,6 +5,7 @@ hasLivingStreet: true
 hasSlowZone: true
 livingStreetSignStyle: vienna
 mobileCountryCode: 274
+noEntrySignStyle: yellow
 officialLanguages: [is]
 atmOperators: [Íslandsbanki, Arion banki, Landsbankinn, Landsbanki Íslands, Landsbanki, Tomato]
 chargingStationOperators: [Orka náttúrunnar, Ísorka, Orka Náttúrunnar]

diff --git a/app/src/main/assets/country_metadata/KE.yml b/app/src/main/assets/country_metadata/KE.yml
@@ -3,6 +3,7 @@ centerLineStyle: yellow
 edgeLineStyle: white
 isLeftHandTraffic: true
 mobileCountryCode: 639
+noEntrySignStyle: arrow
 noParkingSignStyle: sadc
 noStoppingSignStyle: sadc
 officialLanguages: [en, sw]

diff --git a/app/src/main/assets/country_metadata/LR.yml b/app/src/main/assets/country_metadata/LR.yml
@@ -2,6 +2,7 @@
 centerLineStyle: yellow
 lengthUnits: [foot and inch, meter]
 mobileCountryCode: 618
+noEntrySignStyle: do not enter
 noParkingSignStyle: mutcd
 noStoppingSignStyle: mutcd
 officialLanguages: [en]

diff --git a/app/src/main/assets/country_metadata/MX.yml b/app/src/main/assets/country_metadata/MX.yml
@@ -4,6 +4,7 @@ hasLivingStreet: true
 hasSlowZone: true
 livingStreetSignStyle: mexico
 mobileCountryCode: 334
+noEntrySignStyle: arrow
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/NZ.yml b/app/src/main/assets/country_metadata/NZ.yml
@@ -7,6 +7,7 @@ hasSlowZone: true
 isLeftHandTraffic: true
 livingStreetSignStyle: australia
 mobileCountryCode: 530
+noEntrySignStyle: no entry on white
 noParkingLineStyle: dashed yellow
 noParkingSignStyle: vienna variant
 noStoppingSignStyle: vienna

diff --git a/app/src/main/assets/country_metadata/PA.yml b/app/src/main/assets/country_metadata/PA.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 mobileCountryCode: 714
+noEntrySignStyle: arrow
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/PE.yml b/app/src/main/assets/country_metadata/PE.yml
@@ -2,6 +2,7 @@
 centerLineStyle: yellow
 hasSlowZone: true
 mobileCountryCode: 716
+noEntrySignStyle: no entre
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd
 officialLanguages: [es, qu, ay]

diff --git a/app/src/main/assets/country_metadata/PR.yml b/app/src/main/assets/country_metadata/PR.yml
@@ -1,9 +1,10 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 lengthUnits: [foot and inch, meter]
+noEntrySignStyle: no entre
 noParkingSignStyle: mutcd text spanish
-noStoppingSignStyle: mutcd
-officialLanguages: [en]
+noStoppingSignStyle: mutcd text spanish
+officialLanguages: [es, en]
 popularSports: [basketball, tennis, baseball]
 speedUnits: [miles per hour, kilometers per hour]
 orchardProduces: [coffee, orange, banana, guava, mango, mangosteen, tomato, papaya, avocado, chilli_pepper, sweet_pepper, pineapple, coconut, lemon, lime, grapefruit]
diff --git a/app/src/main/assets/country_metadata/SE.yml b/app/src/main/assets/country_metadata/SE.yml
@@ -6,6 +6,7 @@ hasLivingStreet: true
 hasSlowZone: false
 livingStreetSignStyle: vienna
 mobileCountryCode: 240
+noEntrySignStyle: yellow
 noParkingLineStyle: dashed yellow
 noStoppingLineStyle: yellow
 officialLanguages: [sv]

diff --git a/app/src/main/assets/country_metadata/US.yml b/app/src/main/assets/country_metadata/US.yml
@@ -7,6 +7,7 @@ hasNoStandingSign: true
 hasSlowZone: false
 lengthUnits: [foot and inch]
 mobileCountryCode: 310
+noEntrySignStyle: do not enter
 noParkingSignStyle: mutcd text
 noStandingSignStyle: mutcd text standing
 noStoppingSignStyle: mutcd text

diff --git a/app/src/main/assets/country_metadata/UY.yml b/app/src/main/assets/country_metadata/UY.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 centerLineStyle: yellow
 mobileCountryCode: 748
+noEntrySignStyle: default
 noParkingSignStyle: mutcd latin
 noStoppingSignStyle: mutcd latin
 officialLanguages: [es]

diff --git a/app/src/main/assets/country_metadata/default.yml b/app/src/main/assets/country_metadata/default.yml
@@ -13,6 +13,7 @@ hasSlowZone: false
 isLeftHandTraffic: false
 isUsuallyAnyGlassRecyclableInContainers: false
 lengthUnits: [meter]
+noEntrySignStyle: default
 noParkingSignStyle: vienna
 noStoppingSignStyle: vienna
 officialLanguages: [en]

diff --git a/app/src/main/assets/map_theme/jawg/streetcomplete.yaml b/app/src/main/assets/map_theme/jawg/streetcomplete.yaml
@@ -62,7 +62,7 @@ layers:
     streetcomplete_pins:
         data: { source: streetcomplete_pins }
         pins:
-            filter: { $zoom: { min: 14 } }
+            filter: { $zoom: { min: 15 } }
             draw:
                 pin-icons:
                     interactive: true

diff --git a/app/src/main/assets/osmfeatures/brands/presets-AE.json b/app/src/main/assets/osmfeatures/brands/presets-AE.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-AR.json b/app/src/main/assets/osmfeatures/brands/presets-AR.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-AT.json b/app/src/main/assets/osmfeatures/brands/presets-AT.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-AU.json b/app/src/main/assets/osmfeatures/brands/presets-AU.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-BG.json b/app/src/main/assets/osmfeatures/brands/presets-BG.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-BH.json b/app/src/main/assets/osmfeatures/brands/presets-BH.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-BR.json b/app/src/main/assets/osmfeatures/brands/presets-BR.json
diff --git a/app/src/main/assets/osmfeatures/brands/presets-BY.json b/app/src/main/assets/osmfeatures/brands/presets-BY.json