Explicitly handle markers rather than handling anything that is not a polygon, circle etc. refs #250
Only re-enable map dragging if it was set in the first place. fixes #258
Cleanup code
Fix inclusion of circle drawing options. fixes #260