Abstract: An indoor surveying apparatus comprises a 2D range finder, means for automatically aligning 2D range finder data and computing a 2D map of the environment, a calibrated optical imaging system for capturing images of environment, and means for establishing positions and extents of walls, doors, and windows and for drawing floor plans using the computed 2D map and calibrated images where 2D range finder data is missing. It is further contemplated that the imaging system can also be part of the range finder, that the range finder can be a scanning laser range finder, that the imaging system can include a panoramic lens with 180 degree field of view, that the apparatus can further include an IMU, an electronic compass, a panoramic rotator, and means for measuring positions of points on the floor using the image data.