@@ -9,7 +9,9 @@ class Location < ActiveRecord::Base def self.geocode(location_text) return nil if location_text.blank? - LocationAlias.locate(location_text) + Timeout.timeout(20) { LocationAlias.locate(location_text) } + rescue Timeout::Error => e + return nil end def latitude app/models/location.rb @@ -9,9 +9,9 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081104063853) do +ActiveRecord::Schema.define(:version => 20081108124300) do - create_table "alert_viewings", :force => true do |t| + create_table "alert_viewings", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "user_id", :integer t.column "reviewer_alert_id", :integer t.column "created_at", :datetime @@ -67,7 +67,7 @@ ActiveRecord::Schema.define(:version => 20081104063853) do add_index "locations", ["point"], :name => "index_locations_on_point", :spatial=> true - create_table "polling_places", :force => true do |t| + create_table "polling_places", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "location_id", :integer t.column "name", :string, :limit => 80 t.column "address", :string, :limit => 80 @@ -86,7 +86,7 @@ ActiveRecord::Schema.define(:version => 20081104063853) do add_index "report_filters", ["report_id"], :name => "index_report_filters_on_report_id" add_index "report_filters", ["filter_id"], :name => "index_report_filters_on_filter_id" - create_table "report_tags", :force => true do |t| + create_table "report_tags", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "report_id", :integer t.column "tag_id", :integer end @@ -94,7 +94,7 @@ ActiveRecord::Schema.define(:version => 20081104063853) do add_index "report_tags", ["report_id"], :name => "index_report_tags_on_report_id" add_index "report_tags", ["tag_id"], :name => "index_report_tags_on_tag_id" - create_table "reporters", :force => true do |t| + create_table "reporters", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "location_id", :integer t.column "type", :string, :limit => 30 t.column "uniqueid", :string, :limit => 80 @@ -109,7 +109,7 @@ ActiveRecord::Schema.define(:version => 20081104063853) do add_index "reporters", ["uniqueid", "type"], :name => "index_reports_on_uniqueid_and_type", :unique => true - create_table "reports", :force => true do |t| + create_table "reports", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "source", :string, :limit => 3 t.column "reporter_id", :integer t.column "location_id", :integer @@ -130,12 +130,13 @@ ActiveRecord::Schema.define(:version => 20081104063853) do t.column "dismissed_at", :datetime t.column "tag_s", :string t.column "is_chatter", :boolean, :default => false + t.column "polling_place_name", :string end add_index "reports", ["created_at"], :name => "index_reports_on_created_at" add_index "reports", ["reviewer_id"], :name => "index_reports_on_reviewer_id" - create_table "reviewer_alerts", :force => true do |t| + create_table "reviewer_alerts", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "text", :string t.column "user_id", :integer t.column "created_at", :datetime @@ -151,12 +152,25 @@ ActiveRecord::Schema.define(:version => 20081104063853) do t.column "decimal_value", :integer, :limit => 10 end - create_table "tags", :force => true do |t| + create_table "tags", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "pattern", :string, :limit => 30 t.column "description", :string, :limit => 80 t.column "score", :integer end + create_table "tvr_statuses", :options=>'ENGINE=MyISAM', :force => true do |t| + t.column "tid", :integer + t.column "user_id", :integer + t.column "created_at", :datetime + t.column "text", :string + t.column "language", :string, :limit => 2 + t.column "location_id", :integer + end + + add_index "tvr_statuses", ["tid"], :name => "index_statuses_on_tid", :unique => true + add_index "tvr_statuses", ["user_id"], :name => "index_statuses_on_user_id" + add_index "tvr_statuses", ["text"], :name => "index_statuses_on_text" + create_table "users", :options=>'ENGINE=MyISAM', :force => true do |t| t.column "first_name", :string, :limit => 80 t.column "last_name", :string, :limit => 80 db/schema.rb @@ -31,10 +31,12 @@ module Geo country_code = r['country']=='United States' ? 'US' : nil { :locality => r['city'], :administrative_area => r['region'], :country_code => country_code } end.uniq + return nil if results.empty? loc = results.first point = latlon.split(',') loc.merge(:point => Point.from_x_y(point[1].to_f, point[0].to_f), :geo_source_id => 1) - rescue + rescue => e + logger.info "#{e.message}" tries += 1 retry if tries<3 loc = nil vendor/plugins/geocoding/lib/geocoders/001_google/geocode.rb @@ -12,6 +12,7 @@ module Geo pstring = params.map { |k,v| "#{k}=#{URI.encode(v)}" }.join('&') url = "http://api.local.yahoo.com/MapsService/V1/geocode?#{pstring}" loc = ExtractableHash.new.merge(Hash.from_xml(open(url).read)) + return nil unless loc.extract('ResultSet City') point = Point.from_x_y(loc.extract('ResultSet Result Longitude').to_f, loc.extract('ResultSet Result Latitude').to_f) loc = loc.transform( :thoroughfare => 'ResultSet Result Address', vendor/plugins/geocoding/lib/geocoders/002_yahoo/geocode.rb 65aa15fbee6a074c86a8fdd98fbd90b297571da1 David Troy dave@popvox.com http://github.com/davetroy/votereport/commit/cf75707109765099041a81547833f21bfe2f3d0c cf75707109765099041a81547833f21bfe2f3d0c 2008-11-08T13:20:08-08:00 2008-11-08T13:20:08-08:00 Tune reverse geocoding 45af559224ada4cf3954256925b477dee0c4e8ea David Troy dave@popvox.com