fix #11223 - remove waterway=wadi and waterway=rapids, update natural=ridge, natural=valley and intermittent=yes
waterway=wadi
waterway=rapids
natural=ridge
natural=valley
intermittent=yes