Makes map service check style compliant

Can you pull out this anonymous inner class. Code is difficult to read like this.