X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ce5986a5229408757cfdccaed3d5995376b0511..42822a8b89443d5fa6ec815d82684698d2d80b07:/app/views/site/_search.html.erb diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb index 8e18d0e97..3750a7dc9 100644 --- a/app/views/site/_search.html.erb +++ b/app/views/site/_search.html.erb @@ -6,10 +6,22 @@ function describeLocation() { var position = getPosition(); + var zoom = getZoom(); <%= remote_function(:loading => "startSearch()", :url => { :controller => :geocoder, :action => :description }, - :with => "'lat=' + position.lat + '&lon=' + position.lon") %> + :with => "'lat=' + position.lat + '&lon=' + position.lon + '&zoom=' + zoom") %> + } + + function setSearchViewbox() { + <% if params[:action] == 'index' %> + var extent = getMapExtent(); + + $("minlon").value = extent.left; + $("minlat").value = extent.bottom; + $("maxlon").value = extent.right; + $("maxlat").value = extent.top; + <% end %> } <% if params[:query] %> @@ -22,14 +34,21 @@ <% content_for "optionals" do %>
<%= t 'site.search.search' %> - <%= t 'site.search.where_am_i' %> + <%= t 'site.search.where_am_i' %>
- <% form_remote_tag(:loading => "startSearch()", + <% form_remote_tag(:before => "setSearchViewbox()", + :loading => "startSearch()", :complete => "endSearch()", :url => { :controller => :geocoder, :action => :search }, :html => { :method => "get", :action => url_for(:action => "index") }) do %> <%= text_field_tag :query, h(params[:query]) %> + <% if params[:action] == 'index' %> + <%= hidden_field_tag :minlon %> + <%= hidden_field_tag :minlat %> + <%= hidden_field_tag :maxlon %> + <%= hidden_field_tag :maxlat %> + <% end %> <%= submit_tag t('site.search.submit_text') %> <% end %>