geokit 1.6.0 → 1.6.5

data/test/test_latlng.rb

@@ -3,13 +3,13 @@ require 'lib/geokit'
 require 'mocha'
 
 class LatLngTest < Test::Unit::TestCase #:nodoc: all
-  
+
   def setup
     @loc_a = Geokit::LatLng.new(32.918593,-96.958444)
     @loc_e = Geokit::LatLng.new(32.969527,-96.990159)
     @point = Geokit::LatLng.new(@loc_a.lat, @loc_a.lng)
   end
-  
+
   def valid_reverse_geocoding_result
     location = Geokit::GeoLoc.new({
       :city => "Essen",
@@ -21,19 +21,19 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
       :street_address => "Porscheplatz 1",
       :zip => "45127"
     })
-    
+
     location.full_address = "Porscheplatz 1, 45127 Essen, Deutschland"
     location.precision = 'address'
     location.provider = 'google'
     location.success = true
     location
   end
-  
+
   def test_distance_between_same_using_defaults
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a)
     assert_equal 0, @loc_a.distance_to(@loc_a)
   end
-  
+
   def test_distance_between_same_with_miles_and_flat
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :miles, :formula => :flat)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :miles, :formula => :flat)
@@ -43,32 +43,32 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :kms, :formula => :flat)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :kms, :formula => :flat)
   end
-  
+
   def test_distance_between_same_with_nms_and_flat
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :nms, :formula => :flat)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :nms, :formula => :flat)
   end
-  
+
   def test_distance_between_same_with_miles_and_sphere
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :miles, :formula => :sphere)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :miles, :formula => :sphere)
   end
-  
+
   def test_distance_between_same_with_kms_and_sphere
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :kms, :formula => :sphere)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :kms, :formula => :sphere)
   end
-  
+
   def test_distance_between_same_with_nms_and_sphere
     assert_equal 0, Geokit::LatLng.distance_between(@loc_a, @loc_a, :units => :nms, :formula => :sphere)
     assert_equal 0, @loc_a.distance_to(@loc_a, :units => :nms, :formula => :sphere)
   end
-  
+
   def test_distance_between_diff_using_defaults
     assert_in_delta 3.97, Geokit::LatLng.distance_between(@loc_a, @loc_e), 0.01
     assert_in_delta 3.97, @loc_a.distance_to(@loc_e), 0.01
   end
-  
+
   def test_distance_between_diff_with_miles_and_flat
     assert_in_delta 3.97, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :miles, :formula => :flat), 0.2
     assert_in_delta 3.97, @loc_a.distance_to(@loc_e, :units => :miles, :formula => :flat), 0.2
@@ -78,27 +78,27 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     assert_in_delta 6.39, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :kms, :formula => :flat), 0.4
     assert_in_delta 6.39, @loc_a.distance_to(@loc_e, :units => :kms, :formula => :flat), 0.4
   end
-  
+
   def test_distance_between_diff_with_nms_and_flat
     assert_in_delta 3.334, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :nms, :formula => :flat), 0.4
     assert_in_delta 3.334, @loc_a.distance_to(@loc_e, :units => :nms, :formula => :flat), 0.4
   end
-  
+
   def test_distance_between_diff_with_miles_and_sphere
     assert_in_delta 3.97, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :miles, :formula => :sphere), 0.01
     assert_in_delta 3.97, @loc_a.distance_to(@loc_e, :units => :miles, :formula => :sphere), 0.01
   end
-  
+
   def test_distance_between_diff_with_kms_and_sphere
     assert_in_delta 6.39, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :kms, :formula => :sphere), 0.01
     assert_in_delta 6.39, @loc_a.distance_to(@loc_e, :units => :kms, :formula => :sphere), 0.01
   end
-  
+
   def test_distance_between_diff_with_nms_and_sphere
     assert_in_delta 3.454, Geokit::LatLng.distance_between(@loc_a, @loc_e, :units => :nms, :formula => :sphere), 0.01
     assert_in_delta 3.454, @loc_a.distance_to(@loc_e, :units => :nms, :formula => :sphere), 0.01
   end
-  
+
   def test_manually_mixed_in
     assert_equal 0, Geokit::LatLng.distance_between(@point, @point)
     assert_equal 0, @point.distance_to(@point)
@@ -107,15 +107,15 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     assert_in_delta 6.39, @point.distance_to(@loc_e, :units => :kms, :formula => :flat), 0.4
     assert_in_delta 3.334, @point.distance_to(@loc_e, :units => :nms, :formula => :flat), 0.4
   end
-  
+
   def test_heading_between
     assert_in_delta 332, Geokit::LatLng.heading_between(@loc_a,@loc_e), 0.5
   end
 
   def test_heading_to
     assert_in_delta 332, @loc_a.heading_to(@loc_e), 0.5
-  end  
-  
+  end
+
   def test_class_endpoint
     endpoint=Geokit::LatLng.endpoint(@loc_a, 332, 3.97)
     assert_in_delta @loc_e.lat, endpoint.lat, 0.0005
@@ -126,29 +126,29 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     endpoint=@loc_a.endpoint(332, 3.97)
     assert_in_delta @loc_e.lat, endpoint.lat, 0.0005
     assert_in_delta @loc_e.lng, endpoint.lng, 0.0005
-  end  
-  
+  end
+
   def test_midpoint
     midpoint=@loc_a.midpoint_to(@loc_e)
     assert_in_delta 32.944061, midpoint.lat, 0.0005
     assert_in_delta(-96.974296, midpoint.lng, 0.0005)
-  end  
-  
+  end
+
   def test_normalize
     lat=37.7690
     lng=-122.443
     res=Geokit::LatLng.normalize(lat,lng)
-    assert_equal res,Geokit::LatLng.new(lat,lng) 
+    assert_equal res,Geokit::LatLng.new(lat,lng)
     res=Geokit::LatLng.normalize("#{lat}, #{lng}")
-    assert_equal res,Geokit::LatLng.new(lat,lng) 
+    assert_equal res,Geokit::LatLng.new(lat,lng)
     res=Geokit::LatLng.normalize("#{lat} #{lng}")
     assert_equal res,Geokit::LatLng.new(lat,lng)
     res=Geokit::LatLng.normalize("#{lat.to_i} #{lng.to_i}")
-    assert_equal res,Geokit::LatLng.new(lat.to_i,lng.to_i)    
+    assert_equal res,Geokit::LatLng.new(lat.to_i,lng.to_i)
     res=Geokit::LatLng.normalize([lat,lng])
     assert_equal res,Geokit::LatLng.new(lat,lng)
   end
-  
+
   def test_hash
     lat=37.7690
     lng=-122.443
@@ -156,7 +156,7 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     second = Geokit::LatLng.new(lat,lng)
     assert_equal first.hash, second.hash
   end
-  
+
   def test_eql?
     lat=37.7690
     lng=-122.443
@@ -165,45 +165,57 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     assert first.eql?(second)
     assert second.eql?(first)
   end
-  
+
+  def test_valid_when_lat_and_lng_defined
+    assert Geokit::LatLng.new(37.7690,-122.443).valid?
+  end
+
+  def test_not_valid_when_lat_is_nil
+    assert ! Geokit::LatLng.new(nil,-122.443).valid?
+  end
+
+  def test_not_valid_when_lng_is_nil
+    assert ! Geokit::LatLng.new(37.7690,nil).valid?
+  end
+
   def test_reverse_geocode
     point = Geokit::LatLng.new(51.4578329, 7.0166848)
     Geokit::Geocoders::MultiGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode
-    
+
     assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city 
+    assert_equal "Essen", res.city
     assert_equal "45127", res.zip
     assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
     assert res.is_us? == false
     assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
   end
-  
+
   def test_reverse_geocoding_using_specific_geocoder
     point = Geokit::LatLng.new(51.4578329, 7.0166848)
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode(:using => Geokit::Geocoders::GoogleGeocoder)
 
     assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city 
+    assert_equal "Essen", res.city
     assert_equal "45127", res.zip
     assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
     assert res.is_us? == false
     assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
     assert_equal "google", res.provider
   end
-  
+
   def test_reverse_geocoding_using_specific_geocoder_short_syntax
     point = Geokit::LatLng.new(51.4578329, 7.0166848)
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode(:using => :google)
 
     assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city 
+    assert_equal "Essen", res.city
     assert_equal "45127", res.zip
     assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
     assert res.is_us? == false
     assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address #slightly different from yahoo
     assert_equal "google", res.provider
   end
-end
+end

data/test/test_multi_geocoder.rb

@@ -3,41 +3,41 @@ require File.join(File.dirname(__FILE__), 'test_base_geocoder')
 Geokit::Geocoders::provider_order=[:google,:yahoo,:us]
 
 class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
-  
+
   def setup
     super
     @failure = Geokit::GeoLoc.new
   end
-  
+
   def test_successful_first
     Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
-  
+
   def test_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success)
-    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
-  
+
   def test_double_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@success)
-    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
-  
+
   def test_failure
     Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
 
   def test_invalid_provider
     temp = Geokit::Geocoders::provider_order
     Geokit::Geocoders.provider_order = [:bogus]
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)    
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)
     Geokit::Geocoders.provider_order = temp
   end
 
@@ -55,31 +55,31 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
-  
+
   def test_reverse_geocode_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
-    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
-  
+
   def test_reverse_geocode_double_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
-    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+    assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
-  
+
   def test_reverse_geocode_failure
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
 
   def test_reverse_geocode_with_invalid_provider
     temp = Geokit::Geocoders::provider_order
     Geokit::Geocoders.provider_order = [:bogus]
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)    
+    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
     Geokit::Geocoders.provider_order = temp
   end
 
@@ -90,4 +90,4 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode("")
     Geokit::Geocoders.provider_order = t1 # reset to orig values
   end
-end
+end

data/test/test_multi_ip_geocoder.rb

@@ -3,31 +3,31 @@ require File.join(File.dirname(__FILE__), 'test_base_geocoder')
 Geokit::Geocoders::ip_provider_order=[:geo_plugin,:ip]
 
 class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
-  
+
   def setup
     @ip_address = '10.10.10.10'
     @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>37.7742, :lng=>-122.417068})
     @success.success = true
     @failure = Geokit::GeoLoc.new
   end
-  
+
   def test_successful_first
     Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end
-  
+
   def test_failover
     Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
     Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end
-  
+
   def test_failure
     Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
     Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end
-  
+
   def test_invalid_provider
     temp = Geokit::Geocoders::ip_provider_order
     Geokit::Geocoders.ip_provider_order = [:bogus]

data/test/test_us_geocoder.rb

@@ -3,15 +3,15 @@ require File.join(File.dirname(__FILE__), 'test_base_geocoder')
 Geokit::Geocoders::geocoder_us = nil
 
 class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
-  
-  GEOCODER_US_FULL='37.792528,-122.393981,100 Spear St,San Francisco,CA,94105'  
-  
+
+  GEOCODER_US_FULL='37.792528,-122.393981,100 Spear St,San Francisco,CA,94105'
+
   def setup
     super
     @us_full_hash = {:city=>"San Francisco", :state=>"CA"}
     @us_full_loc = Geokit::GeoLoc.new(@us_full_hash)
-  end  
-  
+  end
+
   def test_geocoder_us
     response = MockSuccess.new
     response.expects(:body).returns(GEOCODER_US_FULL)
@@ -19,22 +19,22 @@ class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
     Geokit::Geocoders::UsGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     verify(Geokit::Geocoders::UsGeocoder.geocode(@address))
   end
-  
+
   def test_geocoder_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(GEOCODER_US_FULL)
     url = "http://geocoder.us/service/csv/geocode?address=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::UsGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    verify(Geokit::Geocoders::UsGeocoder.geocode(@us_full_loc))    
+    verify(Geokit::Geocoders::UsGeocoder.geocode(@us_full_loc))
   end
-  
+
   def test_service_unavailable
     response = MockFailure.new
     url = "http://geocoder.us/service/csv/geocode?address=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::UsGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    assert !Geokit::Geocoders::UsGeocoder.geocode(@us_full_loc).success   
-  end  
-  
+    assert !Geokit::Geocoders::UsGeocoder.geocode(@us_full_loc).success
+  end
+
   def test_all_method
     response = MockSuccess.new
     response.expects(:body).returns(GEOCODER_US_FULL)
@@ -43,14 +43,14 @@ class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
     res=Geokit::Geocoders::UsGeocoder.geocode(@address)
     assert_equal 1, res.all.size
   end
-  
+
   private
-  
+
   def verify(location)
     assert_equal "CA", location.state
-    assert_equal "San Francisco", location.city 
-    assert_equal "37.792528,-122.393981", location.ll 
+    assert_equal "San Francisco", location.city
+    assert_equal "37.792528,-122.393981", location.ll
     assert location.is_us?
-    assert_equal "100 Spear St, San Francisco, CA, 94105, US", location.full_address  #slightly different from yahoo    
+    assert_equal "100 Spear St, San Francisco, CA, 94105, US", location.full_address  #slightly different from yahoo
   end
-end
+end

data/test/test_yahoo_geocoder.rb

@@ -4,17 +4,13 @@ Geokit::Geocoders::yahoo = 'Yahoo'
 
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     YAHOO_FULL=<<-EOF.strip
-  <?xml version="1.0"?>
-  <ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="address"><Latitude>37.792406</Latitude><Longitude>-122.39411</Longitude><Address>100 SPEAR ST</Address><City>SAN FRANCISCO</City><State>CA</State><Zip>94105-1522</Zip><Country>US</Country></Result></ResultSet>
-  <!-- ws01.search.scd.yahoo.com uncompressed/chunked Mon Jan 29 16:23:43 PST 2007 -->
+      {"ResultSet":{"version":"1.0","Error":0,"ErrorMessage":"No error","Locale":"us_US","Quality":87,"Found":1,"Results":[{"quality":87,"latitude":"37.792406","longitude":"-122.39411","offsetlat":"37.792332","offsetlon":"-122.394027","radius":500,"name":"","line1":"100 Spear St","line2":"San Francisco, CA  94105-1522","line3":"","line4":"United States","house":"100","street":"Spear St","xstreet":"","unittype":"","unit":"","postal":"94105-1522","neighborhood":"","city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":"","uzip":"94105","hash":"0FA06819B5F53E75","woeid":12797156,"woetype":11}]}}
     EOF
 
     YAHOO_CITY=<<-EOF.strip
-  <?xml version="1.0"?>
-  <ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="city"><Latitude>37.7742</Latitude><Longitude>-122.417068</Longitude><Address></Address><City>SAN FRANCISCO</City><State>CA</State><Zip></Zip><Country>US</Country></Result></ResultSet>
-  <!-- ws02.search.scd.yahoo.com uncompressed/chunked Mon Jan 29 18:00:28 PST 2007 -->
+      {"ResultSet":{"version":"1.0","Error":0,"ErrorMessage":"No error","Locale":"us_US","Quality":40,"Found":1,"Results":[{"quality":40,"latitude":"37.7742","longitude":"-122.417068","offsetlat":"37.7742","offsetlon":"-122.417068","radius":10700,"name":"","line1":"","line2":"San Francisco, CA","line3":"","line4":"United States","house":"","street":"","xstreet":"","unittype":"","unit":"","postal":"","neighborhood":"","city":"San Francisco","county":"San Francisco County","state":"California","country":"United States","countrycode":"US","statecode":"CA","countycode":"","uzip":"94102","hash":"","woeid":2487956,"woetype":7}]}}
     EOF
-    
+
   def setup
     super
     @yahoo_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105-1522", :country_code=>"US"}
@@ -22,64 +18,64 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     @yahoo_full_loc = Geokit::GeoLoc.new(@yahoo_full_hash)
     @yahoo_city_loc = Geokit::GeoLoc.new(@yahoo_city_hash)
   end
-  
+
   # the testing methods themselves
   def test_yahoo_full_address
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
-  end 
-  
+    do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@full_address))
+  end
+
   def test_yahoo_full_address_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
+    res = Geokit::Geocoders::YahooGeocoder.geocode(@full_address)
     assert_equal 8, res.accuracy
   end
-  
+
   def test_yahoo_full_address_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_FULL)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@full_address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@full_address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_full_loc))
-  end  
+  end
 
   def test_yahoo_city
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
   end
-  
+
   def test_yahoo_city_accuracy
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
     assert_equal 4, res.accuracy
   end
-  
+
   def test_yahoo_city_with_geo_loc
     response = MockSuccess.new
     response.expects(:body).returns(YAHOO_CITY)
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"  
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc))
-  end  
-  
+  end
+
   def test_service_unavailable
     response = MockFailure.new
-    url = "http://api.local.yahoo.com/MapsService/V1/geocode?appid=Yahoo&location=#{Geokit::Inflector.url_escape(@address)}"
+    url = "http://where.yahooapis.com/geocode?flags=J&appid=Yahoo&q=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::YahooGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert !Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc).success
-  end  
+  end
 
   private
 
@@ -92,14 +88,14 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal "100 Spear St, San Francisco, CA, 94105-1522, US", res.full_address
     assert_equal "yahoo", res.provider
   end
-  
+
   def do_city_assertions(res)
     assert_equal "CA", res.state
-    assert_equal "San Francisco", res.city 
+    assert_equal "San Francisco", res.city
     assert_equal "37.7742,-122.417068", res.ll
     assert res.is_us?
-    assert_equal "San Francisco, CA, US", res.full_address 
+    assert_equal "San Francisco, CA, US", res.full_address
     assert_nil res.street_address
     assert_equal "yahoo", res.provider
-  end  
-end
+  end
+end