geocoder 0.9.11 → 0.9.12

data/test/geocoder_test.rb

@@ -34,13 +34,13 @@ class GeocoderTest < Test::Unit::TestCase
   def test_distance_to_returns_float
     v = Venue.new(*venue_params(:msg))
     v.latitude, v.longitude = [40.750354, -73.993371]
-    assert (d = v.distance_to(30, -94)).is_a?(Float)
+    assert (d = v.distance_to([30, -94])).is_a?(Float)
   end
 
   def test_distance_from_is_alias_for_distance_to
     v = Venue.new(*venue_params(:msg))
     v.latitude, v.longitude = [40.750354, -73.993371]
-    assert_equal v.distance_from(30, -94), v.distance_to(30, -94)
+    assert_equal v.distance_from([30, -94]), v.distance_to([30, -94])
   end
 
   def test_coordinates_method
@@ -48,7 +48,15 @@ class GeocoderTest < Test::Unit::TestCase
   end
 
   def test_address_method
-    assert Geocoder.address(40.750354, -73.993371).is_a?(String)
+    assert Geocoder.address([40.750354, -73.993371]).is_a?(String)
+  end
+
+  def test_geographic_center_doesnt_overwrite_argument_value
+    # this tests for the presence of a bug that was introduced in version 0.9.11
+    orig_points = [[52,8], [46,9], [42,5]]
+    points = orig_points.clone
+    Geocoder::Calculations.geographic_center(points)
+    assert_equal orig_points, points
   end
 
 
@@ -131,13 +139,13 @@ class GeocoderTest < Test::Unit::TestCase
   def test_result_has_required_attributes
     all_lookups.each do |l|
       Geocoder::Configuration.lookup = l
-      result = Geocoder.search(45.423733, -75.676333).first
+      result = Geocoder.search([45.423733, -75.676333]).first
       assert_result_has_required_attributes(result)
     end
   end
 
 
-  # --- calcluations ---
+  # --- calculations: degree distance ---
 
   def test_longitude_degree_distance_at_equator
     assert_equal 69, Geocoder::Calculations.longitude_degree_distance(0).round
@@ -151,18 +159,24 @@ class GeocoderTest < Test::Unit::TestCase
     assert_equal 0, Geocoder::Calculations.longitude_degree_distance(89.98).round
   end
 
+
+  # --- calculations: distance between ---
+
   def test_distance_between_in_miles
-    assert_equal 69, Geocoder::Calculations.distance_between(0,0, 0,1).round
-    la_to_ny = Geocoder::Calculations.distance_between(34.05,-118.25, 40.72,-74).round
+    assert_equal 69, Geocoder::Calculations.distance_between([0,0], [0,1]).round
+    la_to_ny = Geocoder::Calculations.distance_between([34.05,-118.25], [40.72,-74]).round
     assert (la_to_ny - 2444).abs < 10
   end
 
   def test_distance_between_in_kilometers
-    assert_equal 111, Geocoder::Calculations.distance_between(0,0, 0,1, :units => :km).round
-    la_to_ny = Geocoder::Calculations.distance_between(34.05,-118.25, 40.72,-74, :units => :km).round
+    assert_equal 111, Geocoder::Calculations.distance_between([0,0], [0,1], :units => :km).round
+    la_to_ny = Geocoder::Calculations.distance_between([34.05,-118.25], [40.72,-74], :units => :km).round
     assert (la_to_ny - 3942).abs < 10
   end
 
+
+  # --- calculations: geographic center ---
+
   def test_geographic_center_with_arrays
     assert_equal [0.0, 0.5],
       Geocoder::Calculations.geographic_center([[0,0], [0,1]])
@@ -176,6 +190,9 @@ class GeocoderTest < Test::Unit::TestCase
     assert_equal [0.0, 0.5], Geocoder::Calculations.geographic_center([p1, p2])
   end
 
+
+  # --- calculations: bounding box ---
+
   def test_bounding_box_calculation_in_miles
     center = [51, 7] # Cologne, DE
     radius = 10 # miles
@@ -183,7 +200,7 @@ class GeocoderTest < Test::Unit::TestCase
     dlat = radius / Geocoder::Calculations.longitude_degree_distance(center[0])
     corners = [50.86, 6.77, 51.14, 7.23]
     assert_equal corners.map{ |i| (i * 100).round },
-      Geocoder::Calculations.bounding_box(center[0], center[1], radius).map{ |i| (i * 100).round }
+      Geocoder::Calculations.bounding_box(center, radius).map{ |i| (i * 100).round }
   end
 
   def test_bounding_box_calculation_in_kilometers
@@ -193,11 +210,28 @@ class GeocoderTest < Test::Unit::TestCase
     dlat = radius / Geocoder::Calculations.longitude_degree_distance(center[0], :km)
     corners = [50, 5.41, 52, 8.59]
     assert_equal corners.map{ |i| (i * 100).round },
-      Geocoder::Calculations.bounding_box(center[0], center[1], radius, :units => :km).map{ |i| (i * 100).round }
+      Geocoder::Calculations.bounding_box(center, radius, :units => :km).map{ |i| (i * 100).round }
   end
 
+  def test_bounding_box_calculation_with_object
+    center = [51, 7] # Cologne, DE
+    radius = 10 # miles
+    dlon = radius / Geocoder::Calculations.latitude_degree_distance
+    dlat = radius / Geocoder::Calculations.longitude_degree_distance(center[0])
+    corners = [50.86, 6.77, 51.14, 7.23]
+    obj = Landmark.new("Cologne", center[0], center[1])
+    assert_equal corners.map{ |i| (i * 100).round },
+      Geocoder::Calculations.bounding_box(obj, radius).map{ |i| (i * 100).round }
+  end
 
-  # --- bearing ---
+  def test_bounding_box_calculation_with_address_string
+    assert_nothing_raised do
+      Geocoder::Calculations.bounding_box("4893 Clay St, San Francisco, CA", 50)
+    end
+  end
+
+
+  # --- calculations: bearing ---
 
   def test_compass_points
     assert_equal "N",  Geocoder::Calculations.compass_point(0)
@@ -229,17 +263,29 @@ class GeocoderTest < Test::Unit::TestCase
     methods.each do |m|
       directions.each_with_index do |d,i|
         opp = directions[(i + 2) % 4] # opposite direction
-        p1 = points[d]
-        p2 = points[opp]
-
-        args = p1 + p2 + [:method => m]
-        b = Geocoder::Calculations.bearing_between(*args)
+        b = Geocoder::Calculations.bearing_between(
+          points[d], points[opp], :method => m)
         assert (b - bearings[opp]).abs < 1,
           "Bearing (#{m}) should be close to #{bearings[opp]} but was #{b}."
       end
     end
   end
 
+  def test_spherical_bearing_to
+    l = Landmark.new(*landmark_params(:msg))
+    assert_equal 324, l.bearing_to([50,-85], :method => :spherical).round
+  end
+
+  def test_spherical_bearing_from
+    l = Landmark.new(*landmark_params(:msg))
+    assert_equal 136, l.bearing_from([50,-85], :method => :spherical).round
+  end
+
+  def test_linear_bearing_from_and_to_are_exactly_opposite
+    l = Landmark.new(*landmark_params(:msg))
+    assert_equal l.bearing_from([50,-86.1]), l.bearing_to([50,-86.1]) - 180
+  end
+
 
   # --- input handling ---
 
@@ -258,6 +304,13 @@ class GeocoderTest < Test::Unit::TestCase
     assert !Geocoder.send(:blank_query?, "Москва") # no ASCII characters
   end
 
+  def test_coordinates_detection
+    lookup = Geocoder::Lookup::Google.new
+    assert lookup.send(:coordinates?, "51.178844,5")
+    assert lookup.send(:coordinates?, "51.178844, -1.826189")
+    assert !lookup.send(:coordinates?, "232.65.123")
+  end
+
   def test_does_not_choke_on_nil_address
     all_lookups.each do |l|
       Geocoder::Configuration.lookup = l
@@ -265,6 +318,13 @@ class GeocoderTest < Test::Unit::TestCase
     end
   end
 
+  def test_extract_coordinates
+    coords = [-23,47]
+    l = Landmark.new("Madagascar", coords[0], coords[1])
+    assert_equal coords, Geocoder::Calculations.extract_coordinates(l)
+    assert_equal coords, Geocoder::Calculations.extract_coordinates(coords)
+  end
+
 
   # --- error handling ---
 
@@ -313,7 +373,7 @@ class GeocoderTest < Test::Unit::TestCase
 
   def test_geocoder_ca_result_components
     Geocoder::Configuration.lookup = :geocoder_ca
-    result = Geocoder.search(45.423733, -75.676333).first
+    result = Geocoder.search([45.423733, -75.676333]).first
     assert_equal "CA", result.country_code
     assert_equal "289 Somerset ST E, Ottawa, ON K1N6W1, Canada", result.address
   end
@@ -351,13 +411,6 @@ class GeocoderTest < Test::Unit::TestCase
     assert_match "appid=MY_KEY", g.send(:query_url, "Madison Square Garden, New York, NY  10001, United States")
   end
 
-  def test_detection_of_coordinates_in_search_string
-    Geocoder::Configuration.lookup = :geocoder_ca
-    result = Geocoder.search("51.178844, -1.826189").first
-    assert_not_nil result.city
-    # city only present if reverse geocoding search performed
-  end
-
 
   private # ------------------------------------------------------------------
 

metadata

@@ -2,21 +2,21 @@
 name: geocoder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors: 
-  - Alex Reisner
+- Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -04:00
+date: 2011-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Provides object geocoding (by street or IP address), reverse geocoding (coordinates to street address), and distance calculations. Designed for Rails but works with other Rack frameworks too.
+description: Provides object geocoding (by street or IP address), reverse geocoding (coordinates to street address), and distance queries for ActiveRecord and Mongoid. Designed for Rails but works with other Rack frameworks too.
 email: 
-  - alex@alexreisner.com
+- alex@alexreisner.com
 executables: []
 
 extensions: []
@@ -24,45 +24,49 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - CHANGELOG.rdoc
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - lib/geocoder.rb
-  - lib/geocoder/cache.rb
-  - lib/geocoder/calculations.rb
-  - lib/geocoder/configuration.rb
-  - lib/geocoder/lookups/base.rb
-  - lib/geocoder/lookups/freegeoip.rb
-  - lib/geocoder/lookups/geocoder_ca.rb
-  - lib/geocoder/lookups/google.rb
-  - lib/geocoder/lookups/yahoo.rb
-  - lib/geocoder/orms/active_record.rb
-  - lib/geocoder/orms/active_record_legacy.rb
-  - lib/geocoder/orms/base.rb
-  - lib/geocoder/railtie.rb
-  - lib/geocoder/request.rb
-  - lib/geocoder/results/base.rb
-  - lib/geocoder/results/freegeoip.rb
-  - lib/geocoder/results/geocoder_ca.rb
-  - lib/geocoder/results/google.rb
-  - lib/geocoder/results/yahoo.rb
-  - lib/tasks/geocoder.rake
-  - test/fixtures/freegeoip_74_200_247_59.json
-  - test/fixtures/geocoder_ca_madison_square_garden.json
-  - test/fixtures/geocoder_ca_no_results.json
-  - test/fixtures/geocoder_ca_reverse.json
-  - test/fixtures/google_garbage.json
-  - test/fixtures/google_madison_square_garden.json
-  - test/fixtures/google_no_locality.json
-  - test/fixtures/google_no_results.json
-  - test/fixtures/yahoo_garbage.json
-  - test/fixtures/yahoo_madison_square_garden.json
-  - test/fixtures/yahoo_no_results.json
-  - test/geocoder_test.rb
-  - test/test_helper.rb
+- .gitignore
+- CHANGELOG.rdoc
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- lib/geocoder.rb
+- lib/geocoder/cache.rb
+- lib/geocoder/calculations.rb
+- lib/geocoder/configuration.rb
+- lib/geocoder/lookups/base.rb
+- lib/geocoder/lookups/freegeoip.rb
+- lib/geocoder/lookups/geocoder_ca.rb
+- lib/geocoder/lookups/google.rb
+- lib/geocoder/lookups/yahoo.rb
+- lib/geocoder/models/active_record.rb
+- lib/geocoder/models/base.rb
+- lib/geocoder/models/mongoid.rb
+- lib/geocoder/railtie.rb
+- lib/geocoder/request.rb
+- lib/geocoder/results/base.rb
+- lib/geocoder/results/freegeoip.rb
+- lib/geocoder/results/geocoder_ca.rb
+- lib/geocoder/results/google.rb
+- lib/geocoder/results/yahoo.rb
+- lib/geocoder/stores/active_record.rb
+- lib/geocoder/stores/active_record_legacy.rb
+- lib/geocoder/stores/base.rb
+- lib/geocoder/stores/mongoid.rb
+- lib/tasks/geocoder.rake
+- test/fixtures/freegeoip_74_200_247_59.json
+- test/fixtures/geocoder_ca_madison_square_garden.json
+- test/fixtures/geocoder_ca_no_results.json
+- test/fixtures/geocoder_ca_reverse.json
+- test/fixtures/google_garbage.json
+- test/fixtures/google_madison_square_garden.json
+- test/fixtures/google_no_locality.json
+- test/fixtures/google_no_results.json
+- test/fixtures/yahoo_garbage.json
+- test/fixtures/yahoo_madison_square_garden.json
+- test/fixtures/yahoo_no_results.json
+- test/geocoder_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://www.rubygeocoder.com
 licenses: []
@@ -71,23 +75,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Complete geocoding solution for Ruby.