Used new logic for setCurrentLocation
Revert "Used new logic for setCurrentLocation"

This reverts commit ffc7ec85ff2663ca41efc84e0ed8c4a09425fd7d.
Core changes

Used new logic for setCurrentLocation.
Moved LocationType enum to ILocation interface.