split geolocation name into subLocality and locality

DisplayLocations now have getShortName() to return subLocality.