aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Geocode.pm
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-09-20 16:13:15 +0100
committerStruan Donald <struan@exo.org.uk>2011-09-20 16:13:15 +0100
commit6128a2790b682170d2cac4b4674b4ac3ac2dc517 (patch)
tree63b493b3d442db2078c7fbf1b96afc7d275ef1ba /perllib/FixMyStreet/Geocode.pm
parentdd82abb2c31d77fbd54799f08322ee074f46a160 (diff)
parent77f31e8c96c727ea5ab9cf217cfd924074e8f3ed (diff)
Merge remote branch 'origin/master' into rss-addresses
Diffstat (limited to 'perllib/FixMyStreet/Geocode.pm')
-rw-r--r--perllib/FixMyStreet/Geocode.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index d7c416fb5..6ee17029a 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -41,9 +41,8 @@ sub string {
my $params = $c->cobrand->disambiguate_location();
return FixMyStreet::Geocode::Bing::string($s, $c, $params)
if FixMyStreet->config('BING_MAPS_API_KEY');
- return FixMyStreet::Geocode::Google::string($s, $c, $params)
- if FixMyStreet->config('GOOGLE_MAPS_API_KEY');
- die "No geocoding provider configured";
+ # Fall back to Google API, which allow acces with and without a key
+ return FixMyStreet::Geocode::Google::string($s, $c, $params);
}
1;