added MapService to controller
added MapService to controller
merged