FIxed som issues in GeoShape and Line/Point