Fix drag movement by moving drag functionality outside threshold control

This change means that a click is easily discernible from drag and zoom movements, and the drag and zoom functionality works as it should.

Next is to replace toast control message with marker functionality