Another forum has started a database of Water Points. It might be a useful idea to do the same here, but basically this post is a reminder that if you have either of these units but in particular the 20 litre Jerry Can you won't need to worry about water POIs.
www.lifesaversystems.com
www.lifesaversystems.com