aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-24 10:10:58 +0000
committerMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-24 10:10:58 +0000
commit91202939f285e28d81888b40bc70744a3b41ddf9 (patch)
tree9b46d38cca97ef98dee6110cb93873a160c4b0f1
parent3a690ce84d1913872d56e46a8ecd3c7ad728072e (diff)
Remove unneeded decodes, everything is already decoded by then, and fix for passing decoded strings to MaPit.
m---------commonlib0
-rw-r--r--perllib/FixMyStreet/Geocode.pm1
-rwxr-xr-xweb/reports.cgi1
3 files changed, 0 insertions, 2 deletions
diff --git a/commonlib b/commonlib
-Subproject 5179eafd5174b069ea7d6b5855233513f0ec370
+Subproject f8bd47ec427fd45047f937fe09155a530045eef
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index 803e32a85..799418d89 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -88,7 +88,6 @@ sub geocoded_string_coordinates {
# of the site.
sub string {
my ($s, $q) = @_;
- $s = decode_utf8($s);
$s = lc($s);
$s =~ s/[^-&\w ']/ /g;
$s =~ s/\s+/ /g;
diff --git a/web/reports.cgi b/web/reports.cgi
index 784c52917..6c26de91d 100755
--- a/web/reports.cgi
+++ b/web/reports.cgi
@@ -61,7 +61,6 @@ sub main {
my $areas_f = mySociety::MaPit::call('areas', $fylke, type => \@area_types);
if (keys %$areas_f == 1) {
($fylke) = values %$areas_f;
- $kommune = decode_utf8($kommune);
foreach (values %$areas_k) {
if ($_->{name} eq $kommune && $_->{parent_area} == $fylke->{id}) {
$one_council = $_;