Added userPosition.getCurrentLocation to use in lieu of defaultLocation

Now if we have a previous result from the userPosition APIs we reuse it
rather than falling back when we have something more accurate.
Updated POICollection and getMap to use getCurrentLocation

These were the only places where defaultLocation was being accessed
directly.