Accuracy Improvement of Ray-Tracing Method with Rounded-Shape (RS) Model for Non Line-Of-Site (NLOS) Route in Street Cell Environment -- Consideration of Building Shape and Surface Roughness