City and district agree on joint facility plan