extracted latlng to new class, added unit tests
resolving conflicts