[DF-3978] refactor geometry generation method