Merging Panoramic Intensity and Range Maps for Robot Localization