Location logs whether GPS or network provided

…and a tidy-up as it got accidentally mixed into the wifi if block