An Improved Upscaling Method to Construct a Global River Map