From f7b0c9efaace86739d834ece0b1a9eb9575b4dec Mon Sep 17 00:00:00 2001 From: Erik Michaels-Ober Date: Tue, 9 Aug 2011 11:48:47 -0700 Subject: [PATCH] Set default limit to 20 to improve performance --- app/controllers/hydrants_controller.rb | 2 +- app/models/hydrant.rb | 2 +- app/views/main/index.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/hydrants_controller.rb b/app/controllers/hydrants_controller.rb index aa0875f..f1c0903 100644 --- a/app/controllers/hydrants_controller.rb +++ b/app/controllers/hydrants_controller.rb @@ -2,7 +2,7 @@ class HydrantsController < ApplicationController respond_to :json def show - @hydrants = Hydrant.find_closest(params[:lat], params[:lng], params[:limit] || 50) + @hydrants = Hydrant.find_closest(params[:lat], params[:lng], params[:limit] || 20) unless @hydrants.blank? respond_with @hydrants else diff --git a/app/models/hydrant.rb b/app/models/hydrant.rb index 51ba04a..7a190b8 100644 --- a/app/models/hydrant.rb +++ b/app/models/hydrant.rb @@ -4,7 +4,7 @@ class Hydrant < ActiveRecord::Base belongs_to :user has_many :reminders - def self.find_closest(lat, lng, limit=50) + def self.find_closest(lat, lng, limit=20) query = <<-SQL SELECT *, (3959 * ACOS(COS(RADIANS(?)) * COS(RADIANS(lat)) * COS(radians(lng) - RADIANS(?)) + SIN(RADIANS(?)) * SIN(RADIANS(lat)))) AS distance FROM hydrants diff --git a/app/views/main/index.html.haml b/app/views/main/index.html.haml index 507ae0c..c83ed03 100644 --- a/app/views/main/index.html.haml +++ b/app/views/main/index.html.haml @@ -8,7 +8,7 @@ = select_tag "city_state", ''.html_safe, :tabindex => 10 = label_tag "address", "Address", :id => "address_label" = text_field_tag "address", params[:address], :tabindex => 11 - = hidden_field_tag "limit", params[:limit] || 50 + = hidden_field_tag "limit", params[:limit] || 20 = submit_tag "Find fire hydrants", :tabindex => 12 #logos = image_tag "logos/cfa.png", :alt => "Code for America", :title => "Code for America"