[#276] Refactoring SurveyedLocale creation 

Merging into `develop` rather than into the `feature/point-updates-v4` branch.