amenity =drinking_water sounds right for the drinkable water, I wouldn't use tank, rather also add a man_made=cistern for the kind of object
cheers Martin
_______________________________________________ Tagging mailing list Tagging@openstreetmap.org https://lists.openstreetmap.org/listinfo/tagging
