Riemann Problems and the WAF Method for the Two-Dimensional Shallow Water Equations