Version 2.0 of the iPhone rumored to be due out in, oh, 17 days or so will include geotagging for photos. It isn’t clear whether this will be done by GPS or by the iPhone’s current triangulation methods.