diff --git a/amenity-points.mss b/amenity-points.mss index 0a954a2bf3..5163042e00 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -655,30 +655,14 @@ } [feature = 'amenity_clinic'][zoom >= 17], - [feature = 'healthcare_clinic'][zoom >= 17], - [feature = 'amenity_doctors'][zoom >= 17], - [feature = 'healthcare_centre'][zoom >= 17] { + [feature = 'amenity_doctors'][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] { + [feature = 'amenity_dentist'][zoom >= 17] { [zoom >= 17][zoom < 18] { marker-width: 4; marker-line-width: 0; @@ -691,8 +675,7 @@ marker-clip: false; } - [feature = 'amenity_hospital'][zoom >= 15], - [feature = 'healthcare_hospital'][zoom >= 15] { + [feature = 'amenity_hospital'][zoom >= 15] { marker-file: url('symbols/amenity/hospital.svg'); marker-fill: @health-color; marker-placement: interior; @@ -713,34 +696,6 @@ marker-clip: false; } - [feature = 'healthcare_alternative'], - [feature = 'healthcare_audiologist'], - [feature = 'healthcare_birthing_center'], - [feature = 'healthcare_blood_bank'], - [feature = 'healthcare_blood_donation'], - [feature = 'healthcare_dialysis'], - [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; - } - } - [feature = 'amenity_place_of_worship'][zoom >= 16] { marker-file: url('symbols/amenity/place_of_worship.svg'); marker-fill: @religious-icon; diff --git a/project.mml b/project.mml index 5383137cb4..2a00795b05 100644 --- a/project.mml +++ b/project.mml @@ -126,7 +126,6 @@ Layer: 'marketplace', 'community_centre', 'social_facility', 'arts_centre', 'parking_space', 'bus_station', 'fire_station', 'police') OR amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END)) AS amenity, - ('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', @@ -152,7 +151,6 @@ 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 tags->'healthcare' IN ('clinic', 'hospital') OR man_made IN ('works', 'wastewater_plant','water_works') OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') OR power IN ('station', 'sub_station', 'substation', 'generator') @@ -1486,9 +1484,6 @@ Layer: 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('excrement_bags', 'parking_tickets', 'public_transport_tickets') THEN amenity 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 ('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, @@ -1537,7 +1532,6 @@ Layer: tags->'castle_type' as castle_type, tags->'sport' as sport, tags->'information' as information, - tags->'healthcare' as healthcare, tags->'memorial' as memorial, tags->'artwork_type' as artwork_type, tags->'vending' as vending, @@ -1559,7 +1553,6 @@ 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', 'gallery') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -1627,9 +1620,6 @@ Layer: '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, 'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('excrement_bags', 'parking_tickets', 'public_transport_tickets') THEN amenity 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, '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, @@ -1699,7 +1689,6 @@ Layer: tags->'castle_type' as castle_type, tags->'sport' as sport, tags->'information' as information, - tags->'healthcare' as healthcare, tags->'memorial' as memorial, tags->'artwork_type' as artwork_type, tags->'vending' as vending, @@ -1721,7 +1710,6 @@ 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', 'gallery') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR (tags->'healthcare') IS NOT NULL OR shop IS NOT NULL OR tags->'advertising' IN ('column') OR (tags->'office') IS NOT NULL @@ -2124,9 +2112,6 @@ Layer: 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('excrement_bags', 'parking_tickets', 'public_transport_tickets') THEN amenity 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', 'carpet', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fabric', 'fishmonger', 'florist', 'garden_centre', @@ -2202,7 +2187,6 @@ Layer: tags->'castle_type' as castle_type, tags->'sport' as sport, tags->'information' as information, - tags->'healthcare' as healthcare, tags->'memorial' as memorial, tags->'artwork_type' as artwork_type, tags->'vending' as vending, @@ -2215,7 +2199,6 @@ 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', 'gallery') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL @@ -2326,9 +2309,6 @@ Layer: '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, 'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END, 'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('public_transport_tickets') THEN amenity 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', 'carpet', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fabric', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', @@ -2404,7 +2384,6 @@ Layer: tags->'castle_type' as castle_type, tags->'sport' as sport, tags->'information' as information, - tags->'healthcare' as healthcare, tags->'memorial' as memorial, tags->'artwork_type' as artwork_type, tags->'vending' as vending, @@ -2417,7 +2396,6 @@ 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', 'gallery') OR amenity IS NOT NULL -- skip checking a huge list and use a null check - OR (tags->'healthcare') IS NOT NULL OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR (tags->'office') IS NOT NULL