Added spring, fountain and water_well rendering
Also used drinking_water tag to add symbol to map