Switch RMPointAnnotation to RMAnnotation and RMMapLayer