Minimal healthcare=* support

cf #310

diff --git a/icons/poi/doctor.svg b/icons/poi/doctor.svg
new file mode 120000 (symlink)
index 0000000..0ffca1d
--- /dev/null
+++ b/icons/poi/doctor.svg
@@ -0,0 +1 @@
+doctors.svg
\ No newline at end of file

diff --git a/poi.mss b/poi.mss
index e9b62ebb543130fc526d67df1851aeeccf60775c..05c7a8dd04965fcfd05eb97c3ae10b7b42b65aad 100644 (file)
--- a/poi.mss
+++ b/poi.mss
@@ -43,11 +43,17 @@
         [main='post_office'],
         [main='embassy'],
         [main='doctors'],
+        [main='doctor'],
         [main='clinic'],
         [main='hospital'],
+        [main='center'],
         [main='border_control'] {
             marker-file: url('icons/poi/[main].svg');
             marker-clip:false;
+            // healthcare=center
+            [main='center'] {
+                marker-file: url('icons/poi/clinic.svg');
+            }
         }
         [main='government'],
         [main='ngo'] {

diff --git a/project.yml b/project.yml
index ffa2d3b98e4498ffbef25bc0365bac4973d8253a..21fc60412790f1b59e6239cd7994afca4088b341 100644 (file)
--- a/project.yml
+++ b/project.yml
@@ -522,13 +522,13 @@ Layer:
       <<: *postgis
       table: |-
         ( SELECT
-            way, name, COALESCE(amenity, leisure, shop, tourism, office, highway, tags->'emergency', barrier) AS main, man_made, religion,
+            way, name, COALESCE(amenity, leisure, tags->'healthcare', shop, tourism, office, highway, tags->'emergency', barrier) AS main, man_made, religion,
             CASE WHEN shop IS NOT NULL AND shop!='no' THEN shop ELSE NULL END AS shop,
             tags->'craft' as craft, tags->'pump' as pump, tags->'drinking_water' as drinking_water, "tower:type", power, tags->'content' AS content, lower(operator) AS operator
           FROM
             planet_osm_point
           WHERE
-            amenity IS NOT NULL OR shop IS NOT NULL OR tags ? 'craft'
+            amenity IS NOT NULL OR shop IS NOT NULL OR tags ? 'craft' OR tags ? 'healthcare'
             OR tourism IN ('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
             OR highway IN ('bus_stop','traffic_signals','ford', 'street_lamp')
             OR man_made IN ('mast','water_tower', 'tower', 'water_well', 'watermill', 'storage_tank')
@@ -547,14 +547,14 @@ Layer:
       <<: *postgis
       table: |-
         ( SELECT
-            way, name, COALESCE(amenity, leisure, shop, tourism, office, highway, tags->'emergency', barrier) AS main, man_made, religion,
+            way, name, COALESCE(amenity, leisure, tags->'healthcare', shop, tourism, office, highway, tags->'emergency', barrier) AS main, man_made, religion,
             CASE WHEN shop IS NOT NULL AND shop!='no' THEN shop ELSE NULL END AS shop,
             tags->'craft' as craft, tags->'pump' as pump, tags->'drinking_water' as drinking_water, "tower:type",
             power, tags->'content' AS content, lower(operator) AS operator
           FROM
             planet_osm_polygon
           WHERE
-            amenity IS NOT NULL OR shop IS NOT NULL
+            amenity IS NOT NULL OR shop IS NOT NULL OR tags ? 'healthcare'
             OR tourism IN ('alpine_hut','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
             OR highway IN ('bus_stop','traffic_signals') OR historic in ('memorial','archaeological_site') OR leisure='playground'
             OR power IN ('plant', 'sub_station') OR office IN ('ngo', 'government')