version up and pull translations

app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "de.westnordost.streetcomplete"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 2203
-        def version = "22.2"
+        versionCode 2204
+        def version = "22.3"
         versionName version
         buildConfigField "String", "VERSION", "\"$version\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -166,7 +166,7 @@ dependencies {
 
 task generateMetadata(type: Exec) {
     commandLine 'python', 'generateCountryMetadata.py'
-    commandLine 'python', 'exportCountryGeometriesToGeoJson.py'
+    commandLine 'python', 'copyShopDescriptions.py'
 }
 
 import groovy.json.JsonParserType

app/src/main/assets/osmfeatures/en.json

@@ -663,6 +663,10 @@
             "name": "Hedge",
             "terms": ""
         },
+        "railway/tram_crossing": {
+            "name": "Tram Crossing (Path)",
+            "terms": "crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing"
+        },
         "building/garages": {
             "name": "Garages",
             "terms": ""
@@ -4449,7 +4453,7 @@
         },
         "shop/scuba_diving": {
             "name": "Scuba Diving Shop",
-            "terms": "diving,scuba"
+            "terms": "diving,scuba,snorkel"
         },
         "leisure/sports_centre/climbing": {
             "name": "Climbing Gym",
@@ -4513,6 +4517,10 @@
             "name": "Tile Shop",
             "terms": ""
         },
+        "railway/tram_level_crossing": {
+            "name": "Tram Crossing (Road)",
+            "terms": "crossing,grade crossing,level crossing,pedestrian crossing,streetcar crossing,tramway crossing,trolley crossing"
+        },
         "amenity/vending_machine/food": {
             "name": "Food Vending Machine",
             "terms": "food"

app/src/main/assets/osmfeatures/presets.json

@@ -1037,10 +1037,12 @@
   "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"},
   "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
   "railway/train_wash": {"icon": "temaki-train_wash", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
+  "railway/tram_crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "streetcar crossing", "tramway crossing", "trolley crossing"], "name": "Tram Crossing (Path)"},
+  "railway/tram_level_crossing": {"icon": "fas-car-side", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "streetcar crossing", "tramway crossing", "trolley crossing"], "name": "Tram Crossing (Road)"},
   "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"},
   "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
   "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "email", "interval", "maxheight", "maxweight", "network", "opening_hours", "opening_hours/covid19", "phone", "ref_route", "reservation", "roundtrip", "vhf", "website", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
+  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "email", "interval", "maxheight", "maxweight", "network", "oneway", "opening_hours", "opening_hours/covid19", "phone", "ref_route", "reservation", "roundtrip", "vhf", "website", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
   "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
   "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
   "seamark/buoy_lateral": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
@@ -1181,7 +1183,7 @@
   "shop/radiotechnics": {"icon": "fas-microchip", "geometry": ["point", "area"], "tags": {"shop": "radiotechnics"}, "terms": ["antenna", "transistor"], "name": "Radio/Electronic Component Store"},
   "shop/religion": {"icon": "maki-shop", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"shop": "religion"}, "name": "Religious Store"},
   "shop/rental": {"icon": "fas-dolly", "geometry": ["point", "area"], "tags": {"shop": "rental"}, "name": "Rental Shop"},
-  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
+  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba", "snorkel"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
   "shop/seafood": {"icon": "temaki-fish_cleaning", "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
   "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
   "shop/sewing": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},

app/src/main/res/raw/changelog.yml

@@ -1,3 +1,9 @@
+v22.3: |
+  <h3>Fixes</h3>
+  <ul>
+  <li>For F-Droid users: Fix error on downloading quests / crash when opening add place name quest (#2007)</li>
+  </ul>
+
 v22.2: |
   <p>Same as v22.1 only removing once all local data subject to a possible data corruption that happened in v22.0 (#2014)</p>