BANGKOK: A map of catchment areas nationwide will be drawn as part of long-term measures to battle perennial drought.