X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/639a994c9b851b94d4c65aa96af732eefc8453fb..846699104d2783d2d9d1162196bd428f0af6334e:/app/views/site/_search.html.erb?ds=sidebyside diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb index dab031c7b..3750a7dc9 100644 --- a/app/views/site/_search.html.erb +++ b/app/views/site/_search.html.erb @@ -13,6 +13,17 @@ :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] %> <%= remote_function(:loading => "startSearch()", :url => { :controller => :geocoder, :action => :search, :query => h(params[:query]) }) %> @@ -26,11 +37,18 @@ <%= 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 %>