diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 91c93e459..8e98ddf2d 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -1446,6 +1446,10 @@ No self-service Social Facility + Soup Kitchen + Food Bank + Food Sharing + Give Box Emergency Ward Entrance diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 17c6b8eae..c61d29dd7 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -496,6 +496,10 @@ "man_made-cairn": "4Cairn", "wheelchair-yes": "5Wheelchair", "amenity-social_facility": "Social Facility", +"social_facility-soup_kitchen": "4Soup Kitchen|Food", +"social_facility-food_bank": "4Food Bank|foodbank|Food", +"amenity-food_sharing": "Food Sharing|Food", +"amenity-give_box": "Give Box", "leisure-sports_hall": "Sports hall", "amenity-arts_centre|@category_tourism": "Arts Center", "amenity-prison": "prison", diff --git a/data/editor.config b/data/editor.config index 326d7707f..54db6a959 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1194,6 +1194,14 @@ + + + + + + + + @@ -1256,6 +1264,15 @@ + + + + + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 43d9062dc..6f2f30e1a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -629,11 +629,11 @@ deprecated|deprecated;506;x deprecated|deprecated;507;x deprecated|deprecated;508;x amenity|car_pooling;509; -deprecated|deprecated;510;x -deprecated|deprecated;511;x -deprecated|deprecated;512;x +social_facility|soup_kitchen;510; +social_facility|food_bank;511; +amenity|food_sharing;512; sport|curling;513; -deprecated|deprecated;514;x +amenity|give_box;514; man_made|telescope;515; man_made|telescope|optical;[man_made=telescope][telescope:type=optical];;name;int_name;516; man_made|telescope|radio;[man_made=telescope][telescope:type=radio];;name;int_name;517; diff --git a/data/styles/default/dark/symbols/food_bank-m.svg b/data/styles/default/dark/symbols/food_bank-m.svg new file mode 100644 index 000000000..a10b350aa --- /dev/null +++ b/data/styles/default/dark/symbols/food_bank-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/food_sharing-m.svg b/data/styles/default/dark/symbols/food_sharing-m.svg new file mode 100644 index 000000000..754e9e53f --- /dev/null +++ b/data/styles/default/dark/symbols/food_sharing-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/give_box-m.svg b/data/styles/default/dark/symbols/give_box-m.svg new file mode 100644 index 000000000..d57ee4c67 --- /dev/null +++ b/data/styles/default/dark/symbols/give_box-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/soup_kitchen-m.svg b/data/styles/default/dark/symbols/soup_kitchen-m.svg new file mode 100644 index 000000000..3e38aefd0 --- /dev/null +++ b/data/styles/default/dark/symbols/soup_kitchen-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 17f3d11ee..81bd1d941 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -848,6 +848,8 @@ node|z17-[leisure=indoor_play], node|z17-[amenity=courthouse], node|z17-[amenity=nursing_home], node|z17-[amenity=social_facility], +node|z17-[social_facility=food_bank], +node|z17-[social_facility=soup_kitchen], node|z17-[amenity=animal_shelter], node|z17-[amenity=kindergarten], node|z17-[amenity=childcare], @@ -915,6 +917,8 @@ node|z15-[leisure=sports_centre][sport=swimming], node|z17-[highway=ladder], node|z18-[amenity=dojo], node|z18-[amenity=vending_machine], +node|z18-[amenity=food_sharing], +node|z18-[amenity=give_box], node|z18-[man_made=telescope], node|z17-[man_made=telescope][telescope:type=optical], node|z17-[man_made=telescope][telescope:type=radio], @@ -1441,6 +1445,12 @@ node|z17-[amenity=nursing_home], node|z17-[amenity=social_facility], {icon-image: social_facility-m.svg;} +node|z17-[social_facility=soup_kitchen], +{icon-image: soup_kitchen-m.svg;} + +node|z17-[social_facility=food_bank], +{icon-image: food_bank-m.svg;} + node|z17-[amenity=cinema], {icon-image: cinema-m.svg;} node|z18-[amenity=cinema], @@ -1581,6 +1591,11 @@ node|z17-[amenity=parcel_locker], node|z18-[amenity=vending_machine][vending=fuel], {icon-image: fuel-dispenser-m.svg;} +node|z18-[amenity=food_sharing], +{icon-image: food_sharing-m.svg;} +node|z18-[amenity=give_box], +{icon-image: give_box-m.svg;} + node|z18-[man_made=telescope], {icon-image: telescope-m.svg;} node|z17-[man_made=telescope][telescope:type=optical], diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss index 785221a47..17c182465 100644 --- a/data/styles/default/include/Icons_Label_Colors.mapcss +++ b/data/styles/default/include/Icons_Label_Colors.mapcss @@ -73,6 +73,7 @@ node[amenity=place_of_worship] node[amenity=social_facility], node[historic=ship], node[leisure=hackerspace], +node[social_facility], node[tourism=attraction], node[tourism=gallery], node[tourism=museum], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index fa908eed0..d7835ef6d 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1146,6 +1146,10 @@ isoline-step_10 # pathtext z17- (also has li isoline-zero # pathtext z17- (also has line z15-) === 1000 +social_facility-food_bank # icon z17- (also has caption(optional) z17-) +social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +=== 851 + amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) amenity-nursing_home # icon z17- (also has caption(optional) z17-) @@ -2160,6 +2164,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) # === -8800 +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) # amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # amenity-nursing_home # caption(optional) z17- (also has icon z17-) @@ -2328,6 +2336,8 @@ amenity-telephone # icon z17- (also has captio entrance # icon z17- (also has caption(optional) z19-) === -9960 +amenity-food_sharing # icon z18- (also has caption(optional) z18-) +amenity-give_box # icon z18- (also has caption(optional) z18-) amenity-parking_space # caption z19- amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) amenity-parking_space-permissive # caption z19- @@ -2363,6 +2373,8 @@ power-substation # icon z17- (also has captio # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) amenity-loading_dock # icon z18- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z18-) # amenity-lounger # caption(optional) z19- (also has icon z18-) diff --git a/data/styles/default/light/symbols/food_bank-m.svg b/data/styles/default/light/symbols/food_bank-m.svg new file mode 100644 index 000000000..2935d83b1 --- /dev/null +++ b/data/styles/default/light/symbols/food_bank-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/food_sharing-m.svg b/data/styles/default/light/symbols/food_sharing-m.svg new file mode 100644 index 000000000..93bef8e37 --- /dev/null +++ b/data/styles/default/light/symbols/food_sharing-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/give_box-m.svg b/data/styles/default/light/symbols/give_box-m.svg new file mode 100644 index 000000000..cd3b2a392 --- /dev/null +++ b/data/styles/default/light/symbols/give_box-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/light/symbols/soup_kitchen-m.svg b/data/styles/default/light/symbols/soup_kitchen-m.svg new file mode 100644 index 000000000..a0513fdb4 --- /dev/null +++ b/data/styles/default/light/symbols/soup_kitchen-m.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index ce75f564a..fdb704653 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1147,6 +1147,10 @@ isoline-zero # pathtext z15- (also has li power-line # pathtext z15- (also has line z13-, line::dash z13-) === 1000 +social_facility-food_bank # icon z17- (also has caption(optional) z17-) +social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-) +=== 851 + amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) amenity-nursing_home # icon z17- (also has caption(optional) z17-) @@ -2163,6 +2167,10 @@ leisure-swimming_pool-private # icon z17- (also has captio # natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) # === -8800 +# social_facility-food_bank # caption(optional) z17- (also has icon z17-) +# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-) +# === -9149 + # amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) # amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # amenity-nursing_home # caption(optional) z17- (also has icon z17-) @@ -2334,6 +2342,8 @@ amenity-telephone # icon z17- (also has captio entrance # icon z17- (also has caption(optional) z19-) === -9960 +amenity-food_sharing # icon z18- (also has caption(optional) z18-) +amenity-give_box # icon z18- (also has caption(optional) z18-) amenity-parking_space # caption z19- amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-) amenity-parking_space-permissive # caption z19- @@ -2369,6 +2379,8 @@ power-substation # icon z17- (also has captio # amenity-bench # caption(optional) z19- (also has icon z18-) # amenity-bench-backless # caption(optional) z19- (also has icon z18-) +# amenity-food_sharing # caption(optional) z18- (also has icon z18-) +# amenity-give_box # caption(optional) z18- (also has icon z18-) amenity-loading_dock # icon z18- (also has caption(optional) z19-) # amenity-loading_dock # caption(optional) z19- (also has icon z18-) # amenity-lounger # caption(optional) z19- (also has icon z18-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 03c6d3c7b..7bc6af6d6 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -1500,6 +1500,10 @@ /* https://wiki.openstreetmap.org/wiki/Key:social_facility */ "type.amenity.social_facility" = "Social Facility"; +"type.amenity.soup_kitchen" = "Soup Kitchen"; +"type.amenity.food_bank" = "Food Bank"; +"type.amenity.food_sharing" = "Food Sharing"; +"type.amenity.give_box" = "Give Box"; /* https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance */ "type.emergency.emergency_ward_entrance" = "Emergency Ward Entrance"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index fe4a006f5..8f7464d80 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1545,6 +1545,10 @@ /* https://wiki.openstreetmap.org/wiki/Key:social_facility */ "type.amenity.social_facility" = "Social Facility"; +"type.amenity.soup_kitchen" = "Soup Kitchen"; +"type.amenity.food_bank" = "Food Bank"; +"type.amenity.food_sharing" = "Food Sharing"; +"type.amenity.give_box" = "Give Box"; /* https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance */ "type.emergency.emergency_ward_entrance" = "Emergency Ward Entrance";