[styles] Raise medical, educational, sport areas visibility, add more types

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

data/styles/default/include/Basemap.mapcss

@@ -333,8 +333,6 @@ line[waterway][tunnel]
 
 area|z10-[aeroway=aerodrome][aerodrome=international],
 area|z10-[aeroway=aerodrome],
-area|z14-[amenity=hospital],
-area|z14-[amenity=doctors],
 area|z14-[highway=pedestrian][area?],
 area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?],
@@ -342,24 +340,12 @@ area|z14-[area:highway=footway],
 area|z14-[area:highway=living_street],
 area|z14-[amenity=grave_yard],
 area|z14-[landuse=cemetery],
-area|z14-[amenity=university],
 area|z15-[landuse=churchyard],
-area|z15-[leisure=pitch],
-area|z15-[leisure=stadium],
-area|z15-[leisure=track][area?],
 area|z15-[amenity=parking],
-area|z15-[amenity=kindergarten],
-area|z15-[amenity=college],
-area|z15-[amenity=school],
-area|z15-[landuse=education],
 area|z16-[public_transport=platform],
 area|z16-[railway=platform],
-area|z15-[leisure=playground],
 {fill-opacity: 1;}
 
-area|z15-[amenity=university],
-{fill-opacity: 0.9;}
-
 /* 7.1 Industrial */
 
 area|z13-[landuse=industrial],
@@ -376,31 +362,38 @@ area|z13-[power=generator],
 
 /* 7.2 Hospital */
 
-area|z14-[amenity=hospital],
+area|z13-[amenity=hospital],
-area|z14-[amenity=doctors]
+area|z13-[amenity=clinic],
-{fill-color: @hospital;}
+area|z15-[amenity=doctors],
+{fill-color: @hospital; fill-opacity: 1;}
 
 /* 7.3 University & Sport */
 
-area|z14-[amenity=university],
+area|z13-[amenity=university],
-area|z15-[amenity=college],
+area|z13-[amenity=college],
-area|z15-[amenity=school],
+area|z13-[amenity=school],
-area|z15-[amenity=kindergarten],
+area|z13-[amenity=kindergarten],
-area|z15-[landuse=education],
+area|z13-[amenity=childcare],
-{fill-color: @university;}
+area|z13-[landuse=education],
+{fill-color: @university; fill-opacity: 1;}
+
+area|z15-[amenity=university],
+{fill-opacity: 0.9;}
+
 
 area|z15-[leisure=pitch],
 area|z15-[leisure=track][area?],
-{fill-color: @sport2;}
+area|z15-[leisure=fitness_station],
+{fill-color: @sport2; fill-opacity: 1;}
 
 area|z15-[leisure=playground],
-{fill-color: @playground;}
+{fill-color: @playground; fill-opacity: 1;}
 
-area|z15-[leisure=stadium]
+area|z13-[leisure=stadium],
-{fill-color: @sport1;}
+{fill-color: @sport1; fill-opacity: 1;}
 
-area|z15-[leisure=sports_centre]
+area|z13-[leisure=sports_centre],
-{fill-color: @sport0;}
+{fill-color: @sport0; fill-opacity: 1;}
 
 area|z14-[piste:type=snow_park],
 {fill-color: @piste; fill-opacity: 0.2;}

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -130,6 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z14-)
 natural-scree                                       # area z11-
@@ -174,6 +175,8 @@ power-generator-wind
 === 50
 
 amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-clinic
+amenity-childcare
 amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)

data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt

@@ -130,6 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
+leisure-fitness_station
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z13-)
 natural-scree                                       # area z11-
@@ -174,6 +175,8 @@ power-generator-wind
 === 50
 
 amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-clinic
+amenity-childcare
 amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
 amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)