Work on #3586: remove multiple geodirobservers manipulations in map