Accurate fitting of the noisy irregular amplitude only main beam data is essential for the retrieval of the Planck space telescope geometry. Therefore, a novel two-step fit-ting algorithm which focuses on the spatial dependency of the in-flight measurements has been implemented. To reduce both the noise and the size of the dataset a spatial filter is applied, without reducing the amount of pat-tern information. Thereafter, a Kriging fitting is performed, providing a smooth model with a significant noise level reduction. As a result, this algorithm provides a much more accurate and smoother result, reasonable error estimates and runtimes several orders of manitudes faster than the previous algorithms.