stateBoundedBy and districtBoundedBy added and distance constraints added