diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-02-01 15:28:08 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-04 06:53:02 +0000 |
| commit | 488a8f21a0c1bc2b9501c9d94d69db56cccd80ae (patch) | |
| tree | 68becf501e9492466a80015e8ace9a7fb1557cfa /perllib/FixMyStreet/Geocode/Zurich.pm | |
| parent | 3e0d12e8584d132b573f536ab5cd01e24241827b (diff) | |
| parent | 28aa1dd7fb1c9bc93aa204afae67cf68fe36ee6b (diff) | |
Merge remote branch 'origin/zurich'
Conflicts:
bin/open311-populate-service-list
bin/send-comments
bin/update-all-reports
conf/crontab.ugly
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/App/Controller/Reports.pm
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/LichfieldDC.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/Result/Problem.pm
perllib/FixMyStreet/DB/ResultSet/Problem.pm
perllib/FixMyStreet/SendReport.pm
perllib/FixMyStreet/SendReport/Email.pm
perllib/FixMyStreet/SendReport/Open311.pm
perllib/Open311/GetServiceRequestUpdates.pm
perllib/Open311/PopulateServiceList.pm
t/app/controller/report_new.t
t/app/controller/rss.t
templates/web/bromley/report/display.html
templates/web/default/admin/council_contacts.html
templates/web/default/common_header_tags.html
templates/web/default/dashboard/index.html
templates/web/default/front/stats.html
templates/web/default/report/_main.html
templates/web/default/report/update-form.html
templates/web/emptyhomes/index.html
templates/web/emptyhomes/report/display.html
templates/web/emptyhomes/report/new/councils_text_all.html
templates/web/emptyhomes/reports/body.html
templates/web/emptyhomes/reports/index.html
templates/web/fixmystreet/report/new/fill_in_details_form.html
templates/web/fixmystreet/report/update-form.html
web/cobrands/fixmystreet/fixmystreet.js
web/js/fixmystreet.js
Diffstat (limited to 'perllib/FixMyStreet/Geocode/Zurich.pm')
| -rw-r--r-- | perllib/FixMyStreet/Geocode/Zurich.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm index 5aaca2c8e..0fc84c0ef 100644 --- a/perllib/FixMyStreet/Geocode/Zurich.pm +++ b/perllib/FixMyStreet/Geocode/Zurich.pm @@ -52,8 +52,13 @@ sub setup_soap { # string STRING CONTEXT # Looks up on Zurich web service a user-inputted location. # Returns array of (LAT, LON, ERROR), where ERROR is either undef, a string, or -# an array of matches if there are more than one. The information in the query -# may be used to disambiguate the location in cobranded versions of the site. +# an array of matches if there are more than one. +# If there is no ambiguity, returns only a {lat,long} hash, unless allow_single_match_string is true +# (because the auto-complete use of this (in /around) should send the matched name even though it's not ambiguous). +# +# The information in the query may be used to disambiguate the location in cobranded +# versions of the site. + sub string { my ( $s, $c ) = @_; @@ -98,8 +103,9 @@ sub string { push (@valid_locations, $_); last if lc($_->{text}) eq lc($s); } - - return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; + if (scalar @valid_locations == 1 && ! $c->stash->{allow_single_geocode_match_strings} ) { + return { latitude => $latitude, longitude => $longitude }; + } return { error => $error }; } |