diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 0e5e27a563..58068dff7c 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -674,6 +674,7 @@ Могілкі Хрысціянскія могілкі + Марозіва Прыём другсыравіны @@ -692,6 +693,14 @@ Арганіка / Харчовыя адходы Тэтрапак і аналагі Зліў для прыбіральняў транспартных сродкаў + Гандлёвы аўтамат + Аўтамат з цыгарэтамі + Аўтамат з напоямі + Паркамат + Аўтамат па продажы білетаў + Мяшкі дзеля экскрыментаў + Атрыманне пасылак + Паліўны аўтамат Станцыя перавалкі адходаў Вада для аўтадомаў Ланцуг @@ -705,6 +714,7 @@ Могілкі Хрысціянскія могілкі + Прычал Стол для пікніка Флагшток Мачта/вышка @@ -724,6 +734,7 @@ Седлавіна Вадаём Чыгуначная платформа + Напоі Продаж аўтадамоў Рытуальныя паслугі Кемпінг для аўтадамоў diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 3fd6378058..0ee849dc61 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -804,10 +804,13 @@ Ратуша Университет Торговый автомат - Сигаретный автомат + Автомат с сигаретами Автомат с напитками Паркомат - Автомат по продаже билетов на общественный транспорт + Автомат по продаже билетов + Пакеты для экскрементов + Получение посылок + Топливный автомат Ветеринарная клиника Урна Мусорный контейнер diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 3046e32e4f..f29fcdeed2 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -719,7 +719,7 @@ Християнський цвинтар Лікарня Мисливська башта - Кіоск з морозивом + Морозиво Інтернет-кафе Дитячий садок Бібліотека @@ -784,10 +784,14 @@ Туалет Ратуша Університет - Автомат з продажу сигарет + Торговий автомат + Автомат з цигарками Автомат з напоями Паркомат - Автомат з продажу квитків на громадський транспорт + Автомат з продажу квитків + Мішки для екскрементів + Отримання посилок + Паливний автомат Ветеринарна клініка Бак для сміття Сміттєвий контейнер diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index c8ebd8e6b5..86258bf676 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -750,7 +750,7 @@ Christian Graveyard Hospital Hunting Stand - Ice Cream Stand + Ice Cream Internet Cafe Kindergarten Library @@ -817,9 +817,12 @@ University Vending Machine Cigarette Dispenser - Drink Dispenser + Drinks Dispenser Parking Tickets - Vending Machine for Public Transport Tickets + Ticket Machine + Excrement Bags + Parcel Pickup + Fuel Dispenser Veterinary Doctor Trash Bin Dumpster diff --git a/data/categories.txt b/data/categories.txt index e54c9853d7..8cf730c874 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -214,7 +214,7 @@ es:Aparcamiento sv:Parkering th:ที่จอดรถ tr:Otopark -uk:Парковка +uk:4Парковка vi:đỗ xe zh-Hans:停车 zh-Hant:停車場 @@ -1589,10 +1589,11 @@ sk:Obchodný dom fa:مرکز خرید|پاساژ shop-beverages|@food -en:Beverages|drinks|U+1F379 -en-GB:Drinks|U+1F379 -en-AU:Drinks|U+1F379 -ru:Напитки|соки +en:4Beverages|4drinks|U+1F379 +en-GB:4Drinks|U+1F379 +en-AU:4Drinks|U+1F379 +ru:4Напитки|3соки +be:4Напоі|3сокі bg:напитки|питиета ar:مشروبات|عصائر cs:Nápoje|nápoje @@ -1615,7 +1616,7 @@ es:Bebidas sv:Drinkar|drycker th:เครื่องดื่ม tr:Içecek -uk:Напої +uk:4Напої|3соки vi:Đồ uống zh-Hans:饮料|商店 zh-Hant:飲料|飲料店|購物 @@ -3716,7 +3717,8 @@ fa:کتابخانه amenity-parking|@parking en:U+1F697|U+1F17F|U+1F698|U+1F699 -ru:Автостоянка|парковка +ru:Автостоянка +be:Аўтастаянка bg:Паркинг|престой ar:موقف سيارات da:3Parkeringsplads @@ -3728,7 +3730,7 @@ pt:3Estacionamento pt-BR:3Estacionamento es:3aparcamiento sv:Parkering -uk:автостоянка|паркінг +uk:автостоянка vi:Đỗ xe zh-Hans:1停车 zh-Hant:1停車場|停車|泊車 @@ -7877,8 +7879,9 @@ sk:Súd fa:دادگاه amenity-vending_machine-cigarettes -en:Cigarette Dispenser -ru:Сигаретный автомат +en:4Cigarette Dispenser +ru:Автомат с сигаретами|Сигаретный автомат|4Сигареты +be:Аўтамат з цыгарэтамі|Цыгарэтны аўтамат|4Цыгарэты bg:Цигари|диспенсер|машина ar:ماكينة بيع سجائر cs:Automat na cigarety @@ -7901,7 +7904,7 @@ es:Máquina expendedora de tabaco sv:Cigarettmaskin|cigarettautomat th:เครื่องขายบุหรี่ tr:Distributeur de cigarettes -uk:Автомат з продажу сигарет +uk:Автомат з цигарками|4Цигарки vi:Máy bán thuốc lá zh-Hans:自动售烟机 zh-Hant:香菸自動販賣機 @@ -7910,8 +7913,9 @@ sk:Automat na cigarety fa:ماشین سیگار فروشی amenity-vending_machine-drinks -en:Drink Dispenser -ru:Автомат с напитками +en:4Drinks Dispenser|4Beverages +ru:Автомат с напитками|Газировка|4Напитки|3Соки +be:Аўтамат з напоямі|Газіроўка|4Напоі|3Сокі bg:Диспенсър|напитки|машина ar:ماكينة بيع مشروبات cs:Automat na nápoje @@ -7934,7 +7938,7 @@ es:Máquina expendedora de bebidas sv:Läskautomat th:เครื่องขายเครื่องดื่มอัตโนมัติ tr:Distributeur de boissons -uk:Автомат з напоями +uk:Автомат з напоями|Газування|4Напої|3Соки vi:Máy bán thức uống zh-Hans:饮料售卖机 zh-Hant:飲料自動販賣機 @@ -7942,6 +7946,93 @@ el:Αυτόματος πωλητής ποτών sk:Nápojový automat fa:ماشین فروش نوشیدنی +amenity-vending_machine-parking_tickets|@parking +en:4Parking Tickets|Pay and Display|Parkomat|Parking Meter +ru:4Паркомат|Оплата парковки +ar:ماكينة دفع تذاكر الموقف +be:4Паркамат|Аплата паркоўкі +bg:паркинг|машина|билет|Билети за паркиране +cs:Parkovací automat +da:Parkeringsbilletmaskine +de:Parkautomat +el:Εισιτήρια στάθμευσης +es:Máquina de pago de tique de aparcamiento +fa:پارکو متر +fi:Pysäköintimaksuautomaatti +fr:Horodateur +hu:Parkolóautomata +id:Mesin pembayaran tiket parkir +it:Parcometro +ja:駐車券支払機 +ko:주차티켓판매기|주차 티켓 +nb:Parkeringsautomat +nl:Parkeerautomaat|Betaalautomaat parkeergarage +pl:Parkometr|Parkomat +pt:Máquina de pagamento de estacionamento|Máquina de bilhetes de estacionamento|bilhete de estacionamento|talão de estacionamento|Parcómetro|Parquíntemo +pt-BR:Máquina venda de tíquetes de estacionamento +ro:Parcomat +sk:Automat na výdaj parkovacích lístkov +sv:Parkeringsautomat +th:เครื่องชำระค่าที่จอดรถอัตโนมัติ +tr:Horodateur +uk:4Паркомат|Оплата паркування +vi:Máy trả tiền vé đậu xe +zh-Hans:停车场付费机 +zh-Hant:違規停車罰單繳費機 + +amenity-vending_machine-public_transport_tickets|@transport +en:Ticket Machine|Transport Tickets|Tickets +ar:آلة بيع تذاكر النقل العام +be:Автомат по продаже билетов +cs:Prodejní automat lístků na městskou dopravu +da:Billetautomat for offentlig transport +de:Fahrkartenautomat +el:Μηχάνημα αυτόματης πώλησης εισιτηρίων για τα μέσα μαζικής μεταφοράς +es:Máquina expendedora de boletos para el transporte público +es-MX:Máquina expendedora de billetes de transporte público +fa:دستگاه فروش خودکار بلیط های حمل و نقل عمومی +fi:Julkisen liikenteen lippuautomaatti +fr:Distributeur de billets de transport en commun +hu:Automata jegykiadó tömegközlekedési eszközökhöz +id:Mesin penjual otomatis tiket transportasi umum +it:Distributore automatico biglietti di trasporto +ja:公共交通機関の券売機 +ko:대중교통표 자동판매기 +nb:Billettmaskin for offentlig transport +nl:Kaartjesautomaat voor openbaar vervoer +pl:Automat biletowy do transportu publicznego +pt:Máquina venda de bilhetes de transporte público +pt-BR:Máquinas automáticas de venda de passagens de transporte público +ro:Automat de vânzare a biletelor pentru transportul public +ru:Автомат по продаже билетов +sk:Predajný automat na lístky verejnej dopravy +sv:Biljettautomat +sw:Mashine ya kuuzia tiketi za usafiri wa umma +th:เครื่องขายของหรือตั๋วขนส่งมวลชนอัตโนมัติ +tr:Toplu taşıma biletleri için otomatlar +uk:Автомат з продажу квитків +vi:Máy bán vé phương tiện công cộng tự động +zh-Hans:公共交通售票机 +zh-Hant:公共交通售票機 + +amenity-vending_machine-excrement_bags +en:5Excrement Bags +be:5Мяшкі дзеля экскрыментаў +ru:5Пакеты для экскрементов|Какашки +uk:5Мішки для екскрементів + +amenity-vending_machine-parcel_pickup +en:5Parcel Pickup +be:5Атрыманне пасылак +ru:5Получение посылки|Постамат +uk:5Отримання посилок + +amenity-vending_machine-fuel|@fuel +en:Fuel Dispenser +be:Паліўны аўтамат +ru:Топливный автомат +uk:Паливний автомат + # Skipped if empty name building-garage en:Garage @@ -8144,8 +8235,9 @@ sk:Obchodník s rybami fa:فروشگاه غذای دریایی shop-ticket -en:Ticket Shop|tickets|ticket hub|ticket office|ticket center|booking office|box office|ticket agency|ticket booth|pay box -ru:Билетная касса|билет|театральная касса|билетный центр|городской билетный центр|городская касса|продажа билетов|бронирование билетов +en:4Ticket Shop|tickets|ticket hub|ticket office|ticket center|booking office|box office|ticket agency|ticket booth|pay box +ru:4Билетная касса|билет|театральная касса|билетный центр|городская касса|продажа билетов|бронирование билетов +be:4Білетная каса|білет|тэатральная каса|білетны цэнтр|гарадская каса|продаж білетаў|браніраванне білетаў bg:билети|каса ar:مكتب تذاكر cs:Prodej vstupenek @@ -8168,7 +8260,7 @@ es:Venta de entradas sv:Biljettkontor th:จุดจำหน่ายตั๋ว tr:Billetterie -uk:Білетна каса +uk:4Квиткова каса|квиток|театральна каса|квитковий центр|продаж квитків|бронювання квитків vi:Phòng vé zh-Hans:售票处 zh-Hant:售票處 @@ -8407,39 +8499,6 @@ el:Ελικοδρόμιο sk:Pristávacia plocha pre vrtuľníky fa:پد فرود بالگرد -amenity-vending_machine-parking_tickets -en:Parking Tickets -ru:Паркомат -bg:паркинг|машина|билет|Билети за паркиране -ar:ماكينة دفع تذاكر الموقف -cs:Parkovací automat -da:Parkeringsbilletmaskine -nl:Parkeerautomaat|Betaalautomaat parkeergarage -fi:Pysäköintimaksuautomaatti -fr:Horodateur -de:Parkautomat -hu:Parkolóautomata -id:Mesin pembayaran tiket parkir -it:Parcometro -ja:駐車券支払機 -ko:주차티켓판매기|주차 티켓 -nb:Parkeringsautomat -pl:Parkomat -pt:Máquina de pagamento de estacionamento|Máquina de bilhetes de estacionamento|bilhete de estacionamento|talão de estacionamento|Parcómetro|Parquíntemo -pt-BR:Máquina venda de tíquetes de estacionamento -ro:Parcomat -es:Máquina de pago de tique de aparcamiento -sv:Parkeringsautomat -th:เครื่องชำระค่าที่จอดรถอัตโนมัติ -tr:Horodateur -uk:Паркомат -vi:Máy trả tiền vé đậu xe -zh-Hans:停车场付费机 -zh-Hant:違規停車罰單繳費機 -el:Εισιτήρια στάθμευσης -sk:Automat na výdaj parkovacích lístkov -fa:پارکو متر - barrier-border_control en:Border Control ru:Погранконтроль @@ -9074,15 +9133,16 @@ zh-Hant:駕訓班 fa:اموزشگاه رانندگی amenity-ice_cream -en:Ice Cream -ru:Мороженое +en:3Ice Cream +ru:4Мороженое +be:4Марозіва bg:Сладолед ar:كشك أيس كريم cs:Stánek se zmrzlinou da:Isbod -de:Eisstand +de:3Eis|Eisstand el:Παγωτατζίδικο -es:Heladería +es:5Heladería fi:Jäätelökioski fr:Stand de crème glacée hu:Fagylaltárus @@ -9090,10 +9150,10 @@ id:Kios Es Krim it:Chiosco gelati ja:アイスクリーム屋 ko:아이스크림 스탠드|아이스크림 가판대 -nb:Iskrem -nl:Ijskraam|Ijsstand +nb:4Iskrem +nl:4Ijskraam|Ijsstand pl:Stoisko z lodami|lody -pt:Gelados|gelataria|geladaria|3banca de gelados +pt:4Gelados|gelataria|geladaria|3banca de gelados pt-BR:Sorveteria ro:Chioșc cu înghețată sk:Zmrzlinový stánok @@ -9101,7 +9161,7 @@ sv:Glasstånd sw:Duka la Aiskrimu th:แผงขายไอศกรีม tr:Dondurma Standı -uk:Кіоск з морозивом +uk:4Морозиво vi:Quầy kem zh-Hans:冰淇淋摊 zh-Hant:冰淇淋攤 @@ -10057,3 +10117,14 @@ sk:Brod zh-Hans:浅滩 zh-Hant:淺灘 fa:گدار + +leisure-marina +en:3Marina +be:Прычал|Марына +de:Jachthafen +ja:マリーナ +pt:Marina +pt-BR:Marina +ru:Причал|Марина +uk:Пристань|Марина +zh-Hans:游艇码头 diff --git a/data/classificator.txt b/data/classificator.txt index b97a9e8085..c532ebcf50 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -117,6 +117,9 @@ world + vending_machine + cigarettes - drinks - + excrement_bags - + fuel - + parcel_pickup - parking_tickets - public_transport_tickets - {} diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1b8b7f34b7..85fd6beb00 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 214d73ef4c..ab54c31b77 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -8230,6 +8230,57 @@ cont { apply_if: "!name" } } +cont { + name: "amenity-vending_machine" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-cigarettes" element { @@ -8332,6 +8383,159 @@ cont { } } } +cont { + name: "amenity-vending_machine-excrement_bags" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-fuel" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-parcel_pickup" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-parking_tickets" element { @@ -35052,34 +35256,68 @@ cont { cont { name: "leisure-marina" element { - scale: 17 + scale: 16 + symbol { + name: "marina-m" + priority: 16122 + min_distance: 30 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } + priority: 15122 + } + } + element { + scale: 17 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } priority: 15051 } } element { scale: 18 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15051 } } element { scale: 19 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15051 } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 90fc4b7b55..7ab8f3b674 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 6d5d56d432..143f664cb3 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -8164,6 +8164,57 @@ cont { apply_if: "!name" } } +cont { + name: "amenity-vending_machine" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-cigarettes" element { @@ -8266,6 +8317,159 @@ cont { } } } +cont { + name: "amenity-vending_machine-excrement_bags" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-fuel" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-parcel_pickup" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-parking_tickets" element { @@ -34858,34 +35062,68 @@ cont { cont { name: "leisure-marina" element { - scale: 17 + scale: 16 + symbol { + name: "marina-m" + priority: 16122 + min_distance: 30 + } caption { primary { height: 10 color: 4473924 offset_y: 1 } + priority: 15122 + } + } + element { + scale: 17 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + is_optional: true + } priority: 15051 } } element { scale: 18 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15051 } } element { scale: 19 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 4473924 offset_y: 1 + is_optional: true } priority: 15051 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 863d86e827..60f4cc08f2 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 9dc6fbd3ac..c5badc4590 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -8164,6 +8164,57 @@ cont { apply_if: "!name" } } +cont { + name: "amenity-vending_machine" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-cigarettes" element { @@ -8266,6 +8317,159 @@ cont { } } } +cont { + name: "amenity-vending_machine-excrement_bags" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-fuel" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } +} +cont { + name: "amenity-vending_machine-parcel_pickup" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16622 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15622 + } + } +} cont { name: "amenity-vending_machine-parking_tickets" element { @@ -35034,34 +35238,68 @@ cont { cont { name: "leisure-marina" element { - scale: 17 + scale: 16 + symbol { + name: "marina-m" + priority: 16122 + min_distance: 30 + } caption { primary { height: 10 color: 5592405 offset_y: 1 } + priority: 15122 + } + } + element { + scale: 17 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + is_optional: true + } priority: 15051 } } element { scale: 18 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 5592405 offset_y: 1 + is_optional: true } priority: 15051 } } element { scale: 19 + symbol { + name: "marina-m" + priority: 16051 + min_distance: 20 + } caption { primary { height: 10 color: 5592405 offset_y: 1 + is_optional: true } priority: 15051 } diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index bc3c2cd8d4..b55750c45b 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 3a48be95d5..3734ca4037 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -3453,6 +3453,57 @@ cont { apply_if: "!name" } } +cont { + name: "amenity-vending_machine" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } +} cont { name: "amenity-vending_machine-cigarettes" element { @@ -3555,6 +3606,159 @@ cont { } } } +cont { + name: "amenity-vending_machine-excrement_bags" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } +} +cont { + name: "amenity-vending_machine-fuel" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } +} +cont { + name: "amenity-vending_machine-parcel_pickup" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + } + priority: 15300 + } + } +} cont { name: "amenity-vending_machine-parking_tickets" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 0551350d50..eefa8fe6af 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 41aeb5f63a..0e739239d7 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -3453,6 +3453,57 @@ cont { apply_if: "!name" } } +cont { + name: "amenity-vending_machine" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } +} cont { name: "amenity-vending_machine-cigarettes" element { @@ -3555,6 +3606,159 @@ cont { } } } +cont { + name: "amenity-vending_machine-excrement_bags" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } +} +cont { + name: "amenity-vending_machine-fuel" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } +} +cont { + name: "amenity-vending_machine-parcel_pickup" + element { + scale: 17 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 18 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } + element { + scale: 19 + symbol { + name: "vending-m" + priority: 16000 + min_distance: 20 + } + caption { + primary { + height: 11 + color: 6710886 + offset_y: 1 + } + priority: 15300 + } + } +} cont { name: "amenity-vending_machine-parking_tickets" element { diff --git a/data/editor.config b/data/editor.config index 9e1cb3bb1f..5d98702a45 100644 --- a/data/editor.config +++ b/data/editor.config @@ -812,6 +812,14 @@ + + + + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 06620dd99c..df43ed04e5 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1078,14 +1078,14 @@ emergency|phone;1079; highway|rest_area;1080; highway|traffic_signals;1081; leisure|fitness_centre;[leisure=fitness_centre],[leisure=sports_centre][sport=fitness],[amenity=gym];;name;int_name;1082; -deprecated|deprecated;1083;x -deprecated|deprecated;1084;x +amenity|vending_machine|excrement_bags;[amenity=vending_machine][vending=excrement_bags];;name;int_name;1083; +amenity|vending_machine|parcel_pickup;[amenity=vending_machine][vending=parcel_pickup];;name;int_name;1084; leisure|sauna;[leisure=sauna],[amenity=sauna];;name;int_name;1085; -deprecated|deprecated;1086;x +amenity|vending_machine|fuel;[amenity=vending_machine][vending=fuel];;name;int_name;1086; man_made|chimney;1087; man_made|tower;1088; man_made|water_well;1089; -deprecated|deprecated;1090;x +amenity|vending_machine;[amenity=vending_machine];;name;int_name;1090; shop|bookmaker;1091; shop|car_repair|tyres;[shop=car_repair][service=tyres];;name;int_name;1092; shop|cosmetics;1093; diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 880edcbb9d..cfb8cf0007 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -34,6 +34,8 @@ highway=turning_loop : highway=mini_roundabout highway=platform : highway=pedestrian +man_made=quay : man_made=pier + natural=marsh : natural=wetland, wetland=marsh natural=waterfall : waterway=waterfall natural=forest : natural=wood @@ -55,6 +57,9 @@ diet:vegan=yes : cuisine=vegan diet:vegan=only : cuisine=vegan diet=vegan : cuisine=vegan +shop=ice_cream : amenity=ice_cream +ice_cream=yes : amenity=ice_cream + amenity=parking_entrance : amenity=parking historic=cannon : historic=memorial @@ -66,6 +71,7 @@ place=allotments : place=neighbourhood crossing=traffic_signals : highway=traffic_signals +vending=parcel_pickup;parcel_mail_in : vending=parcel_pickup # Replace top tags from here https://taginfo.openstreetmap.org/search?q=recycling on the common ones. recycling:electrical_appliances=yes : recycling:small_appliances=yes diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 4eca2cb7e4..16a315cfe8 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index 759d6c68d6..63d51276f6 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -138,203 +138,203 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + @@ -343,291 +343,292 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - + + + + + + + + + - + - + - + - - - + + + - + - - + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index 961dcf0456..e35f7e072c 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index cf537b68b8..cf6e1d646a 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -109,20 +109,20 @@ - + - + - + - + @@ -130,488 +130,489 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 1a377e78dc..204f9901d1 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 4ffc505eff..9f18d6666a 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -113,20 +113,20 @@ - + - + - + - + @@ -134,500 +134,501 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 8a19d43792..271fa9bfd1 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 54f50bdbe1..8d691702ac 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -131,487 +131,488 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index 1340a6e026..24b5adb0c5 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 6406148fd9..d34721dd32 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -113,20 +113,20 @@ - + - + - + - + @@ -134,500 +134,501 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index c383c3217f..850d47e73d 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 7d1028a58b..459dc9770e 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -131,487 +131,488 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index 6c50a5e8a6..dbb1e08178 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index da58065601..9cefc6cc85 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -113,20 +113,20 @@ - + - + - + - + @@ -134,500 +134,501 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 0b67ccdcee..f8b8bec048 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index 5a46a936f5..c46d38afb4 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -131,487 +131,488 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index d87b734f2c..6c6b129c54 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index e3d623e2ce..afd802d53e 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -113,20 +113,20 @@ - + - + - + - + @@ -134,500 +134,501 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 85284e6fbd..6307f9cc62 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 02fd506e91..7bf44d18e4 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -131,487 +131,488 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index f86ad4503d..64ceff2322 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index 595b830b7a..401728fe08 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -113,20 +113,20 @@ - + - + - + - + @@ -134,495 +134,496 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - + + + - - + + - - + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index d02084bf6c..964d1c5e39 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index b5ef2e8a24..52b91af60b 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -131,487 +131,488 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - - - - - + + + + + - + - - - + + + - + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index a87d3649ba..5638c33e18 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -1465,8 +1465,9 @@ zh-Hant = 狩獵場 [type.amenity.ice_cream] - en = Ice Cream Stand + en = Ice Cream ar = كشك أيس كريم + be = Марозіва cs = Stánek se zmrzlinou da = Isbod de = Eisstand @@ -1491,7 +1492,7 @@ sv = Glasstånd th = แผงขายไอศกรีม tr = Dondurma Standı - uk = Кіоск з морозивом + uk = Морозиво vi = Quầy kem zh-Hans = 冰淇淋店 zh-Hant = 冰淇淋攤 @@ -3270,6 +3271,7 @@ [type.amenity.vending_machine] en = Vending Machine + be = Гандлёвы аўтамат de = Verkaufsautomat fr = Distributeur automatique ja = 自動販売機 @@ -3277,11 +3279,13 @@ pt = Máquina de venda automática pt-BR = Máquina de venda automática ru = Торговый автомат + uk = Торговий автомат zh-Hans = 自动售货机 [type.amenity.vending_machine.cigarettes] en = Cigarette Dispenser ar = ماكينة بيع سجائر + be = Аўтамат з цыгарэтамі cs = Automat na cigarety da = Cigaretautomat de = Zigarettenautomat @@ -3301,19 +3305,20 @@ pt = Máquina de venda de cigarros pt-BR = Máquina de venda de cigarros ro = Automat de țigări - ru = Сигаретный автомат + ru = Автомат с сигаретами sk = Automat na cigarety sv = Cigarettmaskin th = เครื่องขายบุหรี่ tr = Distributeur de cigarettes - uk = Автомат з продажу сигарет + uk = Автомат з цигарками vi = Máy bán thuốc lá zh-Hans = 香烟售货机 zh-Hant = 香菸自動販賣機 [type.amenity.vending_machine.drinks] - en = Drink Dispenser + en = Drinks Dispenser ar = ماكينة بيع مشروبات + be = Аўтамат з напоямі cs = Automat na nápoje da = Automat for drikkevarer de = Getränkeautomat @@ -3346,6 +3351,7 @@ [type.amenity.vending_machine.parking_tickets] en = Parking Tickets ar = ماكينة دفع تذاكر الموقف + be = Паркамат cs = Parkovací automat da = Parkeringsbilletmaskine de = Parkautomat @@ -3376,8 +3382,9 @@ zh-Hant = 違規停車罰單繳費機 [type.amenity.vending_machine.public_transport_tickets] - en = Vending Machine for Public Transport Tickets + en = Ticket Machine ar = آلة بيع تذاكر النقل العام + be = Аўтамат па продажы білетаў cs = Prodejní automat lístků na městskou dopravu da = Billetautomat for offentlig transport de = Fahrkartenautomat @@ -3398,17 +3405,35 @@ pt = Máquina venda de bilhetes de transporte público pt-BR = Máquinas automáticas de venda de passagens de transporte público ro = Automat de vânzare a biletelor pentru transportul public - ru = Автомат по продаже билетов на общественный транспорт + ru = Автомат по продаже билетов sk = Predajný automat na lístky verejnej dopravy sv = Biljettautomat sw = Mashine ya kuuzia tiketi za usafiri wa umma th = เครื่องขายของหรือตั๋วขนส่งมวลชนอัตโนมัติ tr = Toplu taşıma biletleri için otomatlar - uk = Автомат з продажу квитків на громадський транспорт + uk = Автомат з продажу квитків vi = Máy bán vé phương tiện công cộng tự động zh-Hans = 公共交通售票机 zh-Hant = 公共交通售票機 + [type.amenity.vending_machine.excrement_bags] + en = Excrement Bags + be = Мяшкі дзеля экскрыментаў + ru = Пакеты для экскрементов + uk = Мішки для екскрементів + + [type.amenity.vending_machine.parcel_pickup] + en = Parcel Pickup + be = Атрыманне пасылак + ru = Получение посылок + uk = Отримання посилок + + [type.amenity.vending_machine.fuel] + en = Fuel Dispenser + be = Паліўны аўтамат + ru = Топливный автомат + uk = Паливний автомат + [type.amenity.veterinary] en = Veterinary Doctor ar = طبيب بيطري @@ -10116,6 +10141,7 @@ [type.leisure.marina] en = Marina + be = Прычал de = Jachthafen ja = マリーナ pt = Marina @@ -14716,6 +14742,7 @@ [type.shop.beverages] en = Beverages ar = مشروبات + be = Напоі cs = Nápoje da = Drikkevarer de = Getränke diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index fb5244f3a6..2a1852e09d 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -1353,6 +1353,8 @@ node|z16-[amenity=veterinary], area|z16-[amenity=veterinary], node|z16-[amenity=fountain], area|z16-[amenity=fountain], +node|z16-[leisure=marina], +area|z16-[leisure=marina], node|z16-[leisure=water_park], area|z16-[leisure=water_park], line|z16-[barrier=block], @@ -1371,8 +1373,6 @@ node|z16-[amenity=taxi], area|z16-[amenity=taxi], node|z16-[leisure=dog_park], area|z16-[leisure=dog_park], -node|z16-[leisure=water_park], -area|z16-[leisure=water_park], node|z16-[man_made=windmill], area|z16-[man_made=windmill], node|z17-[amenity=pharmacy], @@ -1807,7 +1807,17 @@ area|z15-[landuse=landfill] node|z16-[leisure=water_park], area|z16-[leisure=water_park] -{icon-image: swimming-m.svg;icon-min-distance: 10;} +{icon-image: swimming-m.svg;icon-min-distance: 30;} +node|z17-[leisure=water_park], +area|z17-[leisure=water_park] +{icon-min-distance: 20;text-optional: true;} + +node|z16-[leisure=marina], +area|z16-[leisure=marina] +{icon-image: marina-m.svg;icon-min-distance: 30;} +node|z17-[leisure=marina], +area|z17-[leisure=marina] +{icon-min-distance: 20;text-optional: true;} node|z16-[amenity=fountain], area|z16-[amenity=fountain] @@ -1865,13 +1875,6 @@ node|z17-[leisure=dog_park], area|z17-[leisure=dog_park] {icon-min-distance: 20;text-optional: true;} -node|z16-[leisure=water_park], -area|z16-[leisure=water_park] -{icon-image: swimming-m.svg;icon-min-distance: 30;} -node|z17-[leisure=water_park], -area|z17-[leisure=water_park] -{icon-min-distance: 20;text-optional: true;} - node|z16-[man_made=windmill], area|z16-[man_made=windmill] {icon-image: windmill-m.svg;icon-min-distance: 30;} diff --git a/data/styles/clear/style-clear/symbols/marina-m.svg b/data/styles/clear/style-clear/symbols/marina-m.svg new file mode 100644 index 0000000000..5fc80f4f8a --- /dev/null +++ b/data/styles/clear/style-clear/symbols/marina-m.svg @@ -0,0 +1,11 @@ + + + marina-m + + + + + + + + diff --git a/data/styles/clear/style-night/symbols/marina-m.svg b/data/styles/clear/style-night/symbols/marina-m.svg new file mode 100644 index 0000000000..cdd5171e03 --- /dev/null +++ b/data/styles/clear/style-night/symbols/marina-m.svg @@ -0,0 +1,11 @@ + + + marina-m + + + + + + + + diff --git a/data/types.txt b/data/types.txt index c0cd360dd5..7dd332f582 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1080,14 +1080,14 @@ mapswithme *highway|rest_area *highway|traffic_signals *leisure|fitness_centre -mapswithme -mapswithme +*amenity|vending_machine|excrement_bags +*amenity|vending_machine|parcel_pickup *leisure|sauna -mapswithme +*amenity|vending_machine|fuel *man_made|chimney *man_made|tower *man_made|water_well -mapswithme +*amenity|vending_machine *shop|bookmaker *shop|car_repair|tyres *shop|cosmetics diff --git a/data/visibility.txt b/data/visibility.txt index aadda5dfc8..83f8c56bd3 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -114,9 +114,12 @@ world 00000000000000000000 + toilets 00000000000000000000 - townhall 00000000000000000000 - university 00000000000000011111 - - vending_machine 00000000000000000000 + + vending_machine 00000000000000000111 + cigarettes 00000000000000000111 - drinks 00000000000000000111 - + excrement_bags 00000000000000000111 - + fuel 00000000000000000111 - + parcel_pickup 00000000000000000111 - parking_tickets 00000000000000000111 - public_transport_tickets 00000000000000000111 - {} diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 4c301b47aa..4ce261dcc3 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -1369,6 +1369,21 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Metadata) } } +UNIT_CLASS_TEST(TestWithClassificator, OsmType_Vending) +{ + { + Tags const tags = { + {"amenity", "vending_machine" }, + {"vending", "parcel_pickup;parcel_mail_in"}, + }; + + auto const params = GetFeatureBuilderParams(tags); + + TEST_EQUAL(params.m_types.size(), 1, (params)); + TEST(params.IsTypeExist(GetType({"amenity", "vending_machine", "parcel_pickup" })), (params)); + } +} + UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) { Tags const oneTypes = { diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 9a7a7e1dc1..3f2a8bdeeb 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "آلة بيع تذاكر النقل العام"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "طبيب بيطري"; "type.amenity.waste_basket" = "صندوق قمامة"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index bafd927345..47289fa3c1 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Марозіва"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1450,15 +1450,21 @@ "type.amenity.university" = "University"; -"type.amenity.vending_machine" = "Vending Machine"; +"type.amenity.vending_machine" = "Гандлёвы аўтамат"; -"type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; +"type.amenity.vending_machine.cigarettes" = "Аўтамат з цыгарэтамі"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Аўтамат з напоямі"; -"type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; +"type.amenity.vending_machine.parking_tickets" = "Паркамат"; -"type.amenity.vending_machine.public_transport_tickets" = "Vending Machine for Public Transport Tickets"; +"type.amenity.vending_machine.public_transport_tickets" = "Аўтамат па продажы білетаў"; + +"type.amenity.vending_machine.excrement_bags" = "Мяшкі дзеля экскрыментаў"; + +"type.amenity.vending_machine.parcel_pickup" = "Атрыманне пасылак"; + +"type.amenity.vending_machine.fuel" = "Паліўны аўтамат"; "type.amenity.veterinary" = "Veterinary Doctor"; @@ -2186,7 +2192,7 @@ "type.leisure.landscape_reserve" = "Landscape Reserve"; -"type.leisure.marina" = "Marina"; +"type.leisure.marina" = "Прычал"; "type.leisure.nature_reserve" = "Nature Reserve"; @@ -2632,7 +2638,7 @@ "type.shop.beauty" = "Beauty Shop"; -"type.shop.beverages" = "Beverages"; +"type.shop.beverages" = "Напоі"; "type.shop.bicycle" = "Bicycle Shop"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 5b53f614b2..8500fbde63 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,11 +1454,17 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; -"type.amenity.vending_machine.public_transport_tickets" = "Vending Machine for Public Transport Tickets"; +"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; + +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; "type.amenity.veterinary" = "Veterinary Doctor"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 74262de7c9..1a1225a517 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Prodejní automat lístků na městskou dopravu"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinář"; "type.amenity.waste_basket" = "Odpadkový koš"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index 6a861ecbff..d7097a3566 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Billetautomat for offentlig transport"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Dyrlæge"; "type.amenity.waste_basket" = "Skraldespand"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 51af483261..986e05ddd0 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Fahrkartenautomat"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Tierarzt"; "type.amenity.waste_basket" = "Abfalleimer"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index dcb7929518..a1158c5882 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Μηχάνημα αυτόματης πώλησης εισιτηρίων για τα μέσα μαζικής μεταφοράς"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Κτηνίατρος"; "type.amenity.waste_basket" = "Κάδος απορριμμάτων"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 19ef8d75f3..5912b8d3d8 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,11 +1454,17 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; -"type.amenity.vending_machine.public_transport_tickets" = "Vending Machine for Public Transport Tickets"; +"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; + +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; "type.amenity.veterinary" = "Veterinary Doctor"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 3e1d5f2295..714bb2f6d7 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,11 +1454,17 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; -"type.amenity.vending_machine.public_transport_tickets" = "Vending Machine for Public Transport Tickets"; +"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; + +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; "type.amenity.veterinary" = "Veterinary Doctor"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index 1f27346d86..7a78f79df6 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,12 +1454,18 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; "type.amenity.vending_machine.public_transport_tickets" = "Máquina expendedora de billetes de transporte público"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinary Doctor"; "type.amenity.waste_basket" = "Trash Bin"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index 94c16bbf27..860b841b07 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Máquina expendedora de boletos para el transporte público"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Clínica veterinaria"; "type.amenity.waste_basket" = "Papelera"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index fa5e0b90ea..b017064e4f 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "دستگاه فروش خودکار بلیط های حمل و نقل عمومی"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "دامپزشکی"; "type.amenity.waste_basket" = "سطل زباله"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 617e416ac2..4fbbbe38d3 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Julkisen liikenteen lippuautomaatti"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Eläinlääkäri"; "type.amenity.waste_basket" = "Roska-astia"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index a0b87590ec..20e56fa2fb 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Distributeur de billets de transport en commun"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Docteur vétérinaire"; "type.amenity.waste_basket" = "Poubelle"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 50ba63f30f..08aaef62ca 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,11 +1454,17 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; -"type.amenity.vending_machine.public_transport_tickets" = "Vending Machine for Public Transport Tickets"; +"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; + +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; "type.amenity.veterinary" = "Veterinary Doctor"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index a5be80eb31..1bfdb33263 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Automata jegykiadó tömegközlekedési eszközökhöz"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Állatorvos"; "type.amenity.waste_basket" = "Szemétkosár"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 756866ce25..00a16b7782 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Mesin penjual otomatis tiket transportasi umum"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Dokter Hewan"; "type.amenity.waste_basket" = "Kotak sampah"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 5983921b16..f465502d9d 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Distributore automatico biglietti di trasporto"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinario"; "type.amenity.waste_basket" = "Contenitore per rifiuti"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 8d33f6dcd6..7833070a7d 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "公共交通機関の券売機"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "獣医"; "type.amenity.waste_basket" = "ゴミ箱"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index a182c6023f..c35303b305 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "대중교통표 자동판매기"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "동물병원"; "type.amenity.waste_basket" = "쓰레기통"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 7079163ad6..f1fd776ae9 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Billettmaskin for offentlig transport"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinær"; "type.amenity.waste_basket" = "Søppelkasse"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index d098c2e8ae..90735c9c33 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Kaartjesautomaat voor openbaar vervoer"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Dierenarts"; "type.amenity.waste_basket" = "Vuilnisbak"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index c028fb52a7..bb09389cb6 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Automat biletowy do transportu publicznego"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Weterynarz"; "type.amenity.waste_basket" = "Kosz na śmieci"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index da6981ddb9..14a84cd2a6 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Máquinas automáticas de venda de passagens de transporte público"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinário"; "type.amenity.waste_basket" = "Cesto de lixo"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 4aaf10006c..3e09276ca4 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Máquina venda de bilhetes de transporte público"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinário"; "type.amenity.waste_basket" = "Caixote do lixo"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 0587bb7a13..409e65161f 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Automat de vânzare a biletelor pentru transportul public"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Cabinet veterinar"; "type.amenity.waste_basket" = "Pubelă"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 74d3f7aeeb..ec6684f65c 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -1452,13 +1452,19 @@ "type.amenity.vending_machine" = "Торговый автомат"; -"type.amenity.vending_machine.cigarettes" = "Сигаретный автомат"; +"type.amenity.vending_machine.cigarettes" = "Автомат с сигаретами"; "type.amenity.vending_machine.drinks" = "Автомат с напитками"; "type.amenity.vending_machine.parking_tickets" = "Паркомат"; -"type.amenity.vending_machine.public_transport_tickets" = "Автомат по продаже билетов на общественный транспорт"; +"type.amenity.vending_machine.public_transport_tickets" = "Автомат по продаже билетов"; + +"type.amenity.vending_machine.excrement_bags" = "Пакеты для экскрементов"; + +"type.amenity.vending_machine.parcel_pickup" = "Получение посылок"; + +"type.amenity.vending_machine.fuel" = "Топливный автомат"; "type.amenity.veterinary" = "Ветеринарная клиника"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 3afdccc1e3..45455d6f86 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Predajný automat na lístky verejnej dopravy"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinár"; "type.amenity.waste_basket" = "Odpadkový kôš"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 1f90c15462..e8fefa313c 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Biljettautomat"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinär"; "type.amenity.waste_basket" = "Papperskorg"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 87671fd83f..a64a9583be 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Ice Cream Stand"; +"type.amenity.ice_cream" = "Ice Cream"; "type.amenity.internet_cafe" = "Internet Cafe"; @@ -1454,12 +1454,18 @@ "type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.drinks" = "Drink Dispenser"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; "type.amenity.vending_machine.parking_tickets" = "Parking Tickets"; "type.amenity.vending_machine.public_transport_tickets" = "Mashine ya kuuzia tiketi za usafiri wa umma"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veterinary Doctor"; "type.amenity.waste_basket" = "Trash Bin"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 625170e615..876a3fb537 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "เครื่องขายของหรือตั๋วขนส่งมวลชนอัตโนมัติ"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "สัตวแพทย์"; "type.amenity.waste_basket" = "ถังขยะ"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 986bea82d3..461266ac89 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Toplu taşıma biletleri için otomatlar"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Veteriner"; "type.amenity.waste_basket" = "Poubelle"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index dbf346ccac..21b02e480b 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1321,7 +1321,7 @@ "type.amenity.hunting_stand" = "Мисливська башта"; -"type.amenity.ice_cream" = "Кіоск з морозивом"; +"type.amenity.ice_cream" = "Морозиво"; "type.amenity.internet_cafe" = "Інтернет-кафе"; @@ -1450,15 +1450,21 @@ "type.amenity.university" = "Університет"; -"type.amenity.vending_machine" = "Vending Machine"; +"type.amenity.vending_machine" = "Торговий автомат"; -"type.amenity.vending_machine.cigarettes" = "Автомат з продажу сигарет"; +"type.amenity.vending_machine.cigarettes" = "Автомат з цигарками"; "type.amenity.vending_machine.drinks" = "Автомат з напоями"; "type.amenity.vending_machine.parking_tickets" = "Паркомат"; -"type.amenity.vending_machine.public_transport_tickets" = "Автомат з продажу квитків на громадський транспорт"; +"type.amenity.vending_machine.public_transport_tickets" = "Автомат з продажу квитків"; + +"type.amenity.vending_machine.excrement_bags" = "Мішки для екскрементів"; + +"type.amenity.vending_machine.parcel_pickup" = "Отримання посилок"; + +"type.amenity.vending_machine.fuel" = "Паливний автомат"; "type.amenity.veterinary" = "Ветеринарна клініка"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index cb2bf56b1f..f89ae369e1 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "Máy bán vé phương tiện công cộng tự động"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "Bác sĩ Thú y"; "type.amenity.waste_basket" = "Thùng rác"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index e02b47f378..79e66e10f5 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "公共交通售票机"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "兽医"; "type.amenity.waste_basket" = "垃圾篓"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 9cfe9840d8..82b068c33b 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -1460,6 +1460,12 @@ "type.amenity.vending_machine.public_transport_tickets" = "公共交通售票機"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags"; + +"type.amenity.vending_machine.parcel_pickup" = "Parcel Pickup"; + +"type.amenity.vending_machine.fuel" = "Fuel Dispenser"; + "type.amenity.veterinary" = "獸醫"; "type.amenity.waste_basket" = "垃圾箱";