Moved all logic to service
Merge remote-tracking branch 'origin/MOB-1743-fix-pin-type-markers' into MOB-1743-fix-pin-type-markers

Conflicts:
	assets/scripts/map.js