According to this yahoo news, Intel is working on an indoor GPS:

The company recently presented its precision-location project as a possible solution to the shortcomings of a global positioning system in an indoor setting. Using wireless networks and fixed access points, a laptop computer can triangulate its own position in relation to other devices in the office.

Yet another GPS augmented with WiFi...