From e078cfefecaca5dbe08fb927d63c998f134dcac1 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Mon, 27 Oct 2014 23:33:47 +0100
Subject: [PATCH] =?UTF-8?q?La=20carte=20prend=20maintenant=20en=20compte?=
 =?UTF-8?q?=20les=20=C3=A9ventuels=20param=C3=A8tres=20comme=20tag=20ou=20?=
 =?UTF-8?q?region?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/maps.js.coffee | 4 ++--
 app/views/events/show.html.haml       | 2 +-
 app/views/maps/index.html.haml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/maps.js.coffee b/app/assets/javascripts/maps.js.coffee
index f601a443..91c8f353 100644
--- a/app/assets/javascripts/maps.js.coffee
+++ b/app/assets/javascripts/maps.js.coffee
@@ -6,7 +6,7 @@ $(document).ready ->
       attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>'
     ).addTo map
 
-    $.getJSON '/maps.json', (json) ->
+    $.getJSON $(this).data('url') + location.search, (json) ->
       layer = L.geoJson(json,
         onEachFeature: (feature, layer) ->
           # Does this feature have a property named popupContent?
@@ -28,7 +28,7 @@ $(document).ready ->
       attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a>'
     ).addTo map
 
-    $.getJSON '/maps.json', (json) ->
+    $.getJSON $(this).data('url') + location.search, (json) ->
       layer = L.geoJson(json,
         onEachFeature: (feature, layer) ->
           # Does this feature have a property named popupContent?
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index 11c51962..e33610d9 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -50,7 +50,7 @@
       "http://fr.wikipedia.org/wiki/#{url_encode @event.related_region.try(:name)}"
 
 - if @event.latitude && @event.longitude
-  #map(latitude="#{@event.latitude}" longitude="#{@event.longitude}")
+  #map(data-url="#{maps_path format: :json}" latitude="#{@event.latitude}" longitude="#{@event.longitude}")
 
 - elsif controller.action_name != 'show'
   %em.fa.fa-compress
diff --git a/app/views/maps/index.html.haml b/app/views/maps/index.html.haml
index 1a94c5d5..f46fa723 100644
--- a/app/views/maps/index.html.haml
+++ b/app/views/maps/index.html.haml
@@ -2,4 +2,4 @@
   %em.fa.fa-map-marker
   =title t '.title'
 
-#map
+#map(data-url="#{maps_path format: :json}")