Made the annotate location function callable without a view.