Mark yet more methods as needing write access to the database

[rails.git] / app / helpers / geocoder_helper.rb

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index c337b5ed62626c0344764731db8226e25ed8f27c..082f9e5304180aed93ed6a01f359f65debc4158c 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -2,11 +2,24 @@ module GeocoderHelper
   def result_to_html(result)
     html_options = {}
     #html_options[:title] = strip_tags(result[:description]) if result[:description]
-    html_options[:href] = "?lat=#{result[:lat]}&lon=#{result[:lon]}&zoom=#{result[:zoom]}"
+    if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
+      html_options[:href] = raw("?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}")
+    else
+      html_options[:href] = raw("?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}")
+    end
+
     html = ""
     html << result[:prefix] if result[:prefix]
-    html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+    html << " " if result[:prefix] and result[:name]
+
+    if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
+      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, null, #{result[:min_lon]}, #{result[:min_lat]}, #{result[:max_lon]}, #{result[:max_lat]})", html_options)  if result[:name]
+    else
+      html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+    end
+
     html << result[:suffix] if result[:suffix]
-    return html
+
+    return raw(html)
   end
 end