Added the edge and vertex location holders
finish query functions for map
add radius test
merge conflicts
merge local branches and fix login and join for tests