From f0c06c6f8a74d8161643b4c05595d98c8983ed58 Mon Sep 17 00:00:00 2001
From: JT <jturino@gmail.com>
Date: Mon, 6 Jul 2015 18:03:56 -0700
Subject: [PATCH 1/2] add google map to event show page

---
 app/assets/javascripts/events.coffee   | 16 +++++++++++++---
 app/assets/stylesheets/events.scss     |  5 +++++
 app/helpers/application_helper.rb      |  6 ++++++
 app/models/event.rb                    | 10 +++++++++-
 app/views/events/show.html.erb         |  2 +-
 app/views/layouts/application.html.erb |  1 +
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/events.coffee b/app/assets/javascripts/events.coffee
index 24f83d1..ba372c2 100644
--- a/app/assets/javascripts/events.coffee
+++ b/app/assets/javascripts/events.coffee
@@ -1,3 +1,13 @@
-# 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/
+$(document).ready ->
+  mapCanvas = document.getElementById('map-canvas')
+  data = mapCanvas.dataset
+  coords = new (google.maps.LatLng)(data.lat, data.long)
+  mapOptions = 
+    center: coords
+    zoom: 16
+    mapTypeId: google.maps.MapTypeId.ROADMAP
+  map = new (google.maps.Map)(mapCanvas, mapOptions)
+  marker = new (google.maps.Marker)(
+    position: coords
+    map: map)
+  return
\ No newline at end of file
diff --git a/app/assets/stylesheets/events.scss b/app/assets/stylesheets/events.scss
index e975d96..e9c39e4 100644
--- a/app/assets/stylesheets/events.scss
+++ b/app/assets/stylesheets/events.scss
@@ -1,3 +1,8 @@
 // Place all the styles related to the Events controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+#map-canvas {
+  width: 500px;
+  height: 400px;
+}
\ No newline at end of file
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be79..8d9b7cb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,8 @@
 module ApplicationHelper
+  def map_for_coords(coords)
+    tag("div",
+      id: "map-canvas",
+      data: { lat: coords[0], long: coords[1] }
+    )
+  end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index ca4fc06..bdc8b81 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -58,7 +58,7 @@ def format_speakers
   
   def format_people
     (self.candidates.map(&:person_name) + self.people.map(&:full_name)).uniq.join(', ')
-  end 
+  end
   
   def format_location
     v = self.venue
@@ -69,6 +69,14 @@ def format_location
     end
   end
   
+  def coords
+    if venue
+      [venue.latitude, venue.longitude]
+    else
+      []
+    end
+  end
+  
   def add_candidate(candidate_id)
     candidate = Candidate.includes(:person).find(candidate_id)
     self.candidates << candidate if candidate
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 9b99e31..c601c45 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -4,11 +4,11 @@
 		<%= notice %>
 	</div>
 <% end %>
-
 <div class="row well bs-component col-lg-12">
   <div class="col-lg-8">
     <h1><%= @event.title %></h1>
     <h3><%= @event.format_location %></h3>
+    <%= map_for_coords(@event.coords) %>
     <ul class="col-lg-8 list-group">
     <% @event.event_days.each do |event_day| %>  
       <li class="list-group-item">
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 26b2d91..3b05c85 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.1/moment.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/js/bootstrap-datetimepicker.min.js"></script>
+    <script src="https://maps.googleapis.com/maps/api/js"></script>
 	  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.4/flatly/bootstrap.min.css"/>		
 	  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.7.14/css/bootstrap-datetimepicker.min.css"/>
 	  <%= csrf_meta_tags %>

From 7c716469aad68d2c1d35c33c97a599e03c6c9a1d Mon Sep 17 00:00:00 2001
From: JT <jturino@gmail.com>
Date: Mon, 6 Jul 2015 18:27:11 -0700
Subject: [PATCH 2/2] fix problem where maps wouldn't load b/c turbolinks was
 skipping document.ready

---
 app/assets/javascripts/events.coffee | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/events.coffee b/app/assets/javascripts/events.coffee
index ba372c2..cd2cbdf 100644
--- a/app/assets/javascripts/events.coffee
+++ b/app/assets/javascripts/events.coffee
@@ -1,4 +1,4 @@
-$(document).ready ->
+ready = ->
   mapCanvas = document.getElementById('map-canvas')
   data = mapCanvas.dataset
   coords = new (google.maps.LatLng)(data.lat, data.long)
@@ -10,4 +10,7 @@ $(document).ready ->
   marker = new (google.maps.Marker)(
     position: coords
     map: map)
-  return
\ No newline at end of file
+  return
+
+$(document).ready(ready)
+$(document).on('page:load', ready)
\ No newline at end of file