I might be thinking of Ehud Barak's offer at Camp David but I think the major stumbling blocks were Jerusalem - the Palestinians were offered Abu Dis as their capital, which lies outside the Jerusalem municipality - and, as usual again, the right of return. I think the land swap being offered was a bit of desert with no continuity with either Gaza or the West Bank as well. But without going back and reading again I can't remember exactly which Ehud offered what. I remember at the time thinking of of both that they'd never be acceptable to any Palestinian leadership and they must have known it. I always thought the offers were made in bad faith knowing it would allow them to present the Palestinian side as the obstacle to peace.
Yes I think that was Barak's offer; Olmert's offer was a division of the city along the lines of its Jewish and Arab sectors, along with shared control over the city’s holy sites through a special committee that would include representatives from Saudi Arabia, Jordan, the US, Palestine, and Israel. Both would have been free to name their part of the city as their capital: Al Quds and Yerushalayim. There was a land link with Gaza in his plan, right of return was a compromise figure which I can't remember but was I think acceptable to Abbas - although he's probably denied it since!
You may be right about the offers being made in bad faith - who knows? They were made just a year or so after Hamas had seized power in Gaza, and they were
doing all they could to disrupt the negotiations with sporadic missiles into Israel and at least one assassination attempt on Abbas. Hamas wouldn't have accepted any deal, and without Gaza there could be no deal.
My main criticism of the Israelis is in the years after this time when they should have done everything they could to make the PA successful in the West Bank, strengthening the moderate political-secular factor in Palestine over the religious-radical one, and eventually leading to the establishment of a Palestinian state. They weren't the only ones to blame for the failure of the PA, but they should have done more, and it was in their own interests to do more!