quake 0.0.2 → 0.0.3

data/README.md

@@ -35,6 +35,11 @@ Fetch all the earthquakes from the past [week|day|hour] with minimum and/or maxi
     events = Quake::Event.last_week :max_magnitude => 4
     events = Quake::Event.last_week :min_magnitude => 3, :max_magnitude => 4
 
+Fetch all the earthquakes from the past [week|day|hour] with a minimum and/or maximum magnitude at or near a location (in km):
+
+		events = Quake::Event.last_week :min_magnitude => 2, :epicenter => "37.156, -117.3723"
+		events = Quake::Event.last_week :min_magnitude => 2, :epicenter => "37.156, -117.3723", :distance => 100
+
 Questions or Problems?
 ----------------------
 

data/lib/quake/event.rb

@@ -15,28 +15,35 @@ module Quake
     attr_accessor :nst
     attr_accessor :region
     
-    def self.last_week(criteria = {:min_magnitude => 2.5, :max_magnitude => 10})
+    def self.last_week(criteria = {:min_magnitude => 2.5})
       raw_items = CSV.parse(Curl::Easy.perform(WEEK).body_str)
       create_events(raw_items, criteria)
     end
     
-    def self.last_day(criteria = {:max_magnitude => 10})
+    def self.last_day(criteria = {})
       raw_items = CSV.parse(Curl::Easy.perform(DAY).body_str)
       create_events(raw_items, criteria)
     end
     
-    def self.last_hour(criteria = {:max_magnitude => 10})
+    def self.last_hour(criteria = {})
       raw_items = CSV.parse(Curl::Easy.perform(HOUR).body_str)
       create_events(raw_items, criteria)
     end
     
+    def distance_from(lat, long)
+      (Math.acos(Math.sin(self.latitude) * 
+      Math.sin(lat) + Math.cos(self.latitude) * 
+      Math.cos(lat) * Math.cos(self.longitude - long)) * 
+      SPHERICAL_APPROX_OF_EARTH).round(2)
+    end
+    
     def initialize(raw)
       self.source = raw[0]
       self.id = raw[1]
       self.version = raw[2].to_i
       self.datetime = DateTime.strptime(raw[3], fmt="%A, %B %d, %Y %H:%M:%S UTC")
-      self.latitude = raw[4]
-      self.longitude = raw[5]
+      self.latitude = raw[4].to_f
+      self.longitude = raw[5].to_f
       self.magnitude = raw[6].to_f
       self.depth = raw[7].to_f
       self.nst = raw[8].to_i
@@ -58,6 +65,9 @@ module Quake
             valid_event = false unless event.magnitude >= criteria[criterion]
           when :max_magnitude
             valid_event = false unless event.magnitude <= criteria[criterion]
+          when :epicenter
+            criteria[:distance] = 0 unless criteria[:distance]
+            valid_event = self.check_distance(event, criteria)
           end
         end
         events << Event.new(raw_item) if valid_event
@@ -65,9 +75,22 @@ module Quake
       events
     end
     
+    def self.check_distance(event, criteria)
+      valid_event = true
+      if LAT_LONG_REGEX.match(criteria[:epicenter])
+        coordinates = criteria[:epicenter].split(',').collect{ |coordinate| coordinate.strip.to_f }
+        valid_event = false unless event.distance_from(coordinates[0], coordinates[1]) <= criteria[:distance]
+      else
+        valid_event = false
+      end
+      valid_event
+    end
+        
     WEEK = "http://earthquake.usgs.gov/earthquakes/catalogs/eqs7day-M2.5.txt"
     DAY = "http://earthquake.usgs.gov/earthquakes/catalogs/eqs1day-M0.txt"
     HOUR = "http://earthquake.usgs.gov/earthquakes/catalogs/eqs1hour-M0.txt"
+    SPHERICAL_APPROX_OF_EARTH = 6371 # km
+    LAT_LONG_REGEX = /^\s*[-+]?\d+\.\d+\,\s?[-+]?\d+\.\d+\s*$/
     
   end
   

data/lib/quake/version.rb

@@ -1,3 +1,3 @@
 module Quake
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/tests/event_tests.rb

@@ -46,4 +46,31 @@ class EventTests < MiniTest::Unit::TestCase
     assert(events.count > 0)
   end
   
+  def test_event_distance_for_identicals
+    events = Quake::Event.last_day
+    event = events[0]
+    assert(event.distance_from(event.latitude, event.longitude) == 0)
+  end
+  
+  def test_event_distance_for_different
+    events = Quake::Event.last_day
+    event1 = events[0]
+    event2 = events[events.count-1]
+    assert(event1.distance_from(event2.latitude, event2.longitude) > 0)
+  end
+  
+  def test_revent_events_with_epicenter
+    events = Quake::Event.last_day
+    event = events[0]
+    events = Quake::Event.last_day :epicenter => "#{event.latitude},#{event.longitude}"
+    assert(events.count == 1)
+  end
+  
+  def test_revent_events_with_epicenter_and_distance
+    events = Quake::Event.last_day
+    event = events[0]
+    events = Quake::Event.last_day :epicenter => "#{event.latitude},#{event.longitude}", :distance => 20004 # half the earth's circumference
+    assert(events.count > 1)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quake
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-08-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70213556338760 !ruby/object:Gem::Requirement
+  requirement: &70313665214360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.7.15
   type: :runtime
   prerelease: false
-  version_requirements: *70213556338760
+  version_requirements: *70313665214360
 description: A library exposing the U.S. Geological Survey's real-time earthquake
   data
 email: