Merge branch 'master' into compose1

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v57.3
+- Fix UNDO: It didn't actually do anything for edits that were already synced! This critical issue existed since v57.2 (#5600, #5602)
+- Traffic signals: Improve wording (#5591)
+- Max speed: Show warning when inputting implausible slow zone tempo limit (#5592)
+- Payment methods: Don't ask in shops if they have been specified exhaustively already (#5589), by @urbalazs
+- Railway crossings barriers: Don't ask for abandoned railways (#5597)
+- Bike paths overlay: Fix selecting "not designated as bike path" when it was a "path or trail" wouldn't do anything (#5596)
+
 ## v57.2
 
 - Lit overlay: Unsupported current tagging is now indicated as such (#5571)

app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         applicationId = "de.westnordost.streetcomplete"
         minSdk = 21
         targetSdk = 34
-        versionCode = 5704
-        versionName = "57.2"
+        versionCode = 5705
+        versionName = "57.3"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -225,7 +225,7 @@ val bcp47ExportLanguages = setOf(
 )
 
 // see https://github.com/osmlab/name-suggestion-index/tags for latest version
-val nsiVersion = "v6.0.20240413"
+val nsiVersion = "v6.0.20240422"
 // see https://github.com/openstreetmap/id-tagging-schema/releases for latest version
 val presetsVersion = "v6.7.3"
 

app/src/main/assets/osmfeatures/brands/presets-CA-MB.json

@@ -1 +1 @@
-{"shop/alcohol/liquormart-009342":{"name":"Liquor Mart","locationSet":{"include":["ca-mb"]},"geometry":["point","area"],"matchScore":2,"terms":["liquor mart","manitoba liquor & lotteries corporation","manitoba liquor control commission","mbll","mlcc","mllc"],"tags":{"brand:wikidata":"Q124030913","shop":"alcohol"},"addTags":{"brand":"Liquor Mart","brand:wikidata":"Q124030913","name":"Liquor Mart","operator":"Manitoba Liquor & Lotteries Corporation","operator:short":"MBLL","operator:wikidata":"Q29467564","shop":"alcohol"}},"shop/trade/toromontcat-321e1f":{"name":"Toromont CAT","locationSet":{"include":["ca-mb","ca-nb","ca-nl","ca-ns","ca-nu","ca-on","ca-pe","ca-qc"]},"geometry":["point","area"],"matchScore":2,"terms":["toromont cat"],"tags":{"brand:wikidata":"Q109619691","shop":"trade"},"addTags":{"brand":"Toromont CAT","brand:wikidata":"Q109619691","name":"Toromont CAT","shop":"trade","trade":"construction_equipment"}},"amenity/telephone/bellmts-c4f09e":{"name":"Bell MTS","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["bell mts","mts"],"fields":["name","operator","{amenity/telephone}"],"tags":{"amenity":"telephone","operator:wikidata":"Q1890462"},"addTags":{"amenity":"telephone","operator":"Bell MTS","operator:wikidata":"Q1890462"}},"leisure/nature_reserve/cityofwinnipeg-012dd4":{"name":"City of Winnipeg","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["city of winnipeg"],"tags":{"leisure":"nature_reserve","operator:wikidata":"Q2135"},"addTags":{"leisure":"nature_reserve","operator":"City of Winnipeg","operator:type":"public","operator:wikidata":"Q2135"}},"leisure/nature_reserve/manitobaconservation-012dd4":{"name":"Manitoba Conservation","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba conservation"],"tags":{"leisure":"nature_reserve","operator:wikidata":"Q6749981"},"addTags":{"leisure":"nature_reserve","operator":"Manitoba Conservation","operator:type":"public","operator:wikidata":"Q6749981"}},"leisure/park/cityofwinnipeg-3d8c8b":{"name":"City of Winnipeg","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["city of winnipeg"],"tags":{"leisure":"park","operator:wikidata":"Q2135"},"addTags":{"leisure":"park","operator":"City of Winnipeg","operator:type":"public","operator:wikidata":"Q2135"}},"leisure/park/manitobaconservation-3d8c8b":{"name":"Manitoba Conservation","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba conservation"],"tags":{"leisure":"park","operator:wikidata":"Q6749981"},"addTags":{"leisure":"park","operator":"Manitoba Conservation","operator:type":"public","operator:wikidata":"Q6749981"}},"power/line/manitobahydro-d668c3":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["line"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"line"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"line"}},"power/minor_line/manitobahydro-1ab7f3":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["line"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"minor_line"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"minor_line"}},"power/plant/manitobahydro-d2ada9":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["area"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"plant"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"plant"}},"power/pole/manitobahydro-446769":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"pole"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"pole"}},"power/substation/manitobahydro-20fa2d":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"substation"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"substation"}},"power/tower/manitobahydro-0866fb":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"tower"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"tower"}},"power/transformer/manitobahydro-4c81de":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"transformer"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"transformer"}},"public_transport/platform/bus_point/winnipegtransit-abe4a9":{"name":"Winnipeg Transit","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["winnipeg transit"],"reference":{"key":"public_transport","value":"platform"},"tags":{"bus":"yes","network:wikidata":"Q3569372","public_transport":"platform"},"addTags":{"bus":"yes","highway":"bus_stop","network":"Winnipeg Transit","network:wikidata":"Q3569372","public_transport":"platform"}},"type/route/bus/winnipegtransit-d0e5ee":{"name":"Winnipeg Transit","locationSet":{"include":["ca-mb"]},"geometry":["relation"],"matchScore":2,"terms":["winnipeg transit"],"reference":{"key":"route","value":"bus"},"tags":{"network:wikidata":"Q3569372","route":"bus","type":"route"},"addTags":{"network":"Winnipeg Transit","network:wikidata":"Q3569372","route":"bus","type":"route"}}}
+{"shop/alcohol/liquormart-009342":{"name":"Liquor Mart","locationSet":{"include":["ca-mb"]},"geometry":["point","area"],"matchScore":2,"terms":["liquor mart","manitoba liquor & lotteries corporation","manitoba liquor control commission","mbll","mlcc","mllc"],"tags":{"brand:wikidata":"Q124030913","shop":"alcohol"},"addTags":{"brand":"Liquor Mart","brand:wikidata":"Q124030913","name":"Liquor Mart","operator":"Manitoba Liquor & Lotteries Corporation","operator:short":"MBLL","operator:wikidata":"Q29467564","shop":"alcohol"}},"shop/doityourself/rona-33a285":{"name":"Rona+","locationSet":{"include":["ca-ab","ca-bc","ca-mb","ca-on","ca-sk"]},"geometry":["point","area"],"matchScore":2,"terms":["lowes","rona+"],"tags":{"brand:wikidata":"Q123688669","shop":"doityourself"},"addTags":{"brand":"Rona+","brand:wikidata":"Q123688669","name":"Rona+","shop":"doityourself"}},"shop/trade/toromontcat-321e1f":{"name":"Toromont CAT","locationSet":{"include":["ca-mb","ca-nb","ca-nl","ca-ns","ca-nu","ca-on","ca-pe","ca-qc"]},"geometry":["point","area"],"matchScore":2,"terms":["toromont cat"],"tags":{"brand:wikidata":"Q109619691","shop":"trade"},"addTags":{"brand":"Toromont CAT","brand:wikidata":"Q109619691","name":"Toromont CAT","shop":"trade","trade":"construction_equipment"}},"amenity/telephone/bellmts-c4f09e":{"name":"Bell MTS","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["bell mts","mts"],"fields":["name","operator","{amenity/telephone}"],"tags":{"amenity":"telephone","operator:wikidata":"Q1890462"},"addTags":{"amenity":"telephone","operator":"Bell MTS","operator:wikidata":"Q1890462"}},"leisure/nature_reserve/cityofwinnipeg-012dd4":{"name":"City of Winnipeg","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["city of winnipeg"],"tags":{"leisure":"nature_reserve","operator:wikidata":"Q2135"},"addTags":{"leisure":"nature_reserve","operator":"City of Winnipeg","operator:type":"public","operator:wikidata":"Q2135"}},"leisure/nature_reserve/manitobaconservation-012dd4":{"name":"Manitoba Conservation","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba conservation"],"tags":{"leisure":"nature_reserve","operator:wikidata":"Q6749981"},"addTags":{"leisure":"nature_reserve","operator":"Manitoba Conservation","operator:type":"public","operator:wikidata":"Q6749981"}},"leisure/park/cityofwinnipeg-3d8c8b":{"name":"City of Winnipeg","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["city of winnipeg"],"tags":{"leisure":"park","operator:wikidata":"Q2135"},"addTags":{"leisure":"park","operator":"City of Winnipeg","operator:type":"public","operator:wikidata":"Q2135"}},"leisure/park/manitobaconservation-3d8c8b":{"name":"Manitoba Conservation","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba conservation"],"tags":{"leisure":"park","operator:wikidata":"Q6749981"},"addTags":{"leisure":"park","operator":"Manitoba Conservation","operator:type":"public","operator:wikidata":"Q6749981"}},"power/line/manitobahydro-d668c3":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["line"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"line"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"line"}},"power/minor_line/manitobahydro-1ab7f3":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["line"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"minor_line"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"minor_line"}},"power/plant/manitobahydro-d2ada9":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["area"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"plant"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"plant"}},"power/pole/manitobahydro-446769":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"pole"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"pole"}},"power/substation/manitobahydro-20fa2d":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["area","point"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"substation"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"substation"}},"power/tower/manitobahydro-0866fb":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"tower"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"tower"}},"power/transformer/manitobahydro-4c81de":{"name":"Manitoba Hydro","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["manitoba hydro"],"tags":{"operator:wikidata":"Q3285979","power":"transformer"},"addTags":{"operator":"Manitoba Hydro","operator:wikidata":"Q3285979","power":"transformer"}},"public_transport/platform/bus_point/winnipegtransit-abe4a9":{"name":"Winnipeg Transit","locationSet":{"include":["ca-mb"]},"geometry":["point","vertex"],"matchScore":2,"terms":["winnipeg transit"],"reference":{"key":"public_transport","value":"platform"},"tags":{"bus":"yes","network:wikidata":"Q3569372","public_transport":"platform"},"addTags":{"bus":"yes","highway":"bus_stop","network":"Winnipeg Transit","network:wikidata":"Q3569372","public_transport":"platform"}},"type/route/bus/winnipegtransit-d0e5ee":{"name":"Winnipeg Transit","locationSet":{"include":["ca-mb"]},"geometry":["relation"],"matchScore":2,"terms":["winnipeg transit"],"reference":{"key":"route","value":"bus"},"tags":{"network:wikidata":"Q3569372","route":"bus","type":"route"},"addTags":{"network":"Winnipeg Transit","network:wikidata":"Q3569372","route":"bus","type":"route"}}}