fixed and added tests for basemap chooser