Continued work on map directive, added location data factory