diff --git a/data/categories.txt b/data/categories.txt
index a64130ad7f..bb84700e9c 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -4808,6 +4808,318 @@ vi:Nhà vật lý trị liệu
zh-Hans:物理治疗师
zh-Hant:物理治療師
+healthcare-alternative
+en:alternative medicine
+ar:الطب البديل
+be:Альтэрнатыўная медыцына
+bg:Алтернативна медицина
+cs:Alternativní medicína
+da:Alternativ medicin
+de:Alternative Medizin
+el:Εναλλακτική ιατρική
+es:Medicina alternativa
+et:Alternatiivne meditsiin
+eu:Medikuntza alternatiboa
+fa:طب جایگزین
+fi:Vaihtoehtoinen lääketiede
+fr:Médecine alternative
+he:רפואה אלטרנטיבית
+hu:Alternatív gyógyászat
+id:Pengobatan alternatif
+it:Medicina alternativa
+ja:代替医療
+ko:대체 약품
+mr:पर्यायी औषध
+nb:Alternativ medisin
+nl:Alternatieve geneeskunde
+pl:Medycyna alternatywna
+pt:Medicina alternativa
+pt-BR:Medicina alternativa
+ro:Medicină alternativă
+ru:Альтернативная медицина
+sk:Alternatívna medicína
+sv:Alternativ medicin
+sw:Dawa mbadala
+th:การแพทย์ทางเลือก
+tr:Alternatif tıp
+uk:Альтернативна медицина
+vi:Liều thuốc thay thế
+zh-Hans:替代药物
+zh-Hant:替代藥物
+
+healthcare-audiologist
+en:Audiology|Audiologist
+ar:السمع|السمعيات
+be:Аўдыялогія|Аўдыёлаг
+bg:Аудиология|Аудиолог
+cs:Audiologie|Audiolog
+da:Audiologi|Audiolog
+de:Audiologie|Audiologin|Audiologe
+el:Ακοολογία|Ακουολόγος
+es:Audiología|Audiólogo
+et:Audioloogia|Audioloog
+eu:Audiologia|Audiologoa
+fa:شنوایی شناس|شنوایی شناسی
+fi:Audiologia|Audiologi
+fr:Audiologie|Audiologiste
+he:אודיולוג|אודיולוגיה
+hu:Audiológia|Audiológus
+id:Audiologi|Audiologis
+it:Audiologia|Audiologo
+ja:オーディオロジー|オーディオロジスト
+ko:청력학|청력학자
+mr:ऑडिओलॉजी|ऑडिओलॉजिस्ट
+nb:Audiologi|Audiolog
+nl:Audiologie|Audioloog
+pl:Audiologia|Audiolog
+pt:Audiologia|Audiologista
+pt-BR:Fonoaudiologia|Fonoaudiólogo
+ro:Audiologie|Audiolog
+ru:Аудиология|Аудиолог
+sk:Audiológia|Audiológ
+sv:Audiologi|Audiolog
+sw:Mtaalamu wa kusikia|Audiology
+th:โสตวิทยา|นักโสตสัมผัสวิทยา
+tr:Odyoloji|Odyolog
+uk:Аудіологія|Аудіолог
+vi:Thính học
+zh-Hans:听力学|听力学家
+zh-Hant:聽力學|聽力學家
+
+healthcare-blood_donation
+en:Blood donation center|Blood donation
+ar:مركز التبرع بالدم|تبرع بالدم
+be:Цэнтр донарства крыві|Донарства крыві
+bg:Център за кръводаряване
+cs:Centrum dárcovství krve
+da:Center for bloddonation|Bloddonation
+de:Blutspendezentrum|Blutspende
+el:Κέντρο αιμοδοσίας|Αιμοδοσία
+es:Centro de donación de sangre|Donación de sangre
+et:Vereloovutuskeskus|Veredoonorlus
+eu:Odol Emate Zentroa|Odol ematea
+fa:مرکز اهدای خون|اهدای خون
+fi:Verenluovutuskeskus|Verenluovutus
+fr:Centre de don du sang|Don du sang
+he:מרכז תרומת דם|תרומת דם
+hu:Véradó központ|Véradás
+id:Pusat Donor Darah|Donor darah
+it:Centro di donazione del sangue|Donazione di sangue
+ja:献血センター|献血
+ko:헌혈센터|헌혈
+mr:रक्तदान केंद्र|रक्तदान
+nb:Bloddonasjonssenter|Bloddonasjon
+nl:Bloeddonatiecentrum|Bloeddonatie
+pl:Centrum krwiodawstwa|Oddawanie krwi
+pt:Centro de Doação de Sangue|Doação de sangue
+pt-BR:Hemocentro|Doação de sangue
+ro:Centrul de donare de sânge|Donarea de sânge
+ru:Центр донорства крови|Донорство крови
+sk:Centrum darcovstva krvi|Darovanie krvi
+sv:Centrum för blodgivning|Blodgivning
+sw:Kituo cha Uchangiaji Damu|Utoaji wa damu
+th:ศูนย์รับบริจาคโลหิต|การบริจาคเลือด
+tr:Kan Bağışı Merkezi|Kan Bağışı
+uk:Центр донорства крові|Донорство крові
+vi:Trung tâm hiến máu|Hiến máu
+zh-Hans:献血中心
+zh-Hant:捐血中心|獻血
+
+healthcare-optometrist
+en:Optometry|Optometrist
+ar:قياس البصر|طبيب العيون
+be:Оптаметрыя|Акуліст
+bg:Оптометрия|Оптометрист
+cs:Optometrie|Optometrista
+da:Optometri|Optometrist
+de:Optometrie|
+el:Οπτομετρία|Οπτομέτρης
+es:Optometría|Optometrista
+et:Optomeetria|Optometrist
+eu:Optometria|Optometrista
+fa:بینایی سنجی|اپتومتریست
+fi:Optometria|Optometristi
+fr:Optométrie|Optométriste
+he:אופטומטריה|אופטומטריסט
+hu:Optometria|Optometrista
+id:Optometri|Ahli kacamata
+it:Optometria|Optometrista
+ja:オプトメトリー|オプトメトリスト
+ko:검안|검안사
+mr:ऑप्टोमेट्री|ऑप्टोमेट्रिस्ट
+nb:Optometri|Optometrist
+nl:Optometrie|Optometrist
+pl:Optometria|Optometrysta
+pt:Optometria|Optometrista
+pt-BR:Optometria|Optometrista
+ro:Optometrie|Optometrist
+ru:Оптометрия|Оптометрист
+sk:Optometria|Optometrista
+sv:Optometri|Optometrist
+sw:Optometry|Daktari wa macho
+th:ทัศนมาตรศาสตร์|นักทัศนมาตร
+tr:Optometri|Optometrist
+uk:Оптометрія|Оптометрист
+vi:Khúc xạ nhãn khoa|bác sĩ nhãn khoa
+zh-Hans:验光配镜|验光师
+zh-Hant:驗光|驗光師
+
+healthcare-podiatrist
+en:Podiatry|Podiatrist
+ar:علاج الأرجل|طبيب الأرجل
+be:Подологія|Артапед
+bg:Подиология|Подиатрист
+cs:Podiatrie|Podiatr
+da:Fodterapi|Fodterapeut
+de:Podologie|Podologe|Podologin
+el:Ποδιατρική|Ποδίατρος
+es:Podología|Podólogo
+et:Jalaravi
+eu:Podologia|Podologoa
+fa:پزشکی پا|متخصص پا
+fi:Jalkaterapia|Jalkaterapeutti
+fr:Podologie|Podologue
+he:פודיאטריה|פודיאטר
+hu:Podiatria|Podiatrist
+id:Podiatri|Ahli penyakit kaki
+it:Podologia|Podologo
+ja:足病学|足病医
+ko:발병학|발 전문의
+mr:पोडियाट्री|पोडियाट्रिस्ट
+nb:Fotterapi|Fotterapeut
+nl:Podologie|Podotherapeut
+pl:Podiatria|Podolog
+pt:Podiatria|Podiatra
+pt-BR:Podiatria|Podiatra
+ro:Podiatrie|Podiatru
+ru:Подиатрия|Ортопед
+sk:Podiatria|Podológ
+sv:Fotvård|Fotvårdare
+sw:Matibabu ya miguu|Daktari wa miguu
+th:แก้โรคเท้า|แพทย์โรคเท้า
+tr:Podiatri|Podiatrist
+uk:Подологія
+vi:khoa bàn chân|Bác sĩ chân
+zh-Hans:足科|足科医生
+zh-Hant:足病學|足病醫生
+
+healthcare-psychotherapist
+en:Psychotherapy
+ar:العلاج النفسي|معالج نفسي
+be:Псіхатэрапія|Псіхатэрапеўт
+bg:Психотерапия|Психотерапевт
+cs:Psychoterapie|Psychoterapeut
+da:Psykoterapi|Psykoterapeut
+de:Psychotherapie|Psychotherapeutin|Psychotherapeut
+el:Ψυχοθεραπεία|Ψυχοθεραπευτής
+es:Psicoterapia|Psicoterapeuta
+et:Psühhoteraapia|Psühhoterapeut
+eu:Psikoterapia|Psikoterapeuta
+fa:روان درمانی|روان درمانگر
+fi:Psykoterapia|Psykoterapeutti
+fr:Psychothérapie|Psychothérapeute
+he:פסיכותרפיה|פסיכותרפיסט
+hu:Pszichoterápia|Pszichoterapeuta
+id:Psikoterapi|Psikoterapis
+it:Psicoterapia|Psicoterapeuta
+ja:心理療法|サイコセラピスト
+ko:심리치료|심리 치료사
+mr:मानसोपचार|मानसोपचारतज्ज्ञ
+nb:Psykoterapi|Psykoterapeut
+nl:Psychotherapie|Psychotherapeut
+pl:Psychoterapia|Psychoterapeuta
+pt:Psicoterapia|Psicoterapeuta
+pt-BR:Psicoterapia|Psicoterapeuta
+ro:Psihoterapie|Psihoterapeut
+ru:Психотерапия|Психотерапевт
+sk:Psychoterapia|Psychoterapeut
+sv:Psykoterapi|Psykoterapeut
+sw:Tiba ya kisaikolojia|Mwanasaikolojia
+th:จิตบำบัด|นักจิตบำบัด
+tr:Psikoterapi|Psikoterapist
+uk:Психотерапія|Психотерапевт
+vi:Tâm lý trị liệu|nhà trị liệu tâm lý
+zh-Hans:心理治疗|心理治疗师
+zh-Hant:心理治療|心理治療師
+
+healthcare-sample_collection
+en:Sample collection
+ar:أخذ العينات|جمع العينات
+be:Калекцыя ўзораў
+bg:Вземане на проби|Събиране на проби
+cs:Odběr vzorků|Sběr vzorků
+da:Prøvetagning|Prøveudtagning
+de:Probenahme
+el:Δειγματοληψία|Συλλογή δείγματος
+es:Muestreo|Recogida de muestras
+et:Proovivõtmine|Proovide kogumine
+eu:Laginketa|Lagin-bilketa
+fa:نمونه برداری|مجموعه نمونه
+fi:Näytteenotto
+fr:Prélèvements biologiques|Échantillonnage
+he:דְגִימָה|אוסף דוגמאות
+hu:Mintavétel|Mintavételezés
+id:Pengambilan sampel|Pengumpulan sampel
+it:Campionamento|Raccolta di campioni
+ja:サンプリング|サンプル採取
+ko:견본 추출|샘플 수집
+mr:नमुना|नमुना संकलन
+nb:Prøvetaking|Prøvesamling
+nl:Bemonstering|Monstername
+pl:Próbkowanie|Zbieranie próbek
+pt:Amostragem|Recolha de amostras
+pt-BR:Amostragem|Coleta de amostras
+ro:Eșantionare|Colectarea probelor
+ru:Выборка|Сдача анализов
+sk:Vzorkovanie|Zber vzoriek
+sv:Provtagning|Insamling av prover
+sw:Sampuli|Mkusanyiko wa sampuli
+th:การสุ่มตัวอย่าง|เก็บตัวอย่าง
+tr:Örnekleme|Örnek toplama
+uk:Збір аналізів
+vi:lấy mẫu|Bộ sưu tập mẫu
+zh-Hans:抽样调查|样品收集
+zh-Hant:採樣|樣品採集
+
+healthcare-speech_therapist
+en:Logopedics|Speech therapist|Speech therapy
+ar:علاج النطق|معالج النطق
+be:лагапедыя|Лагапед
+bg:Логопедия|Логопед
+cs:Logopedie|Logoped
+da:Tale terapi|Talepædagog|Talerapi
+de:Logopedie|Logopädin|Logopäde
+el:Λογοθεραπεία|Λογοθεραπευτής
+es:Logopedia|Logopeda
+et:Logopeedia|Logopeed
+eu:Logopedia|Logopeda
+fa:گفتار درمانی|متخصص گفتار درمانی
+fi:Logopedia|Puheterapeutti|Logopedit
+fr:Logopédie|Orthophoniste
+he:ריפוי בדיבור|קלינאי תקשורת
+hu:Logopédia|Logopédus
+id:Logopedik|Terapis bicara
+it:Logopedia|Logopedista
+ja:ロゴペディックス|スピーチセラピスト
+ko:대화 요법|언어 치료사
+mr:स्पीच थेरपी|स्पीच थेरपिस्ट
+nb:Snakketerapi|Taleterapeut
+nl:Logopedie|Logopedist|Spraaktherapie
+pl:Logopeda|Logopedia
+pt:Terapia da fala|Terapeuta da fala
+pt-BR:Terapia da fala|Terapeuta da fala
+ro:Logopedie|Terapeut de vorbire
+ru:Логопедия|Логопед
+sk:Logopédia|Logopéd
+sv:Logopedics|Logoped
+sw:Tiba ya hotuba|Mtaalamu wa hotuba
+th:การบำบัดด้วยการพูด|นักบำบัดการพูด
+tr:Logopedi|Konuşma terapisti
+uk:Логопедія|Логопед
+vi:Ngôn ngữ trị liệu|Trị liệu bằng lời nói
+zh-Hans:言语治疗|语言治疗师
+zh-Hant:言語治療|語言治療師
+
amenity-hunting_stand
en:Hunting Stand
ru:Охотничья вышка
diff --git a/data/classificator.txt b/data/classificator.txt
index 059878da9d..b37ae55af6 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -344,6 +344,14 @@ world +
healthcare +
laboratory -
physiotherapist -
+ alternative -
+ audiologist -
+ blood_donation -
+ optometrist -
+ podiatrist -
+ psychotherapist -
+ sample_collection -
+ speech_therapist -
{}
highway +
bridleway +
diff --git a/data/editor.config b/data/editor.config
index 3325b771c8..a6e2d2d7c6 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -439,6 +439,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index a2a2ce4a06..1748254204 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -416,14 +416,14 @@ healthcare|laboratory;415;
highway|motorway|tunnel;[highway=motorway][tunnel?];;name;int_name;416;
railway|light_rail|tunnel;[railway=light_rail][tunnel?];;name;int_name;417;
area:highway|service;418;
-deprecated|deprecated;419;x
-deprecated|deprecated;420;x
-deprecated|deprecated;421;x
-deprecated|deprecated;422;x
+healthcare|alternative;419;
+healthcare|audiologist;420;
+healthcare|blood_donation;421;
+healthcare|optometrist;422;
highway|road|tunnel;[highway=road][tunnel?];;name;int_name;423;
sport|archery;424;
-deprecated|deprecated;425;x
-deprecated|deprecated;426;x
+healthcare|podiatrist;425;
+healthcare|psychotherapist;426;
highway|ford;427;
area:highway|path;428;
railway|siding;429;
@@ -432,10 +432,10 @@ amenity|sanitary_dump_station;431;
railway|funicular;432;
amenity|waste_transfer_station;433;
historic|battlefield;434;
-deprecated|deprecated;435;x
+healthcare|sample_collection;435;
sport|australian_football;436;
leisure|bowling_alley;437;
-deprecated|deprecated;438;x
+healthcare|speech_therapist;438;
deprecated|deprecated;439;x
deprecated|deprecated;440;x
aerialway|t-bar;441;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index e9008e878c..6c4d631855 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -9277,6 +9277,318 @@
zh-Hans = 物理治疗师
zh-Hant = 物理治療師
+ [type.healthcare.alternative]
+ en = Alternative medicine
+ ar = الطب البديل
+ be = Альтэрнатыўная медыцына
+ bg = Алтернативна медицина
+ cs = Alternativní medicína
+ da = Alternativ medicin
+ de = Alternative Medizin
+ el = Εναλλακτική ιατρική
+ es = Medicina alternativa
+ et = Alternatiivne meditsiin
+ eu = Medikuntza alternatiboa
+ fa = طب جایگزین
+ fi = Vaihtoehtoinen lääketiede
+ fr = Médecine alternative
+ he = רפואה אלטרנטיבית
+ hu = Alternatív gyógyászat
+ id = Pengobatan alternatif
+ it = Medicina alternativa
+ ja = 代替医療
+ ko = 대체 약품
+ mr = पर्यायी औषध
+ nb = Alternativ medisin
+ nl = Alternatieve geneeskunde
+ pl = Medycyna alternatywna
+ pt = Medicina alternativa
+ pt-BR = Medicina alternativa
+ ro = Medicină alternativă
+ ru = Альтернативная медицина
+ sk = Alternatívna medicína
+ sv = Alternativ medicin
+ sw = Dawa mbadala
+ th = การแพทย์ทางเลือก
+ tr = Alternatif tıp
+ uk = Альтернативна медицина
+ vi = Liều thuốc thay thế
+ zh-Hans = 替代药物
+ zh-Hant = 替代藥物
+
+ [type.healthcare.audiologist]
+ en = Audiology
+ ar = السمع
+ be = Аўдыялогія
+ bg = Аудиология
+ cs = Audiologie
+ da = Audiologi
+ de = Audiologie
+ el = Ακοολογία
+ es = Audiología
+ et = Audioloogia
+ eu = Audiologia
+ fa = شنوایی شناسی
+ fi = Audiologia
+ fr = Audiologie
+ he = אודיולוגיה
+ hu = Audiológia
+ id = Audiologi
+ it = Audiologia
+ ja = オーディオロジー
+ ko = 청력학
+ mr = ऑडिओलॉजी
+ nb = Audiologi
+ nl = Audiologie
+ pl = Audiologia
+ pt = Audiologia
+ pt-BR = Fonoaudiologia
+ ro = Audiologie
+ ru = Аудиология
+ sk = Audiológia
+ sv = Audiologi
+ sw = Mtaalamu wa kusikia
+ th = โสตวิทยา
+ tr = Odyoloji
+ uk = Аудіологія
+ vi = Thính học
+ zh-Hans = 听力学
+ zh-Hant = 聽力學
+
+ [type.healthcare.blood_donation]
+ en = Blood donation center
+ ar = مركز التبرع بالدم
+ be = Цэнтр донарства крыві
+ bg = Център за кръводаряване
+ cs = Centrum dárcovství krve
+ da = Center for bloddonation
+ de = Blutspendezentrum
+ el = Κέντρο αιμοδοσίας
+ es = Centro de donación de sangre
+ et = Vereloovutuskeskus
+ eu = Odol Emate Zentroa
+ fa = مرکز اهدای خون
+ fi = Verenluovutuskeskus
+ fr = Centre de don du sang
+ he = מרכז תרומת דם
+ hu = Véradó központ
+ id = Pusat Donor Darah
+ it = Centro di donazione del sangue
+ ja = 献血センター
+ ko = 헌혈센터
+ mr = रक्तदान केंद्र
+ nb = Bloddonasjonssenter
+ nl = Bloeddonatiecentrum
+ pl = Centrum krwiodawstwa
+ pt = Centro de Doação de Sangue
+ pt-BR = Hemocentro
+ ro = Centrul de donare de sânge
+ ru = Центр донорства крови
+ sk = Centrum darcovstva krvi
+ sv = Centrum för blodgivning
+ sw = Kituo cha Uchangiaji Damu
+ th = ศูนย์รับบริจาคโลหิต
+ tr = Kan Bağışı Merkezi
+ uk = Центр донорства крові
+ vi = Trung tâm hiến máu
+ zh-Hans = 献血中心
+ zh-Hant = 捐血中心
+
+ [type.healthcare.optometrist]
+ en = Optometry
+ ar = قياس البصر
+ be = Оптаметрыя
+ bg = Оптометрия
+ cs = Optometrie
+ da = Optometri
+ de = Optometrie
+ el = Οπτομετρία
+ es = Optometría
+ et = Optomeetria
+ eu = Optometria
+ fa = بینایی سنجی
+ fi = Optometria
+ fr = Optométrie
+ he = אופטומטריה
+ hu = Optometria
+ id = Optometri
+ it = Optometria
+ ja = オプトメトリー
+ ko = 검안
+ mr = ऑप्टोमेट्री
+ nb = Optometri
+ nl = Optometrie
+ pl = Optometria
+ pt = Optometria
+ pt-BR = Optometria
+ ro = Optometrie
+ ru = Оптометрия
+ sk = Optometria
+ sv = Optometri
+ sw = Optometry
+ th = ทัศนมาตรศาสตร์
+ tr = Optometri
+ uk = Оптометрія
+ vi = Khúc xạ nhãn khoa
+ zh-Hans = 验光配镜
+ zh-Hant = 驗光
+
+ [type.healthcare.podiatrist]
+ en = Podiatry
+ ar = علاج الأرجل
+ be = Подологія
+ bg = Подиология
+ cs = Podiatrie
+ da = Fodterapi
+ de = Podologie
+ el = Ποδιατρική
+ es = Podología
+ et = Jalaravi
+ eu = Podologia
+ fa = پزشکی پا
+ fi = Jalkaterapia
+ fr = Podologie
+ he = פודיאטריה
+ hu = Podiatria
+ id = Podiatri
+ it = Podologia
+ ja = 足病学
+ ko = 발병학
+ mr = पोडियाट्री
+ nb = Fotterapi
+ nl = Podologie
+ pl = Podiatria
+ pt = Podiatria
+ pt-BR = Podiatria
+ ro = Podiatrie
+ ru = Подиатрия
+ sk = Podiatria
+ sv = Fotvård
+ sw = Matibabu ya miguu
+ th = แก้โรคเท้า
+ tr = Podiatri
+ uk = Подологія
+ vi = khoa bàn chân
+ zh-Hans = 足科
+ zh-Hant = 足病學
+
+ [type.healthcare.psychotherapist]
+ en = Psychotherapy
+ ar = العلاج النفسي
+ be = Псіхатэрапія
+ bg = Психотерапия
+ cs = Psychoterapie
+ da = Psykoterapi
+ de = Psychotherapie
+ el = Ψυχοθεραπεία
+ es = Psicoterapia
+ et = Psühhoteraapia
+ eu = Psikoterapia
+ fa = روان درمانی
+ fi = Psykoterapia
+ fr = Psychothérapie
+ he = פסיכותרפיה
+ hu = Pszichoterápia
+ id = Psikoterapi
+ it = Psicoterapia
+ ja = 心理療法
+ ko = 심리치료
+ mr = मानसोपचार
+ nb = Psykoterapi
+ nl = Psychotherapie
+ pl = Psychoterapia
+ pt = Psicoterapia
+ pt-BR = Psicoterapia
+ ro = Psihoterapie
+ ru = Психотерапия
+ sk = Psychoterapia
+ sv = Psykoterapi
+ sw = Tiba ya kisaikolojia
+ th = จิตบำบัด
+ tr = Psikoterapi
+ uk = Психотерапія
+ vi = Tâm lý trị liệu
+ zh-Hans = 心理治疗
+ zh-Hant = 心理治療
+
+ [type.healthcare.sample_collection]
+ en = Sample collection
+ ar = أخذ العينات
+ be = Збор аналізаў
+ bg = Вземане на проби
+ cs = Odběr vzorků
+ da = Prøvetagning
+ de = Probenahme
+ el = Δειγματοληψία
+ es = Muestreo
+ et = Proovivõtmine
+ eu = Laginketa
+ fa = نمونه برداری
+ fi = Näytteenotto
+ fr = Prélèvements biologiques
+ he = דְגִימָה
+ hu = Mintavétel
+ id = Pengambilan sampel
+ it = Campionamento
+ ja = サンプリング
+ ko = 견본 추출
+ mr = नमुना
+ nb = Prøvetaking
+ nl = Bemonstering
+ pl = Próbkowanie
+ pt = Amostragem
+ pt-BR = Amostragem
+ ro = Eșantionare
+ ru = Выборка
+ sk = Vzorkovanie|Zber vzoriek
+ sv = Provtagning
+ sw = Sampuli
+ th = การสุ่มตัวอย่าง
+ tr = Örnekleme
+ uk = Збір аналізів
+ vi = lấy mẫu
+ zh-Hans = 抽样调查
+ zh-Hant = 採樣
+
+ [type.healthcare.speech_therapist]
+ en = Logopedics
+ ar = علاج النطق
+ be = лагапедыя
+ bg = Логопедия
+ cs = Logopedie
+ da = Tale terapi
+ de = Logopedie
+ el = Λογοθεραπεία
+ es = Logopedia
+ et = Logopeedia
+ eu = Logopedia
+ fa = گفتار درمانی
+ fi = Logopedia
+ fr = Logopédie
+ he = ריפוי בדיבור
+ hu = Logopédia
+ id = Logopedik
+ it = Logopedia
+ ja = ロゴペディックス
+ ko = 대화 요법
+ mr = स्पीच थेरपी
+ nb = Snakketerapi
+ nl = Logopedie
+ pl = Logopeda
+ pt = Terapia da fala
+ pt-BR = Terapia da fala
+ ro = Logopedie
+ ru = Логопедия
+ sk = Logopédia
+ sv = Logopedics
+ sw = Tiba ya hotuba
+ th = การบำบัดด้วยการพูด
+ tr = Logopedi
+ uk = Логопедія
+ vi = Ngôn ngữ trị liệu
+ zh-Hans = 言语治疗
+ zh-Hant = 言語治療
+
[[Types: Roads]]
[type.highway]
@@ -12345,6 +12657,7 @@
[type.landuse.cemetery.christian]
ref = type.amenity.grave_yard.christian
+ en = Christian Cemetery
nl = Christelijke begraafplaats
[type.landuse.churchyard]
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index bc0559dee7..e18f5c2a76 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -313,6 +313,22 @@ node[healthcare=laboratory],
area[healthcare=laboratory],
node[healthcare=physiotherapist],
area[healthcare=physiotherapist],
+node[healthcare=alternative],
+area[healthcare=alternative],
+node[healthcare=audiologist],
+area[healthcare=audiologist],
+node[healthcare=blood_donation],
+area[healthcare=blood_donation],
+node[healthcare=optometrist],
+area[healthcare=optometrist],
+node[healthcare=podiatrist],
+area[healthcare=podiatrist],
+node[healthcare=psychotherapist],
+area[healthcare=psychotherapist],
+node[healthcare=sample_collection],
+area[healthcare=sample_collection],
+node[healthcare=speech_therapist],
+area[healthcare=speech_therapist],
node[leisure=swimming_pool],
area[leisure=swimming_pool],
area[aeroway=heliport],
@@ -1464,6 +1480,22 @@ node|z17-[healthcare=laboratory],
area|z17-[healthcare=laboratory],
node|z17-[healthcare=physiotherapist],
area|z17-[healthcare=physiotherapist],
+node|z17-[healthcare=alternative],
+area|z17-[healthcare=alternative],
+node|z17-[healthcare=audiologist],
+area|z17-[healthcare=audiologist],
+node|z17-[healthcare=blood_donation],
+area|z17-[healthcare=blood_donation],
+node|z17-[healthcare=optometrist],
+area|z17-[healthcare=optometrist],
+node|z17-[healthcare=podiatrist],
+area|z17-[healthcare=podiatrist],
+node|z17-[healthcare=psychotherapist],
+area|z17-[healthcare=psychotherapist],
+node|z17-[healthcare=sample_collection],
+area|z17-[healthcare=sample_collection],
+node|z17-[healthcare=speech_therapist],
+area|z17-[healthcare=speech_therapist],
node|z17-[amenity=dentist],
area|z17-[amenity=dentist],
node|z17-[amenity=casino],
@@ -1601,8 +1633,6 @@ node|z17[amenity=clinic],
area|z17[amenity=clinic],
node|z17[amenity=doctors],
area|z17[amenity=doctors],
-node|z17[healthcare=laboratory],
-area|z17[healthcare=laboratory],
{icon-image: hospital-m.svg;icon-min-distance: 4;text-optional: true;}
node|z18-[amenity=hospital],
node|z18-[building=hospital],
@@ -1611,9 +1641,13 @@ node|z18-[amenity=clinic],
area|z18-[amenity=clinic],
node|z18-[amenity=doctors],
area|z18-[amenity=doctors],
+{icon-image: hospital-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=laboratory],
+area|z17[healthcare=laboratory],
+{icon-image: sample_collection-m.svg;}
node|z18-[healthcare=laboratory],
area|z18-[healthcare=laboratory],
-{icon-image: hospital-m.svg;font-size: 11;text-optional: true;}
+{icon-image: sample_collection-m.svg;font-size: 11;text-optional: true;}
node|z17[amenity=dentist],
area|z17[amenity=dentist]
{icon-image: dentist-m.svg;}
@@ -1626,6 +1660,54 @@ area|z17[healthcare=physiotherapist]
node|z18-[healthcare=physiotherapist],
area|z18-[healthcare=physiotherapist]
{icon-image: physiotherapist-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=alternative],
+area|z17[healthcare=alternative]
+{icon-image: alternative-m.svg;}
+node|z18-[healthcare=alternative],
+area|z18-[healthcare=alternative]
+{icon-image: alternative-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=audiologist],
+area|z17[healthcare=audiologist]
+{icon-image: audiologist-m.svg;}
+node|z18-[healthcare=audiologist],
+area|z18-[healthcare=audiologist]
+{icon-image: audiologist-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=blood_donation],
+area|z17[healthcare=blood_donation]
+{icon-image: blood_donation-m.svg;}
+node|z18-[healthcare=blood_donation],
+area|z18-[healthcare=blood_donation]
+{icon-image: blood_donation-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=optometrist],
+area|z17[healthcare=optometrist]
+{icon-image: optometrist-m.svg;}
+node|z18-[healthcare=optometrist],
+area|z18-[healthcare=optometrist]
+{icon-image: optometrist-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=podiatrist],
+area|z17[healthcare=podiatrist]
+{icon-image: podiatrist-m.svg;}
+node|z18-[healthcare=podiatrist],
+area|z18-[healthcare=podiatrist]
+{icon-image: podiatrist-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=psychotherapist],
+area|z17[healthcare=psychotherapist]
+{icon-image: psychotherapist-m.svg;}
+node|z18-[healthcare=psychotherapist],
+area|z18-[healthcare=psychotherapist]
+{icon-image: psychotherapist-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=sample_collection],
+area|z17[healthcare=sample_collection]
+{icon-image: sample_collection-m.svg;}
+node|z18-[healthcare=sample_collection],
+area|z18-[healthcare=sample_collection]
+{icon-image: sample_collection-m.svg;font-size: 11;text-optional: true;}
+node|z17[healthcare=speech_therapist],
+area|z17[healthcare=speech_therapist]
+{icon-image: speech_therapist-m.svg;}
+node|z18-[healthcare=speech_therapist],
+area|z18-[healthcare=speech_therapist]
+{icon-image: speech_therapist-m.svg;font-size: 11;text-optional: true;}
node|z16-[amenity=veterinary],
area|z16-[amenity=veterinary]
diff --git a/data/styles/clear/style-clear/symbols/alternative-m.svg b/data/styles/clear/style-clear/symbols/alternative-m.svg
new file mode 100644
index 0000000000..a7ae7cc962
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/alternative-m.svg
@@ -0,0 +1,17 @@
+
diff --git a/data/styles/clear/style-clear/symbols/audiologist-m.svg b/data/styles/clear/style-clear/symbols/audiologist-m.svg
new file mode 100644
index 0000000000..e55ff70ffb
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/audiologist-m.svg
@@ -0,0 +1,12 @@
+
diff --git a/data/styles/clear/style-clear/symbols/blood_donation-m.svg b/data/styles/clear/style-clear/symbols/blood_donation-m.svg
new file mode 100644
index 0000000000..698ecdceae
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/blood_donation-m.svg
@@ -0,0 +1,8 @@
+
diff --git a/data/styles/clear/style-clear/symbols/optometrist-m.svg b/data/styles/clear/style-clear/symbols/optometrist-m.svg
new file mode 100644
index 0000000000..7bf18245e7
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/optometrist-m.svg
@@ -0,0 +1,9 @@
+
diff --git a/data/styles/clear/style-clear/symbols/podiatrist-m.svg b/data/styles/clear/style-clear/symbols/podiatrist-m.svg
new file mode 100644
index 0000000000..cf76522f12
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/podiatrist-m.svg
@@ -0,0 +1,11 @@
+
diff --git a/data/styles/clear/style-clear/symbols/psychotherapist-m.svg b/data/styles/clear/style-clear/symbols/psychotherapist-m.svg
new file mode 100644
index 0000000000..b223f105fc
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/psychotherapist-m.svg
@@ -0,0 +1,13 @@
+
diff --git a/data/styles/clear/style-clear/symbols/sample_collection-m.svg b/data/styles/clear/style-clear/symbols/sample_collection-m.svg
new file mode 100644
index 0000000000..7a0683318c
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/sample_collection-m.svg
@@ -0,0 +1,15 @@
+
diff --git a/data/styles/clear/style-clear/symbols/speech_therapist-m.svg b/data/styles/clear/style-clear/symbols/speech_therapist-m.svg
new file mode 100644
index 0000000000..d46e2c57d8
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/speech_therapist-m.svg
@@ -0,0 +1,13 @@
+
diff --git a/data/styles/clear/style-night/symbols/alternative-m.svg b/data/styles/clear/style-night/symbols/alternative-m.svg
new file mode 100644
index 0000000000..fc17b2a83d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/alternative-m.svg
@@ -0,0 +1,17 @@
+
diff --git a/data/styles/clear/style-night/symbols/audiologist-m.svg b/data/styles/clear/style-night/symbols/audiologist-m.svg
new file mode 100644
index 0000000000..93c9253156
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/audiologist-m.svg
@@ -0,0 +1,12 @@
+
diff --git a/data/styles/clear/style-night/symbols/blood_donation-m.svg b/data/styles/clear/style-night/symbols/blood_donation-m.svg
new file mode 100644
index 0000000000..8024dd4b07
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/blood_donation-m.svg
@@ -0,0 +1,8 @@
+
diff --git a/data/styles/clear/style-night/symbols/optometrist-m.svg b/data/styles/clear/style-night/symbols/optometrist-m.svg
new file mode 100644
index 0000000000..fa42c92063
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/optometrist-m.svg
@@ -0,0 +1,9 @@
+
diff --git a/data/styles/clear/style-night/symbols/podiatrist-m.svg b/data/styles/clear/style-night/symbols/podiatrist-m.svg
new file mode 100644
index 0000000000..637967bc96
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/podiatrist-m.svg
@@ -0,0 +1,9 @@
+
diff --git a/data/styles/clear/style-night/symbols/psychotherapist-m.svg b/data/styles/clear/style-night/symbols/psychotherapist-m.svg
new file mode 100644
index 0000000000..56e94187d6
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/psychotherapist-m.svg
@@ -0,0 +1,13 @@
+
diff --git a/data/styles/clear/style-night/symbols/sample_collection-m.svg b/data/styles/clear/style-night/symbols/sample_collection-m.svg
new file mode 100644
index 0000000000..60191f315d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/sample_collection-m.svg
@@ -0,0 +1,15 @@
+
diff --git a/data/styles/clear/style-night/symbols/speech_therapist-m.svg b/data/styles/clear/style-night/symbols/speech_therapist-m.svg
new file mode 100644
index 0000000000..c89fdabefc
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/speech_therapist-m.svg
@@ -0,0 +1,13 @@
+