Use Nominatim to reverse geocode diary location information and display

a friendly human readable location instead of some coordinates.

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d805e27adee83bfe8518ec846b943940e5fd7dbb..e466e83491e31126e26660ace99be2b6e7160a5a 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,6 @@
 module ApplicationHelper
 module ApplicationHelper

+  require 'rexml/document'
+

   def htmlize(text)
     return linkify(sanitize(simple_format(text)))
   end
   def htmlize(text)
     return linkify(sanitize(simple_format(text)))
   end


@@ -34,6 +36,15 @@ module ApplicationHelper
     return js
   end
 
     return js
   end
 

+  def describe_location(lat, lon, zoom, language)
+    zoom = zoom || 14
+    language = language || request.user_preferred_languages.join(',')
+    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
+    response = REXML::Document.new(Net::HTTP.get(URI.parse(url)))
+
+    return response.get_text("reversegeocode/result").to_s
+  end
+

 private
 
   def javascript_strings_for_key(key)
 private
 
   def javascript_strings_for_key(key)

diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb
index c003cc0f5c342d252accfe5ac6720e05ac032c96..59d578f7e6737d9676a04ef6353500b18bf22f37 100644 (file)
--- a/app/models/diary_sweeper.rb
+++ b/app/models/diary_sweeper.rb
@@ -30,5 +30,9 @@ private
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => entry.user.display_name)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => entry.user.display_name)

+
+    if record.is_a?(DiaryEntry)
+      expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location")
+    end

   end
 end
   end
 end

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 0f4f6c206fd2a0fc2468e492ddbc2413e32d2384..c9a6baec0a6940249536103b4d6592273f1a99e0 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -1,7 +1,8 @@
 <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
 <%= htmlize(diary_entry.body) %>
 <% if diary_entry.latitude and diary_entry.longitude %>
 <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
 <%= htmlize(diary_entry.body) %>
 <% if diary_entry.latitude and diary_entry.longitude %>

-<%= t 'map.coordinates' %> <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
+<%= render :partial => "location", :object => diary_entry %>
+<br />

 <% end %>
 <%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code)  %> 
 <% if params[:action] == 'list' %>
 <% end %>
 <%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code)  %> 
 <% if params[:action] == 'list' %>

diff --git a/app/views/diary_entry/_location.html.erb b/app/views/diary_entry/_location.html.erb
new file mode 100644 (file)
index 0000000..ec8ea46
--- /dev/null
+++ b/app/views/diary_entry/_location.html.erb
@@ -0,0 +1,11 @@
+<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
+<%= t 'diary_entry.location.location' %>
+
+<abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
+<%= describe_location location.latitude, location.longitude, 14, location.language_code %>
+</abbr>
+
+(<%=link_to t('diary_entry.location.view'), :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>
+/
+<%=link_to t('diary_entry.location.edit'), :controller => 'site', :action => 'edit', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>)
+<% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e75cc22069d0680ec9ec7246cf01c838e3196ce5..47847680f79dae6f5502ccd3c148425edce6a060 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -76,10 +76,6 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"

-  map:
-    view: View
-    edit: Edit
-    coordinates: "Coordinates:"

   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"


@@ -341,6 +337,10 @@ en:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
       hide_link: Hide this comment
       confirm: Confirm
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
       hide_link: Hide this comment
       confirm: Confirm

+    location:
+      location: "Location:"
+      view: "View"
+      edit: "Edit"

     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index aa40f689af8b30030391672bb365d2298f8bd5f7..738a16e62d86f2e82e1aaf00eb39b969755802d5 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -700,3 +700,7 @@ input[type="submit"] {
   top: 15px;
   left: 15px
 }
   top: 15px;
   left: 15px
 }

+
+abbr.geo {
+  border-bottom: none;
+}

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 53d9716b3ebc8870cd72165d713a1252aa161936..bd65088e4ed4a1b1b11c10980abd136fca568f6c 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments
 

+  include ActionView::Helpers::NumberHelper
+

   def test_showing_new_diary_entry
     get :new
     assert_response :redirect
   def test_showing_new_diary_entry
     get :new
     assert_response :redirect


@@ -110,8 +112,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1

-          assert_select "span.latitude", :text => new_latitude, :count => 1
-          assert_select "span.longitude", :text => new_longitude, :count => 1
+          assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1

           # As we're not logged in, check that you cannot edit
           #print @response.body
           assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
           # As we're not logged in, check that you cannot edit
           #print @response.body
           assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1


@@ -134,8 +135,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
           assert_select "p", :text => /#{new_body}/, :count => 1

-          assert_select "span.latitude", :text => new_latitude, :count => 1
-          assert_select "span.longitude", :text => new_longitude, :count => 1
+          assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1

           # As we're not logged in, check that you cannot edit
           assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 0
         end
           # As we're not logged in, check that you cannot edit
           assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 0
         end