Use Dependency Injection on location_selector module

Created the patch and module is working as expected.

Applied above patch and confirm patch is working fine except a miner whitespace error.
Attaching SS for reference.