City waterfront development plan