Add waterway=wadi to default and copy waterways code from UniRS (more flexible)