Stop rendering name on waterway=riverbank and water=river areas

[matkoniecz]

Expected behavior

name on water=river areas is not rendered, the same way names on waterway=riverbank is not rendered

Actual behavior

Currently this labels are rendered what may mislead mappers and encourage them to map this way

Links and screenshots illustrating the problem

https://www.openstreetmap.org/#map=17/51.31935/15.00390

See also https://josm.openstreetmap.de/ticket/21461

[imagico]

This would be good to combine with #3896/#4128 so mappers better understand why certain water polygons get a label while others do not.

[DaveF63]

Similar for water=canal, stream & all other linear water areas.

[pnorman]

We actually do this for waterway=riverbank already. It's just natural=water water=river (and canal, etc) which are new tags and so don't have support. I've edited the original issue.

I also had a look at fixing this, but my inclination was to pull water area labels out of amenity-points and into their own layer.

[DaveF63]

That natural=water schema is described as "new" shows how outdated OSM-Carto is. Changing the labelling rule for these tags shouldn't even require discussion. The two tagging schemas have precisely the same meaning, they are like-for-like.