diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-21 11:41:23 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-21 11:41:23 +0100 |
| commit | d941a8c26e943c941f8e37ecbd9a9982dd41cb70 (patch) | |
| tree | 75ea20fb18e984912ba60e4e499114c83cf431fe /perllib/FixMyStreet/Geocode.pm | |
| parent | 9da2d7b0e806407e3ed5e5418a53fca64757a39a (diff) | |
| parent | 77f31e8c96c727ea5ab9cf217cfd924074e8f3ed (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/report/display.html
Diffstat (limited to 'perllib/FixMyStreet/Geocode.pm')
| -rw-r--r-- | perllib/FixMyStreet/Geocode.pm | 5 |
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; |