Combining LiDAR and Photogrammetry to Generate Up-to-date 3D City Models