Added ON_MAP state handling to setState #4