wip

refactoring
begin postgis spatial index
clean up