added OCMapView and modeified categories