getPickupLocation and getDropPosition updated

Moving towards something working with the drillHoles.py layout for MMFO launch