A £500m development for Edinburgh's waterfront has been unveiled.

The plan includes housing for 10,000 people, two primary schools, a university campus, ice rink and sports centre as well as commercial and industrial sites.

It covers the run-down Granton area, between the already-refurbished zones of Cramond and Leith.

The scheme is regarded as the missing link in the redevelopment of the shoreline of the Firth of Forth between the Forth Bridge and Musselburgh.

Beach and marina

Part of the work would see a new beach and boardwalks created, along with a marina.

The council, local enterprise company and Scottish Homes are presenting the plans for local consultation over the next two months.

If approved, the cost would be split between public and private funding, and could create between 5,000 and 7,000 jobs.

The project leaders say the dramatic transformation would unlock the business, residential and leisure potential of Edinburgh's waterfront area and revitalise the whole of the north of the city.

The whole development is likely to take 15 years