Improves #410 by using the location type instead of accuracy

Also reintroduces Google's server key