using free draw, the maps state is returned afterwards
allow options to be reverted by revertmapoptions
Merge pull request #895 from nmccready/feature/nmccready/bug_free_draw_fix_map_state_after_draw

using free draw, the maps state is returned afterwards