diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 0b368a635..16a3f1ccd 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -92,6 +92,7 @@ Loading Dock Lounger Luggage Locker + Mobile Money Agent Marketplace Motorcycle Parking Nightclub diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 5dde3e18d..8be55e805 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -62,6 +62,7 @@ "shop-laundry": "4Laundry|Laundrette|laundromat", "shop-toys|@category_children|@shop": "Toy|toyshop|kids|toys|kids toys", "amenity-marketplace|@category_food": "3Marketplace|market", +"amenity-mobile_money_agent": "Mobile Money Agent|mobile money", "amenity-money_transfer": "Money Transfer", "shop-clothes|@category_shopping|@shop": "3Clothes|U+1F45A|U+1F457|U+1F456|U+1F455|clothing|wear", "shop-caravan|@category_rv|@shop": "2RV dealership|4Caravan dealership|Motorhome dealership", diff --git a/data/editor.config b/data/editor.config index 56c782b2b..a17379494 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1226,6 +1226,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 254037401..e1a72f055 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -980,8 +980,7 @@ railway|rail|tourism|bridge;[railway=rail][usage=tourism][!service][bridge?];;na railway|rail|highspeed|tunnel;[railway=rail][highspeed?][!service][tunnel?];;name;int_name;854; railway|rail|tourism|tunnel;[railway=rail][usage=tourism][!service][tunnel?];;name;int_name;855; mapswithme|grid;856; -# service=bus/busway is deprecated in OSM -deprecated:highway|service|busway:10.2023;[highway=service][service=busway];x;name;int_name;857;highway|busway +amenity|mobile_money_agent;857; highway|busway;[highway=busway],[highway=service][service=busway],[highway=service][service=bus];;name;int_name;858; highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859; highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 7b89afcc8..7a6fb833c 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -921,6 +921,7 @@ node|z18-[amenity=toilets], node|z18-[amenity=atm], node|z18-[amenity=bureau_de_change], node|z18-[amenity=money_transfer], +node|z18-[amenity=mobile_money_agent], node|z18-[amenity=waste_disposal], node|z18-[amenity=recycling], node|z16-[amenity=recycling][recycling_type=centre], @@ -1562,6 +1563,7 @@ node|z17-[aeroway=gate], node|z17-[amenity=bureau_de_change], node|z17-[amenity=money_transfer], +node|z17-[amenity=mobile_money_agent], {icon-image: banknote-m.svg;font-size: 11;} node|z16-[amenity=fire_station], diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss index 83a17a8fd..0492a952a 100644 --- a/data/styles/default/include/Icons_Label_Colors.mapcss +++ b/data/styles/default/include/Icons_Label_Colors.mapcss @@ -118,6 +118,7 @@ node[amenity=fire_station], node[amenity=kindergarten], node[amenity=language_school], node[amenity=library], +node[amenity=mobile_money_agent], node[amenity=money_transfer], node[amenity=music_school], node[amenity=nursing_home], diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 9f0d4b706..59ac5014c 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -966,6 +966,7 @@ amenity-childcare # icon z17- (also has captio amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-driving_school # icon z17- (also has caption(optional) z17-) amenity-language_school # icon z17- (also has caption(optional) z17-) +amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) amenity-money_transfer # icon z17- (also has caption(optional) z18-) amenity-music_school # icon z17- (also has caption(optional) z17-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) @@ -1977,6 +1978,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-driving_school # caption(optional) z17- (also has icon z17-) # amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-) # amenity-music_school # caption(optional) z17- (also has icon z17-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 76fe8f9f1..15382894f 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -966,6 +966,7 @@ amenity-childcare # icon z17- (also has captio amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-driving_school # icon z17- (also has caption(optional) z17-) amenity-language_school # icon z17- (also has caption(optional) z17-) +amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) amenity-money_transfer # icon z17- (also has caption(optional) z18-) amenity-music_school # icon z17- (also has caption(optional) z17-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) @@ -1980,6 +1981,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-driving_school # caption(optional) z17- (also has icon z17-) # amenity-language_school # caption(optional) z17- (also has icon z17-) +# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-) # amenity-music_school # caption(optional) z17- (also has icon z17-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 21b372643..c31683ccc 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -84,6 +84,7 @@ "type.amenity.library" = "Library"; "type.amenity.loading_dock" = "Loading Bay"; "type.amenity.lounger" = "Lounger"; +"type.amenity.mobile_money_agent" = "Mobile Money Agent"; "type.amenity.marketplace" = "Marketplace"; "type.amenity.motorcycle_parking" = "Motorcycle Parking"; "type.amenity.nightclub" = "Nightclub"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index ea6933ad7..5bed90e46 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -96,6 +96,7 @@ "type.amenity.lounger" = "Lounger"; "type.amenity.luggage_locker" = "Luggage Locker"; "type.amenity.marketplace" = "Marketplace"; +"type.amenity.mobile_money_agent" = "Mobile Money Agent"; "type.amenity.motorcycle_parking" = "Motorcycle Parking"; "type.amenity.nightclub" = "Nightclub"; "type.amenity.nursing_home" = "Nursing Home";