Big Map of City

I'm thinking we've got a rocky promotory, next to a big natural bay and a swampy river delta. So the old city is tucked into a flatish bit which is nevertheless rock for building on. This slopes gently down to the sea and the harbour, and is full of picturesque (or not so picturesque) old and cramped housing. Then the slope of the promotory gets much steeper and no one really built there, although there is a keep (?disused, ?ruined) at the top and a lighthouse on the point. However these days the steep slopes have been terraced and wealthy cliff-top mansions built overlooking the old city and the harbour. Meanwhile poorer housing has sprawled out from the city towards the marshy land of the delta, some of which is being reclaimed for yet more new housing. The old road from the city runs along the edge of the rocky ground, trying not to get too high. Meanwhile upriver from the delta is fertile farmland which used supply food to the city. There are a couple of much smaller rivers which essentially bring rain water run-off down from the ridge into the old quarter.
Hmm... not on the map but maybe a reservoir up there now and a hydro plant?