From 144737b54da72cb4d2121f541212f7eafe728a83 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sun, 24 Aug 2014 12:19:45 +0200
Subject: [PATCH] Ajout de l'adresse dans les flux rss et ical

---
 app/controllers/events_controller.rb | 2 +-
 app/helpers/events_helper.rb         | 5 +++--
 app/views/events/index.ics.erb       | 2 +-
 app/views/events/index.json.jbuilder | 7 ++++---
 app/views/events/index.rss.builder   | 8 ++------
 app/views/events/index.xml.builder   | 3 ++-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index cdfcae38..2d78c86f 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -12,7 +12,7 @@ class EventsController < ApplicationController
     respond_to do |format|
       format.html
       format.rss do
-        @events = @events.includes(:related_city).future_in params[:daylimit]
+        @events = @events.future_in params[:daylimit]
       end
       format.ics { @events = @events.last_year.order :id }
       format.xml { @events = @events.includes(:related_region).order :id }
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index cc926a3e..5d48f6ec 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -17,9 +17,10 @@ module EventsHelper
       keywords: @event.tags,
       DC: { title: @event.title, date: @event.start_time.to_s },
       geo: {
-        region: @event.related_region,
         placename: @event.city,
-        position: "#{@event.latitude};#{@event.longitude}"
+        region: @event.related_region,
+        position: "#{@event.latitude};#{@event.longitude}",
+        ICBM: "#{@event.latitude}, #{@event.longitude}"
       }
   end
 
diff --git a/app/views/events/index.ics.erb b/app/views/events/index.ics.erb
index 02bd60ba..cf7237fc 100644
--- a/app/views/events/index.ics.erb
+++ b/app/views/events/index.ics.erb
@@ -13,7 +13,7 @@ UID:<%= event.id %>@agendadulibre.org
 SUMMARY:<%= event.title %>
 URL:<%= event_url event %>
 DESCRIPTION:Un événement de l'Agenda du Libre
-LOCATION:<%= event.city.gsub('-', ' ') %>
+LOCATION:<%= event.address %> <%= event.city.gsub('-', ' ') %>
 END:VEVENT
 <% end %>
 END:VCALENDAR
diff --git a/app/views/events/index.json.jbuilder b/app/views/events/index.json.jbuilder
index b758e99e..ec76ffd3 100644
--- a/app/views/events/index.json.jbuilder
+++ b/app/views/events/index.json.jbuilder
@@ -1,7 +1,8 @@
 json.array!(@events) do |event|
   json.extract! event, :id, :title, :description, :start_time, :end_time,
-                :city, :region_id, :locality, :url, :contact, :contact,
-                :submitter, :moderated, :tags, :secret, :decision_time,
-                :submission_time, :moderator_mail_id, :submitter_mail_id
+                :address, :city, :region_id, :locality, :url, :contact,
+                :contact, :submitter, :moderated, :tags, :secret,
+                :decision_time, :submission_time, :moderator_mail_id,
+                :submitter_mail_id
   json.url event_url(event, format: :json)
 end
diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder
index 8b3c05eb..aff0b18b 100644
--- a/app/views/events/index.rss.builder
+++ b/app/views/events/index.rss.builder
@@ -39,12 +39,8 @@ xml.rdf :RDF,
       domain = root_url.gsub(/www/, '').gsub(/http.?:../, '').gsub(/:.*/, '')
       xml.dc :identifier, "#{event.id}@#{domain}"
       xml.dc :date, event.start_time.iso8601
-      if event.related_city && event.related_city.latitude &&
-        event.related_city.longitude
-        xml.georss :point,
-                   event.related_city.latitude,
-                   ' ',
-                   event.related_city.longitude
+      if event.latitude && event.longitude
+        xml.georss :point, event.latitude, ' ', event.longitude
       end
 
       @event = event
diff --git a/app/views/events/index.xml.builder b/app/views/events/index.xml.builder
index c01f036e..0686ec1c 100644
--- a/app/views/events/index.xml.builder
+++ b/app/views/events/index.xml.builder
@@ -1,11 +1,12 @@
 xml.instruct!
 
 xml.events do
-  for event in @events
+  @events.each do |event|
     xml.event do
       xml.title event.title
       xml.start_time event.start_time.strftime '%Y/%m/%d %T'
       xml.end_time event.end_time.strftime '%Y/%m/%d %T'
+      xml.address event.address
       xml.city event.city
       xml.region event.related_region
       xml.locality event.locality