GetMapPoint re-organiztation