Add support for PWG2.6 (rename lat,lon to latitude,longitude)