diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index b53388549..b2106472f 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -1255,6 +1255,7 @@ Supermarket Tattoo Parlour Tea Shop + Telecommunication Shop Ticket Shop Toy Store Travel Agency diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index 7fc1cc9f2..117e22a8b 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -463,6 +463,7 @@ "shop-music|@shop": "Record|vinyl|Music", "shop-musical_instrument|@shop": "Musical instruments", "shop-tea|@shop": "Tea", +"shop-telecommunication|@shop": "Telecommunication", "shop-antiques|@category_shopping|@shop|@category_secondhand": "Antiques", "shop-art|@category_shopping|@shop": "3Artwork|Arts", "shop-baby_goods|@category_children|@shop": "Baby Goods", diff --git a/data/editor.config b/data/editor.config index da303da8e..40fa16a3d 100644 --- a/data/editor.config +++ b/data/editor.config @@ -1062,6 +1062,9 @@ + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index e5b5c45ae..008584951 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -857,7 +857,7 @@ sport|skiing;732; tourism|museum;733; tourism|guest_house;734; tourism|motel;735; -deprecated:boundary|administrative|4|state:01.2022;[boundary=administrative][admin_level=4][border_type=state];x;name;int_name;736;boundary|administrative|4 +shop|telecommunication;736; place|state|USA;[place=state][addr:country=US],[place=state][is_in=USA],[place=state][is_in:country=USA],[place=state][is_in:country_code=us];;name;int_name;737; building|address;[addr:housenumber][addr:street];;addr:housenumber;name;738; amenity|parking|no-access;[amenity=parking][access=not],[amenity=parking][access=no];;name;int_name;739; diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 434db0280..4ff5d80b8 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -1726,6 +1726,7 @@ node|z16-[shop=laundry], node|z16-[shop=lighting], node|z16-[shop=dry_cleaning], node|z16-[shop=mobile_phone], +node|z16-[shop=telecommunication], node|z16-[shop=optician], node|z16-[shop=outdoor], node|z16-[shop=rental], @@ -1892,6 +1893,7 @@ node|z16[shop=laundry], node|z16[shop=dry_cleaning], {icon-image:dry_cleaning-m.svg;} node|z16[shop=mobile_phone], +node|z16[shop=telecommunication], {icon-image: mobile_phone-m.svg;} node|z16[shop=optician], {icon-image: optician-m.svg;} @@ -2038,6 +2040,7 @@ node|z17-[shop=laundry], node|z17-[shop=dry_cleaning], {icon-image:dry_cleaning-m.svg;icon-min-distance: 24;} node|z17-[shop=mobile_phone], +node|z17-[shop=telecommunication], {icon-image: mobile_phone-m.svg;icon-min-distance: 24;} node|z17-[shop=optician], {icon-image: optician-m.svg;icon-min-distance: 24;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 5f33cbc30..bb7a65b37 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -867,6 +867,7 @@ shop-shoes # icon z16- (also has captio shop-sports # icon z16- (also has caption(optional) z16-) shop-stationery # icon z16- (also has caption(optional) z16-) shop-tea # icon z18- (also has caption(optional) z18-) +shop-telecommunication # icon z16- (also has caption(optional) z16-) shop-toys # icon z16- (also has caption(optional) z16-) shop-travel_agency # icon z18- (also has caption(optional) z18-) shop-wine # icon z16- (also has caption(optional) z16-) @@ -1904,6 +1905,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-sports # caption(optional) z16- (also has icon z16-) # shop-stationery # caption(optional) z16- (also has icon z16-) # shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) # shop-toys # caption(optional) z16- (also has icon z16-) # shop-travel_agency # caption(optional) z18- (also has icon z18-) # shop-wine # caption(optional) z16- (also has icon z16-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index aa14486e9..d9487f20b 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -867,6 +867,7 @@ shop-shoes # icon z16- (also has captio shop-sports # icon z16- (also has caption(optional) z16-) shop-stationery # icon z16- (also has caption(optional) z16-) shop-tea # icon z18- (also has caption(optional) z18-) +shop-telecommunication # icon z16- (also has caption(optional) z16-) shop-toys # icon z16- (also has caption(optional) z16-) shop-travel_agency # icon z18- (also has caption(optional) z18-) shop-wine # icon z16- (also has caption(optional) z16-) @@ -1907,6 +1908,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # shop-sports # caption(optional) z16- (also has icon z16-) # shop-stationery # caption(optional) z16- (also has icon z16-) # shop-tea # caption(optional) z18- (also has icon z18-) +# shop-telecommunication # caption(optional) z16- (also has icon z16-) # shop-toys # caption(optional) z16- (also has icon z16-) # shop-travel_agency # caption(optional) z18- (also has icon z18-) # shop-wine # caption(optional) z16- (also has icon z16-) diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 3ec548905..1ca4ac5b3 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -1310,6 +1310,7 @@ "type.shop.supermarket" = "Supermarket"; "type.shop.tattoo" = "Tattoo Parlour"; "type.shop.tea" = "Tea Shop"; +"type.shop.telecommunication" = "Telecommunication Shop"; "type.shop.ticket" = "Ticket Shop"; "type.shop.toys" = "Toy Shop"; "type.shop.travel_agency" = "Travel Agency"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 26ff67cb8..ebe1bffe8 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1350,6 +1350,7 @@ "type.shop.supermarket" = "Supermarket"; "type.shop.tattoo" = "Tattoo Parlour"; "type.shop.tea" = "Tea Shop"; +"type.shop.telecommunication" = "Telecommunication Shop"; "type.shop.ticket" = "Ticket Shop"; "type.shop.toys" = "Toy Store"; "type.shop.travel_agency" = "Travel Agency";