Riemann problems and the WAF method for solving the two-dimensional shallow water equations