(#47) The map click handler is now activated/deactivated based on mapMode state.