From c31953284f28e44816e296641da84e72c74f221d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Mon, 17 Sep 2018 23:41:29 +0200 Subject: [PATCH 01/22] change healthcare colour --- amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index 97fb4313ea..cd8402fcd3 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -7,7 +7,7 @@ @accommodation-icon: @transportation-icon; @accommodation-text: @transportation-text; @airtransport: #8461C4; //also ferry_terminal -@health-color: #da0092; +@health-color: #DA0000; @amenity-brown: #734a08; @gastronomy-icon: #C77400; @gastronomy-text: darken(@gastronomy-icon, 5%); From 503eb4820961c21bc10658db19867aae5a3a35b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 4 Oct 2018 10:27:37 +0200 Subject: [PATCH 02/22] add support of healthcare tag scheme --- amenity-points.mss | 17 ++++++++++++++++- project.mml | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index cd8402fcd3..bd0cad7e2f 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -565,6 +565,20 @@ marker-clip: false; } + [feature = 'healthcare'] { + marker-placement: interior; + marker-clip: false; + marker-fill: @health-color; + [zoom >= 17] { + marker-width: 4; + marker-line-width: 0; + } + [zoom >= 18] { + marker-width: 6; + marker-line-width: 0; + } + } + [feature = 'amenity_place_of_worship'][zoom >= 16] { marker-file: url('symbols/amenity/place_of_worship.svg'); marker-fill: #000000; @@ -2460,7 +2474,8 @@ [feature = 'amenity_pharmacy'], [feature = 'amenity_doctors'], [feature = 'amenity_dentist'], - [feature = 'amenity_veterinary'] { + [feature = 'amenity_veterinary'], + [feature = 'healthcare_laboratory'] { [zoom >= 17] { text-name: "[name]"; text-size: @standard-font-size; diff --git a/project.mml b/project.mml index 52633c9ec4..d2ef8cd50d 100644 --- a/project.mml +++ b/project.mml @@ -1482,6 +1482,9 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN amenity ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, From e243ff103d3da4561704488221d59e7a08bc89e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 4 Oct 2018 10:28:21 +0200 Subject: [PATCH 03/22] replace hospital icon --- symbols/amenity/hospital.svg | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/symbols/amenity/hospital.svg b/symbols/amenity/hospital.svg index 66e5fc5b5e..5e9d2ab74d 100644 --- a/symbols/amenity/hospital.svg +++ b/symbols/amenity/hospital.svg @@ -1,20 +1,6 @@ - - - - - - + + + + + From 6481cee12d2e11f06e8732de0ab9abcc6737caec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 4 Oct 2018 11:55:39 +0200 Subject: [PATCH 04/22] add support of healthcare tag scheme --- amenity-points.mss | 39 ++++++++++++++++++++++++++------------- project.mml | 17 +++++++++++++++-- 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index bd0cad7e2f..ea8ca76022 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -565,19 +565,16 @@ marker-clip: false; } - [feature = 'healthcare'] { - marker-placement: interior; - marker-clip: false; - marker-fill: @health-color; - [zoom >= 17] { - marker-width: 4; - marker-line-width: 0; - } - [zoom >= 18] { - marker-width: 6; - marker-line-width: 0; - } + [feature = 'healthcare'][zoom >= 17] { + marker-width: 4; + [zoom >= 18] { + marker-width: 6; } + marker-line-width: 0; + marker-placement: interior; + marker-clip: false; + marker-fill: @health-color; + } [feature = 'amenity_place_of_worship'][zoom >= 16] { marker-file: url('symbols/amenity/place_of_worship.svg'); @@ -2475,7 +2472,23 @@ [feature = 'amenity_doctors'], [feature = 'amenity_dentist'], [feature = 'amenity_veterinary'], - [feature = 'healthcare_laboratory'] { + [feature = 'healthcare_alternative'], + [feature = 'healthcare_audiologist'], + [feature = 'healthcare_birthing_center'], + [feature = 'healthcare_blood_bank'], + [feature = 'healthcare_blood_donation'], + [feature = 'healthcare_centre'], + [feature = 'healthcare_chiropractor'], + [feature = 'healthcare_laboratory'], + [feature = 'healthcare_midwife'], + [feature = 'healthcare_occupational_therapist'], + [feature = 'healthcare_optometrist'], + [feature = 'healthcare_physiotherapist'], + [feature = 'healthcare_podiatrist'], + [feature = 'healthcare_psychotherapist'], + [feature = 'healthcare_rehabilitation'], + [feature = 'healthcare_speech_therapist'], + [feature = 'healthcare_yes'] { [zoom >= 17] { text-name: "[name]"; text-size: @standard-font-size; diff --git a/project.mml b/project.mml index d2ef8cd50d..1dd20d3484 100644 --- a/project.mml +++ b/project.mml @@ -1483,8 +1483,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN amenity ELSE NULL END, + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, @@ -1541,6 +1541,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR healthcare IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -1603,6 +1604,9 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -1679,6 +1683,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR healthcare IS NOT NULL OR shop IS NOT NULL OR tags->'advertising' IN ('column') OR (tags->'office') IS NOT NULL @@ -2066,6 +2071,9 @@ Layer: 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', @@ -2136,6 +2144,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR healthcare IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -2237,6 +2246,9 @@ Layer: 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', @@ -2316,6 +2328,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR healthcare IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL From b6fe1b13d241babf735160a07cbda7c9b04f03c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 15:21:01 +0200 Subject: [PATCH 05/22] support healthcare tag scheme --- amenity-points.mss | 34 ++++++++++++++++++++++++++-------- openstreetmap-carto.lua | 1 + project.mml | 30 +++++++++++++++++------------- 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index ea8ca76022..1addaa9830 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -565,15 +565,33 @@ marker-clip: false; } - [feature = 'healthcare'][zoom >= 17] { - marker-width: 4; - [zoom >= 18] { - marker-width: 6; + [feature = 'healthcare_alternative'], + [feature = 'healthcare_audiologist'], + [feature = 'healthcare_birthing_center'], + [feature = 'healthcare_blood_bank'], + [feature = 'healthcare_blood_donation'], + [feature = 'healthcare_centre'], + [feature = 'healthcare_chiropractor'], + [feature = 'healthcare_laboratory'], + [feature = 'healthcare_midwife'], + [feature = 'healthcare_occupational_therapist'], + [feature = 'healthcare_optometrist'], + [feature = 'healthcare_physiotherapist'], + [feature = 'healthcare_podiatrist'], + [feature = 'healthcare_psychotherapist'], + [feature = 'healthcare_rehabilitation'], + [feature = 'healthcare_speech_therapist'], + [feature = 'healthcare_yes'] { + [zoom >= 17] { + marker-width: 4; + [zoom >= 18] { + marker-width: 6; + } + marker-line-width: 0; + marker-placement: interior; + marker-clip: false; + marker-fill: @health-color; } - marker-line-width: 0; - marker-placement: interior; - marker-clip: false; - marker-fill: @health-color; } [feature = 'amenity_place_of_worship'][zoom >= 16] { diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua index 151a7b09be..9417741390 100644 --- a/openstreetmap-carto.lua +++ b/openstreetmap-carto.lua @@ -14,6 +14,7 @@ local polygon_keys = { 'building', 'building:part', 'harbour', + 'healthcare', 'historic', 'landuse', 'leisure', diff --git a/project.mml b/project.mml index 1dd20d3484..5d71a1d44b 100644 --- a/project.mml +++ b/project.mml @@ -1482,9 +1482,9 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, + 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, @@ -1523,6 +1523,7 @@ Layer: tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, tags->'information' as information, + tags->'healthcare' as healthcare, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -1541,7 +1542,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR healthcare IS NOT NULL + OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -1604,9 +1605,9 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, + 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -1665,6 +1666,7 @@ Layer: tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, tags->'information' as information, + tags->'healthcare' as healthcare, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -1683,7 +1685,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR healthcare IS NOT NULL + OR (tags->'healthcare') IS NOT NULL OR shop IS NOT NULL OR tags->'advertising' IN ('column') OR (tags->'office') IS NOT NULL @@ -2071,9 +2073,9 @@ Layer: 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, + 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', @@ -2135,6 +2137,7 @@ Layer: tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, tags->'information' as information, + tags->'healthcare' as healthcare, ref, way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building @@ -2144,7 +2147,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR healthcare IS NOT NULL + OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -2246,9 +2249,9 @@ Layer: 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN healthcare IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN healthcare ELSE NULL END, + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', + 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', @@ -2319,6 +2322,7 @@ Layer: tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, tags->'information' as information, + tags->'healthcare' as healthcare, ref, NULL AS way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building @@ -2328,7 +2332,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR healthcare IS NOT NULL + OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL From 815b1659b434ccdd03427fea2e082856471d1b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 22:23:04 +0200 Subject: [PATCH 06/22] change health colour and shift dentist icon to z18 --- amenity-points.mss | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 1addaa9830..e70f562740 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -7,7 +7,7 @@ @accommodation-icon: @transportation-icon; @accommodation-text: @transportation-text; @airtransport: #8461C4; //also ferry_terminal -@health-color: #DA0000; +@health-color: #CC0000; @amenity-brown: #734a08; @gastronomy-icon: #C77400; @gastronomy-text: darken(@gastronomy-icon, 5%); @@ -551,8 +551,14 @@ marker-clip: false; } - [feature = 'amenity_dentist'][zoom >= 17] { - marker-file: url('symbols/amenity/dentist.svg'); + [feature = 'amenity_dentist'] { + [zoom >= 17][zoom < 18] { + marker-width: 4; + marker-line-width: 0; + } + [zoom >= 18] { + marker-file: url('symbols/amenity/dentist.svg'); + } marker-fill: @health-color; marker-placement: interior; marker-clip: false; From 8918768d18977617ff734f162fffd9d39c0f2811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 11:59:19 +0200 Subject: [PATCH 07/22] shift amenity=doctors to z17 --- amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index e70f562740..24a3bb3736 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -543,7 +543,7 @@ marker-clip: false; } - [feature = 'amenity_clinic'][zoom >= 16], + [feature = 'amenity_clinic'][zoom >= 17], [feature = 'amenity_doctors'][zoom >= 17] { marker-file: url('symbols/amenity/doctors.svg'); marker-fill: @health-color; From 60a4b88ca85aee1b90ab903931d1eee712fc581a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 26 Oct 2018 10:31:58 +0200 Subject: [PATCH 08/22] add healthcare duplications with amenity and remove whitespaces --- amenity-points.mss | 46 +++++++++++++++++++++++++++------------------- project.mml | 20 +++++++++++--------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 24a3bb3736..a04f648b55 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -289,7 +289,8 @@ marker-clip: false; } - [feature = 'amenity_hospital'][zoom >= 15] { + [feature = 'amenity_hospital'][zoom >= 15], + [feature = 'healthcare_hospital'][zoom >= 15] { marker-file: url('symbols/amenity/hospital.svg'); marker-fill: @health-color; marker-placement: interior; @@ -544,14 +545,17 @@ } [feature = 'amenity_clinic'][zoom >= 17], - [feature = 'amenity_doctors'][zoom >= 17] { + [feature = 'healthcare_clinic'][zoom >= 17], + [feature = 'amenity_doctors'][zoom >= 17], + [feature = 'healthcare_doctors'][zoom >= 17] { marker-file: url('symbols/amenity/doctors.svg'); marker-fill: @health-color; marker-placement: interior; marker-clip: false; } - [feature = 'amenity_dentist'] { + [feature = 'amenity_dentist'], + [feature = 'healthcare_dentist'] { [zoom >= 17][zoom < 18] { marker-width: 4; marker-line-width: 0; @@ -2477,7 +2481,8 @@ text-placement: interior; } - [feature = 'amenity_hospital'][zoom >= 16] { + [feature = 'amenity_hospital'][zoom >= 16], + [feature = 'healthcare_hospital'][zoom >= 16] { text-name: "[name]"; text-fill: @health-color; text-size: @standard-font-size; @@ -2496,22 +2501,25 @@ [feature = 'amenity_doctors'], [feature = 'amenity_dentist'], [feature = 'amenity_veterinary'], - [feature = 'healthcare_alternative'], - [feature = 'healthcare_audiologist'], - [feature = 'healthcare_birthing_center'], - [feature = 'healthcare_blood_bank'], - [feature = 'healthcare_blood_donation'], - [feature = 'healthcare_centre'], - [feature = 'healthcare_chiropractor'], - [feature = 'healthcare_laboratory'], - [feature = 'healthcare_midwife'], - [feature = 'healthcare_occupational_therapist'], - [feature = 'healthcare_optometrist'], - [feature = 'healthcare_physiotherapist'], - [feature = 'healthcare_podiatrist'], + [feature = 'healthcare_alternative'], + [feature = 'healthcare_audiologist'], + [feature = 'healthcare_birthing_center'], + [feature = 'healthcare_blood_bank'], + [feature = 'healthcare_blood_donation'], + [feature = 'healthcare_centre'], + [feature = 'healthcare_chiropractor'], + [feature = 'healthcare_clinic'], + [feature = 'healthcare_dentist'], + [feature = 'healthcare_doctors'], + [feature = 'healthcare_laboratory'], + [feature = 'healthcare_midwife'], + [feature = 'healthcare_occupational_therapist'], + [feature = 'healthcare_optometrist'], + [feature = 'healthcare_physiotherapist'], + [feature = 'healthcare_podiatrist'], [feature = 'healthcare_psychotherapist'], - [feature = 'healthcare_rehabilitation'], - [feature = 'healthcare_speech_therapist'], + [feature = 'healthcare_rehabilitation'], + [feature = 'healthcare_speech_therapist'], [feature = 'healthcare_yes'] { [zoom >= 17] { text-name: "[name]"; diff --git a/project.mml b/project.mml index 5d71a1d44b..32dc491141 100644 --- a/project.mml +++ b/project.mml @@ -121,6 +121,7 @@ Layer: 'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police') THEN amenity ELSE NULL END)) AS amenity, + ('healthcare_' || (CASE WHEN healthcare IN ('clinic' ,'hospital') THEN healthcare ELSE NULL END)) AS healthcare, ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture', 'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial', @@ -145,6 +146,7 @@ Layer: OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'taxi', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police') + OR healthcare IN ('clinic', 'hospital') OR man_made IN ('works', 'wastewater_plant','water_works') OR military IN ('danger_area') OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') @@ -1483,8 +1485,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', + 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, @@ -1606,8 +1608,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', + 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -2074,8 +2076,8 @@ Layer: 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', + 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', @@ -2249,9 +2251,9 @@ Layer: 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', - 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', + 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', From 2480ce28eaee5f86d5f9015d3461630a3d7a1b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Tue, 6 Nov 2018 15:31:04 +0100 Subject: [PATCH 09/22] fix error of healthcare column --- project.mml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.mml b/project.mml index 32dc491141..7ac1401124 100644 --- a/project.mml +++ b/project.mml @@ -121,7 +121,7 @@ Layer: 'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police') THEN amenity ELSE NULL END)) AS amenity, - ('healthcare_' || (CASE WHEN healthcare IN ('clinic' ,'hospital') THEN healthcare ELSE NULL END)) AS healthcare, + ('healthcare_' || (CASE WHEN tags->'healthcare' IN ('clinic' ,'hospital') THEN tags->'healthcare' ELSE NULL END)) AS healthcare, ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture', 'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial', @@ -146,7 +146,7 @@ Layer: OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'taxi', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal', 'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police') - OR healthcare IN ('clinic', 'hospital') + OR tags->'healthcare' IN ('clinic', 'hospital') OR man_made IN ('works', 'wastewater_plant','water_works') OR military IN ('danger_area') OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') From 06a2e96dbe1de2378765ac47efcf8da7264b4245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 9 Nov 2018 21:32:10 +0100 Subject: [PATCH 10/22] Fix healthcare=doctor and add healthcare=pharmacy --- amenity-points.mss | 8 +++++--- project.mml | 18 +++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 8fb6191e7e..4abf009d4c 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -595,7 +595,8 @@ } } - [feature = 'amenity_pharmacy'][zoom >= 17] { + [feature = 'amenity_pharmacy'][zoom >= 17], + [feature = 'healthcare_pharmacy'][zoom >= 17] { marker-file: url('symbols/amenity/pharmacy.svg'); marker-fill: @health-color; marker-placement: interior; @@ -605,7 +606,7 @@ [feature = 'amenity_clinic'][zoom >= 17], [feature = 'healthcare_clinic'][zoom >= 17], [feature = 'amenity_doctors'][zoom >= 17], - [feature = 'healthcare_doctors'][zoom >= 17] { + [feature = 'healthcare_doctor'][zoom >= 17] { marker-file: url('symbols/amenity/doctors.svg'); marker-fill: @health-color; marker-placement: interior; @@ -2555,9 +2556,10 @@ [feature = 'healthcare_chiropractor'], [feature = 'healthcare_clinic'], [feature = 'healthcare_dentist'], - [feature = 'healthcare_doctors'], + [feature = 'healthcare_doctor'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], + [feature = 'healthcare_pharmacy'], [feature = 'healthcare_occupational_therapist'], [feature = 'healthcare_optometrist'], [feature = 'healthcare_physiotherapist'], diff --git a/project.mml b/project.mml index caf07de166..d62729664c 100644 --- a/project.mml +++ b/project.mml @@ -1460,8 +1460,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', - 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, @@ -1597,8 +1597,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', - 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -2079,8 +2079,8 @@ Layer: 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', - 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', @@ -2266,9 +2266,9 @@ Layer: 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctors', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', - 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', + 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', From e73e5d63b8c075ba12b274732cf838b914f59483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 9 Nov 2018 21:43:16 +0100 Subject: [PATCH 11/22] remove whitespaces --- amenity-points.mss | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 4abf009d4c..b55bc370d7 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -634,22 +634,22 @@ marker-clip: false; } - [feature = 'healthcare_alternative'], - [feature = 'healthcare_audiologist'], - [feature = 'healthcare_birthing_center'], - [feature = 'healthcare_blood_bank'], - [feature = 'healthcare_blood_donation'], - [feature = 'healthcare_centre'], - [feature = 'healthcare_chiropractor'], - [feature = 'healthcare_laboratory'], - [feature = 'healthcare_midwife'], - [feature = 'healthcare_occupational_therapist'], - [feature = 'healthcare_optometrist'], - [feature = 'healthcare_physiotherapist'], - [feature = 'healthcare_podiatrist'], + [feature = 'healthcare_alternative'], + [feature = 'healthcare_audiologist'], + [feature = 'healthcare_birthing_center'], + [feature = 'healthcare_blood_bank'], + [feature = 'healthcare_blood_donation'], + [feature = 'healthcare_centre'], + [feature = 'healthcare_chiropractor'], + [feature = 'healthcare_laboratory'], + [feature = 'healthcare_midwife'], + [feature = 'healthcare_occupational_therapist'], + [feature = 'healthcare_optometrist'], + [feature = 'healthcare_physiotherapist'], + [feature = 'healthcare_podiatrist'], [feature = 'healthcare_psychotherapist'], - [feature = 'healthcare_rehabilitation'], - [feature = 'healthcare_speech_therapist'], + [feature = 'healthcare_rehabilitation'], + [feature = 'healthcare_speech_therapist'], [feature = 'healthcare_yes'] { [zoom >= 17] { marker-width: 4; From c96dd04ef20ead42a0824da837cf0c29ed90a9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 9 Nov 2018 21:44:21 +0100 Subject: [PATCH 12/22] change to darker colour --- amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index b55bc370d7..617d3ba3e2 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -7,7 +7,7 @@ @accommodation-icon: @transportation-icon; @accommodation-text: @transportation-text; @airtransport: #8461C4; //also ferry_terminal -@health-color: #CC0000; +@health-color: #BF0000; @amenity-brown: #734a08; @gastronomy-icon: #C77400; @gastronomy-text: darken(@gastronomy-icon, 5%); From 5f22b9c960753b914815a0ca04b37ff769e99098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Tue, 20 Nov 2018 22:04:15 +0100 Subject: [PATCH 13/22] remove healthcare in lua script --- openstreetmap-carto.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua index 9417741390..151a7b09be 100644 --- a/openstreetmap-carto.lua +++ b/openstreetmap-carto.lua @@ -14,7 +14,6 @@ local polygon_keys = { 'building', 'building:part', 'harbour', - 'healthcare', 'historic', 'landuse', 'leisure', From dc818f210475f74108c9115e85a48f08509d6aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Tue, 20 Nov 2018 22:04:42 +0100 Subject: [PATCH 14/22] fix zoom condition of dentist --- amenity-points.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 617d3ba3e2..6ec52ce13d 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -613,8 +613,8 @@ marker-clip: false; } - [feature = 'amenity_dentist'], - [feature = 'healthcare_dentist'] { + [feature = 'amenity_dentist'][zoom >= 17], + [feature = 'healthcare_dentist'][zoom >= 17] { [zoom >= 17][zoom < 18] { marker-width: 4; marker-line-width: 0; From e72e3d86db223ce36257d82029fbd2251734150e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 10:36:24 +0100 Subject: [PATCH 15/22] add hospice --- amenity-points.mss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amenity-points.mss b/amenity-points.mss index c6887cb1b5..a1bbb630b4 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -662,6 +662,7 @@ [feature = 'healthcare_blood_donation'], [feature = 'healthcare_centre'], [feature = 'healthcare_chiropractor'], + [feature = 'healthcare_hospice'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], [feature = 'healthcare_occupational_therapist'], @@ -2610,6 +2611,7 @@ [feature = 'healthcare_clinic'], [feature = 'healthcare_dentist'], [feature = 'healthcare_doctor'], + [feature = 'healthcare_hospice'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], [feature = 'healthcare_pharmacy'], From 1f6fd4ab3e27a2d50368d7821ecaac624432ea74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 10:42:52 +0100 Subject: [PATCH 16/22] group healthcare=centre with amenity=doctors --- amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index a1bbb630b4..511b19c52a 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -627,6 +627,7 @@ [feature = 'amenity_clinic'][zoom >= 17], [feature = 'healthcare_clinic'][zoom >= 17], [feature = 'amenity_doctors'][zoom >= 17], + [feature = 'healthcare_centre'], [feature = 'healthcare_doctor'][zoom >= 17] { marker-file: url('symbols/amenity/doctors.svg'); marker-fill: @health-color; @@ -660,7 +661,6 @@ [feature = 'healthcare_birthing_center'], [feature = 'healthcare_blood_bank'], [feature = 'healthcare_blood_donation'], - [feature = 'healthcare_centre'], [feature = 'healthcare_chiropractor'], [feature = 'healthcare_hospice'], [feature = 'healthcare_laboratory'], From 01aaf06c3f76f5fc0feac41a6e98b8122137b41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 17:39:36 +0100 Subject: [PATCH 17/22] add specific behaviour for healthcare=doctor --- amenity-points.mss | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 511b19c52a..d1ce1afbcf 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -627,14 +627,26 @@ [feature = 'amenity_clinic'][zoom >= 17], [feature = 'healthcare_clinic'][zoom >= 17], [feature = 'amenity_doctors'][zoom >= 17], - [feature = 'healthcare_centre'], - [feature = 'healthcare_doctor'][zoom >= 17] { + [feature = 'healthcare_centre'][zoom >= 17] { marker-file: url('symbols/amenity/doctors.svg'); marker-fill: @health-color; marker-placement: interior; marker-clip: false; } + [feature = 'healthcare_doctor'][zoom >= 17] { + [zoom >= 17][zoom < 18] { + marker-width: 4; + marker-line-width: 0; + } + [zoom >= 18] { + marker-file: url('symbols/amenity/doctors.svg'); + } + marker-fill: @health-color; + marker-placement: interior; + marker-clip: false; + } + [feature = 'amenity_dentist'][zoom >= 17], [feature = 'healthcare_dentist'][zoom >= 17] { [zoom >= 17][zoom < 18] { From 7956ac61e718fa529e5f422d4570b21d0314c270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 17:41:02 +0100 Subject: [PATCH 18/22] remove healthcare=pharmacy --- amenity-points.mss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index d1ce1afbcf..2dc07f65dd 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -616,8 +616,7 @@ } } - [feature = 'amenity_pharmacy'][zoom >= 17], - [feature = 'healthcare_pharmacy'][zoom >= 17] { + [feature = 'amenity_pharmacy'][zoom >= 17] { marker-file: url('symbols/amenity/pharmacy.svg'); marker-fill: @health-color; marker-placement: interior; @@ -2626,7 +2625,6 @@ [feature = 'healthcare_hospice'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], - [feature = 'healthcare_pharmacy'], [feature = 'healthcare_occupational_therapist'], [feature = 'healthcare_optometrist'], [feature = 'healthcare_physiotherapist'], From b16bdc3283bfabc3ba8cc0a9ea951e4cf6bdd1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 17:44:42 +0100 Subject: [PATCH 19/22] move block amenity=pharmacy --- amenity-points.mss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 2dc07f65dd..8aa4c8313f 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -616,13 +616,6 @@ } } - [feature = 'amenity_pharmacy'][zoom >= 17] { - marker-file: url('symbols/amenity/pharmacy.svg'); - marker-fill: @health-color; - marker-placement: interior; - marker-clip: false; - } - [feature = 'amenity_clinic'][zoom >= 17], [feature = 'healthcare_clinic'][zoom >= 17], [feature = 'amenity_doctors'][zoom >= 17], @@ -660,6 +653,13 @@ marker-clip: false; } + [feature = 'amenity_pharmacy'][zoom >= 17] { + marker-file: url('symbols/amenity/pharmacy.svg'); + marker-fill: @health-color; + marker-placement: interior; + marker-clip: false; + } + [feature = 'amenity_veterinary'][zoom >= 17] { marker-file: url('symbols/amenity/veterinary.svg'); marker-fill: @health-color; From dfc4a2a31c08ddd6bf37cc31343b526f30774068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 17:53:44 +0100 Subject: [PATCH 20/22] change chiropractor to dialysis and remove healthcare=hospice --- amenity-points.mss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 8aa4c8313f..3c9fd3e42c 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -672,8 +672,7 @@ [feature = 'healthcare_birthing_center'], [feature = 'healthcare_blood_bank'], [feature = 'healthcare_blood_donation'], - [feature = 'healthcare_chiropractor'], - [feature = 'healthcare_hospice'], + [feature = 'healthcare_dialysis'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], [feature = 'healthcare_occupational_therapist'], @@ -2618,11 +2617,10 @@ [feature = 'healthcare_blood_bank'], [feature = 'healthcare_blood_donation'], [feature = 'healthcare_centre'], - [feature = 'healthcare_chiropractor'], [feature = 'healthcare_clinic'], [feature = 'healthcare_dentist'], + [feature = 'healthcare_dialysis'], [feature = 'healthcare_doctor'], - [feature = 'healthcare_hospice'], [feature = 'healthcare_laboratory'], [feature = 'healthcare_midwife'], [feature = 'healthcare_occupational_therapist'], From a3b157ef5a2d5caed74fb2e272c957b029a03e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Thu, 22 Nov 2018 18:07:21 +0100 Subject: [PATCH 21/22] move block amenity=hospital with other amenity/healthcare features --- amenity-points.mss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 3c9fd3e42c..a45f2fc783 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -339,14 +339,6 @@ marker-clip: false; } - [feature = 'amenity_hospital'][zoom >= 15], - [feature = 'healthcare_hospital'][zoom >= 15] { - marker-file: url('symbols/amenity/hospital.svg'); - marker-fill: @health-color; - marker-placement: interior; - marker-clip: false; - } - [feature = 'amenity_casino'][zoom >= 17] { marker-file: url('symbols/amenity/casino.svg'); marker-fill: @amenity-brown; @@ -653,6 +645,14 @@ marker-clip: false; } + [feature = 'amenity_hospital'][zoom >= 15], + [feature = 'healthcare_hospital'][zoom >= 15] { + marker-file: url('symbols/amenity/hospital.svg'); + marker-fill: @health-color; + marker-placement: interior; + marker-clip: false; + } + [feature = 'amenity_pharmacy'][zoom >= 17] { marker-file: url('symbols/amenity/pharmacy.svg'); marker-fill: @health-color; From 3f6a811d4680b5f0c0981a0f791baf9e33d51a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 23 Nov 2018 11:47:19 +0100 Subject: [PATCH 22/22] add dialysis and remove chiropractor and pharmacy in project.mml --- project.mml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/project.mml b/project.mml index 5d1245ab4e..15f223fa02 100644 --- a/project.mml +++ b/project.mml @@ -1460,8 +1460,8 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'clinic', + 'dentist', 'dialysis', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -1598,8 +1598,8 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('parking_entrance') AND tags->'parking' IN ('underground') AND (access IS NULL OR access NOT IN ('private', 'no')) THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'clinic', + 'dentist', 'dialysis', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, @@ -2080,8 +2080,8 @@ Layer: 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'clinic', + 'dentist', 'dialysis', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', @@ -2270,9 +2270,9 @@ Layer: 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('parking_entrance') AND tags->'parking' IN ('underground') AND (access IS NULL OR access NOT IN ('private', 'no')) THEN amenity ELSE NULL END, - 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'chiropractor', - 'clinic', 'dentist', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', 'pharmacy', - 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, + 'healthcare_' || CASE WHEN tags->'healthcare' IN ('alternative', 'audiologist', 'birthing_center', 'blood_bank', 'blood_donation', 'centre', 'clinic', + 'dentist', 'dialysis', 'doctor', 'hospital', 'laboratory', 'midwife', 'occupational_therapist', 'optometrist', + 'physiotherapist', 'podiatrist', 'psychotherapist', 'rehabilitation', 'speech_therapist', 'yes') THEN tags->'healthcare' ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser',