Events index shows local events only! F#@$ yeah! Events controller cr…

…eate map can take a zoom level now. Event/show is zoomed in further.
wanderingmatt · Mar 17, 2009 · e689d71 · e689d71
1 parent 7eb4bb5
commit e689d71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -4,8 +4,8 @@ class EventsController < ApplicationController
   # GET /events
   # GET /events.xml
   def index
-    @events = Event.sort(params[:page], params[:sorted_by], session[:upcoming])
-    create_map @ip_location
+    @events = Event.sort(params[:page], params[:sorted_by], session[:upcoming], @ip_location)
+    create_map @ip_location, 10
 
     respond_to do |format|
       format.html # index.html.erb
@@ -17,7 +17,7 @@ def index
   # GET /events/1.xml
   def show
     @event = Event.find(params[:id])
-    create_map @event.location
+    create_map @event.location, 16
 
     respond_to do |format|
       format.html # show.html.erb
@@ -89,10 +89,10 @@ def destroy
 
   private
 
-  def create_map(location)
+  def create_map(location, zoom = 15)
     @map = GMap.new('map')
     @map.control_init(:large_map_3d => true,:map_type => true, :scale => true)
-    @map.center_zoom_init([location[:latitude],location[:longitude]],8)
+    @map.center_zoom_init([location[:latitude],location[:longitude]],zoom)
     @map.add_map_type_init(GMapType::G_PHYSICAL_MAP)
     @map.set_map_type_init(GMapType::G_PHYSICAL_MAP)
     get_upcoming_markers.each do |marker|

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -3,14 +3,20 @@ class Event < ActiveRecord::Base
 
   belongs_to :group
   belongs_to :location
+  acts_as_mappable :through => :location
 
   validates_presence_of :group_id, :location_id, :start_time, :end_time
 
-  def self.sort(page, order, upcoming = 'true')
-    if upcoming == 'true'
+  SEARCH_RADIUS = 50 # miles
+
+  # TODO: Make this less redundant. It would be easier if upcoming could be called after paginate.
+  def self.sort(page, order, upcoming = 'true', location = nil)
+    if upcoming == 'true' && !location.nil?
+      self.upcoming.find_within(SEARCH_RADIUS, :origin => location.to_a.map { |a, b| b }).paginate({ :page => page, :per_page => 10, :order => order, :include => ['group', 'location'] })
+    elsif upcoming == 'true' && location.nil?
       self.upcoming.paginate({ :page => page, :per_page => 10, :order => order, :include => ['group', 'location'] })
     else
-      paginate({ :page => page, :per_page => 10, :order => order, :include => ['group', 'location'] })
+      self.paginate({ :page => page, :per_page => 10, :order => order, :include => ['group', 'location'] })
     end
   end