diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /perllib/FixMyStreet/Geocode/Google.pm | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'perllib/FixMyStreet/Geocode/Google.pm')
| -rw-r--r-- | perllib/FixMyStreet/Geocode/Google.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm index 1ab347066..db3a8ae91 100644 --- a/perllib/FixMyStreet/Geocode/Google.pm +++ b/perllib/FixMyStreet/Geocode/Google.pm @@ -24,10 +24,14 @@ sub string { my ( $s, $c, $params ) = @_; my $url = 'http://maps.google.com/maps/geo?q=' . $s; - $url .= '&ll=' . $params->{centre} if $params->{centre}; - $url .= '&spn=' . $params->{span} if $params->{span}; - $url .= '&gl=' . $params->{country} if $params->{country}; - $url .= '&hl=' . $params->{lang} if $params->{lang}; + $url .= '&ll=' . $params->{centre} if $params->{centre}; + $url .= '&spn=' . $params->{span} if $params->{span}; + if ($params->{google_country}) { + $url .= '&gl=' . $params->{google_country}; + } elsif ($params->{country}) { + $url .= '&gl=' . $params->{country}; + } + $url .= '&hl=' . $params->{lang} if $params->{lang}; my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'google/'; my $cache_file = $cache_dir . md5_hex($url); @@ -58,9 +62,6 @@ sub string { if (!$js) { return { error => _('Sorry, we could not parse that location. Please try again.') }; - } elsif ($js =~ /BT\d/) { - # Northern Ireland, hopefully - return { error => _("We do not currently cover Northern Ireland, I'm afraid.") }; } $js = JSON->new->utf8->allow_nonref->decode($js); |