Editor: Move anonymos methods to a switch statement
Editor: Ignore markerClicks when Marker tool is selected on editor

Fixes #952 by using the solution given on http://stackoverflow.com/a/19491272/2577890
Merge pull request #1186 from DroidPlanner/issue952

Make way-points non-select-able when a tool is selected in editor