Polygon labeling highly non-systematic and confusing in styling and use of label offsets

[imagico]

When testing #4593 i noticed that labeling of the features using that polygon fill color is a mess. here is z15, z16 and z17 for the very light green features:

Note this problem is not limited to the features shown, it is also present with others. Also note the outlining is different in a non-intuitive way as well.

Related to #234.

A thorough solution of this would probably be related to #3880.

[map-per]

Moving the text form the duplicate issue #4802:

Actual behavior

swimming facilities (leisure=water_park, leisure=sports_centre + sport=swimming and leisure=swimming_area) are displayed with an icon until zoom 17. For zoom 16-14 no icon is used but the label still has an offset (text-dy) of 11 which looks weird.

Expected behavior

I would either display the icon together with the label (similar to how it is done for golf_course) or display the label without an offset. I think showing the label is better as this avoids confusion with similar looking leisure=parks.

Code

master...map-per:openstreetmap-carto:water_park

Screenshots with links illustrating the problem

(https://www.openstreetmap.org/way/174549769)

• icon
  
  

• no icon, without offset
  
  

[map-per]

Are you interested in a pull request / implementation for this?