Merge branch 'master' into notes

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

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index e7d0ddf6c1d9cc8c27610ecc8d395a249036c6ca..8f662bde73d304e7944b3c1195dca1b2cf407db1 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -1,13 +1,27 @@
 module GeocoderHelper
   def result_to_html(result)
 module GeocoderHelper
   def result_to_html(result)

-    html_options = {}
-    #html_options[:title] = strip_tags(result[:description]) if result[:description]
-    html_options[:href] = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
+    html_options = { :class => "set_position", :data => {} }
+
+    if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat]
+      url = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}"
+    else
+      url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
+    end
+
+    result.each do |key,value|
+      html_options[:data][key.to_s.tr('_', '-')] = value
+    end
+

     html = ""
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] and result[:name]
     html = ""
     html << result[:prefix] if result[:prefix]
     html << " " if result[:prefix] and result[:name]

-    html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
+    html << link_to(result[:name], url, html_options) if result[:name]

     html << result[:suffix] if result[:suffix]
     html << result[:suffix] if result[:suffix]

-    return html
+
+    return raw(html)
+  end
+
+  def describe_location(lat, lon, zoom = nil, language = nil)
+    Nominatim.describe_location(lat, lon, zoom, language)

   end
 end
   end
 end