geominfo re-refactor