Edinburgh, where the sun has also been welcome, has avoided drought warnings