From 92105b0b9c6c596602ebebca238d5d95d0a2eb7d Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Mon, 28 Apr 2014 00:33:21 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20carte=20des=20prochains=20?=
 =?UTF-8?q?=C3=A9v=C3=A9nements=20et=20des=20lugs,=20pour=20l'instant=20no?=
 =?UTF-8?q?n=20cliquable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               |   2 ++
 Gemfile                                  |   3 +++
 Gemfile.lock                             |   3 +++
 app/assets/images/team.png               | Bin 0 -> 3586 bytes
 app/assets/javascripts/maps.js.coffee    |  18 +++++++++++++
 app/assets/stylesheets/maps.css.sass     |   3 +++
 app/controllers/maps_controller.rb       |  19 ++++++++++++++
 app/helpers/maps_helper.rb               |   2 ++
 app/views/layouts/application.html.haml  |   2 +-
 app/views/maps/index.html.haml           |  31 +++++++++++++++++++++++
 config/locales/fr.yml                    |   5 ++++
 config/routes.rb                         |   5 ++++
 test/controllers/maps_controller_test.rb |   9 +++++++
 test/helpers/map_helper_test.rb          |   4 +++
 test/helpers/maps_helper_test.rb         |   4 +++
 15 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/images/team.png
 create mode 100644 app/assets/javascripts/maps.js.coffee
 create mode 100644 app/assets/stylesheets/maps.css.sass
 create mode 100644 app/controllers/maps_controller.rb
 create mode 100644 app/helpers/maps_helper.rb
 create mode 100644 app/views/maps/index.html.haml
 create mode 100644 test/controllers/maps_controller_test.rb
 create mode 100644 test/helpers/map_helper_test.rb
 create mode 100644 test/helpers/maps_helper_test.rb

diff --git a/.gitignore b/.gitignore
index fc1d6c38..bc06f83d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,5 @@ capybara-*html
 # vendor/extensions dummy applications.
 vendor/extensions/**/spec/dummy
 
+# exuberant-ctags
+tags
diff --git a/Gemfile b/Gemfile
index 6931bf0c..9e5839ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,6 +69,9 @@ gem 'simple_calendar', github: 'echarp/simple_calendar'
 # Markdown display
 gem 'redcarpet'
 
+# Carte openstreetmap
+gem 'openlayers-rails'
+
 group :development do
   gem 'guard-livereload'
   gem 'guard-bundler'
diff --git a/Gemfile.lock b/Gemfile.lock
index bb72f030..6fd92e7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,6 +196,8 @@ GEM
     multi_json (1.9.2)
     mysql2 (0.3.15)
     nio4r (1.0.0)
+    openlayers-rails (0.0.4)
+      railties (>= 3.1)
     orm_adapter (0.5.0)
     polyglot (0.3.4)
     pry (0.9.12.6)
@@ -293,6 +295,7 @@ DEPENDENCIES
   jquery-turbolinks
   modernizr-rails
   mysql2
+  openlayers-rails
   polyamorous!
   quiet_assets
   rails (~> 4.1.0.rc1)
diff --git a/app/assets/images/team.png b/app/assets/images/team.png
new file mode 100644
index 0000000000000000000000000000000000000000..13af6148c58239942645cc9222e764158d981017
GIT binary patch
literal 3586
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
IM6N<$f<Ra18~^|S

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/maps.js.coffee b/app/assets/javascripts/maps.js.coffee
new file mode 100644
index 00000000..0f05d418
--- /dev/null
+++ b/app/assets/javascripts/maps.js.coffee
@@ -0,0 +1,18 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
+
+#= require openlayers-rails
+
+$(document).ready ->
+  map = new OpenLayers.Map 'map'
+  layer = new OpenLayers.Layer.WMS 'OpenLayers WMS',
+    'http://vmap0.tiles.osgeo.org/wms/vmap0', {
+      layers: 'basic'
+    }
+  map.addLayer layer
+  map.setCenter new OpenLayers.LonLat(2.5, 47), 6
+  map.addControl new OpenLayers.Control.LayerSwitcher()
+
+  map.addLayer eventsLayer
+  map.addLayer lugsLayer
diff --git a/app/assets/stylesheets/maps.css.sass b/app/assets/stylesheets/maps.css.sass
new file mode 100644
index 00000000..61c0e077
--- /dev/null
+++ b/app/assets/stylesheets/maps.css.sass
@@ -0,0 +1,3 @@
+#map
+  width: 100%
+  height: 40em
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
new file mode 100644
index 00000000..7af67f68
--- /dev/null
+++ b/app/controllers/maps_controller.rb
@@ -0,0 +1,19 @@
+class MapsController < ApplicationController
+  def index
+    @events = Event
+    if (params[:region] && params[:region].present? && params[:region] != 'all')
+      @events = @events.region(params[:region])
+    end
+    @events = @events.tag(params[:tag]) if (params[:tag])
+
+    @events = @events.where('start_time > ?', 360.days.ago).order :id
+
+    @cities_event = @events.collect { |event|
+      City.find_by_majname event.city.gsub('-', ' ').upcase
+    }.uniq.keep_if { |city| city }
+
+    @cities_lug = Lug.all.collect { |lug|
+      City.find_by_majname lug.city.gsub('-', ' ').upcase
+    }.uniq.keep_if { |city| city }
+  end
+end
diff --git a/app/helpers/maps_helper.rb b/app/helpers/maps_helper.rb
new file mode 100644
index 00000000..88ee3d5c
--- /dev/null
+++ b/app/helpers/maps_helper.rb
@@ -0,0 +1,2 @@
+module MapsHelper
+end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 3dc9e16b..f9de45e7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -65,7 +65,7 @@
         = link_to t('.propose'), new_event_path
         = link_to t('.rss'), regions_url
         = link_to t('.ical'), icallist_regions_url
-        = link_to t('.map'), users_url
+        = link_to t('.map'), maps_url
         = link_to t('.tags'), tags_url
         = link_to t('.infos'), users_url
         = link_to t('.stats'), stats_regions_url
diff --git a/app/views/maps/index.html.haml b/app/views/maps/index.html.haml
new file mode 100644
index 00000000..f52dfb18
--- /dev/null
+++ b/app/views/maps/index.html.haml
@@ -0,0 +1,31 @@
+%h2=t '.title'
+
+#map
+
+:javascript
+  var eventsLayer = new OpenLayers.Layer.Markers("#{t '.events'}");
+  eventsLayer.setVisibility(true);
+  var iconSize =  new OpenLayers.Size(20, 20);
+  var iconOffset = new OpenLayers.Pixel(-(iconSize.w/2), -iconSize.h);
+
+- for city in @cities_event
+  :coffee
+    marker = new OpenLayers.Marker(
+      new OpenLayers.LonLat(#{city.longitude}, #{city.latitude})
+      #new OpenLayers.Icon(<<iconURL>>, iconSize, iconOffset)
+    )
+    eventsLayer.addMarker marker
+
+:javascript
+  var lugsLayer = new OpenLayers.Layer.Markers("#{t '.lugs'}");
+  lugsLayer.setVisibility(true);
+  var iconSize =  new OpenLayers.Size(20, 20);
+  var iconOffset = new OpenLayers.Pixel(-(iconSize.w/2), -iconSize.h);
+
+- for city in @cities_lug
+  :coffee
+    marker = new OpenLayers.Marker(
+      new OpenLayers.LonLat(#{city.longitude}, #{city.latitude})
+      new OpenLayers.Icon("/assets/team.png", iconSize, iconOffset)
+    )
+    lugsLayer.addMarker marker
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5172d285..2dd52c48 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -164,6 +164,11 @@ fr:
       title: Ajout d'une note de modération
     actions:
       added: La note a bien été ajoutée, merci!
+  maps:
+    index:
+      title: Carte des évènements
+      events: Évènements
+      lugs: Lugs
   users:
     sign_in:
       title: Identification
diff --git a/config/routes.rb b/config/routes.rb
index 2d3b402f..c9daf4ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,8 @@
 Rails.application.routes.draw do
+  get 'maps/index'
+
+  get 'map/index'
+
   resources :users
   resources :events
   resources :moderations do
@@ -9,6 +13,7 @@ Rails.application.routes.draw do
     get 'stats', on: :collection
   end
   resources :tags, only: [ :index, :show ]
+  resources :maps, only: [:index]
 
   get 'ical.php' => 'events#index', format: :ics
   get ':format.php' => 'events#index'
diff --git a/test/controllers/maps_controller_test.rb b/test/controllers/maps_controller_test.rb
new file mode 100644
index 00000000..7972cdc7
--- /dev/null
+++ b/test/controllers/maps_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class MapsControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+end
diff --git a/test/helpers/map_helper_test.rb b/test/helpers/map_helper_test.rb
new file mode 100644
index 00000000..d0728861
--- /dev/null
+++ b/test/helpers/map_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MapHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/maps_helper_test.rb b/test/helpers/maps_helper_test.rb
new file mode 100644
index 00000000..0a0efccd
--- /dev/null
+++ b/test/helpers/maps_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MapsHelperTest < ActionView::TestCase
+end