Feat/geo servicecal loc