Re: [Tagging] Restaurant that doesn't sell alcohol...

Maybe the"drink:" key, it's used to indicate which drink are sold/served. (drink=* - A suggested tag for marking availability of special beverages; see https://wiki.openstreetmap.org/wiki/Key:drink) Key:drink - OpenStreetMap Wiki

Re: [Tagging] Water source types

>Because drinking water is a *property* of sources, water wells, >fountains, drinking fountains (bubblers) etc., I think it makes more >sense to tag these objects and to add drinking_water=yes tags >(discouraging the use of `amenity=drinking_water`). >As for the rendering, I like how OsmAnd render