eugenebolshakov-geokit 1.5.0 → 1.5.1

data/lib/geokit/geocoders.rb

@@ -353,19 +353,38 @@ module Geokit
         params << "&maxRows=10"
         
         self.do_call_geocoder_service(address, params) do |res, doc|
-          # only take the first result
-          res.lat=doc.elements['//geoname/lat'].text if doc.elements['//geoname/lat']
-          res.lng=doc.elements['//geoname/lng'].text if doc.elements['//geoname/lng']
-          res.name = doc.elements['//geoname/name'].text if doc.elements['//geoname/name']
-          res.country_code=doc.elements['//geoname/countryCode'].text if doc.elements['//geoname/countryCode']
-          res.provider='geonames'
-          # if the location is a city or village
-          if doc.elements['//geoname/fcl'].text == 'P'
-            res.city=res.name
+          if(doc.elements['//geonames/totalResultsCount'].text.to_i > 0)
+            # only take the first result
+            res.lat=doc.elements['//geoname/lat'].text if doc.elements['//geoname/lat']
+            res.lng=doc.elements['//geoname/lng'].text if doc.elements['//geoname/lng']
+            res.name = doc.elements['//geoname/name'].text if doc.elements['//geoname/name']
+            res.country_code=doc.elements['//geoname/countryCode'].text if doc.elements['//geoname/countryCode']
+            res.provider='geonames'
+            # if the location is a city or village
+            if doc.elements['//geoname/fcl'].text == 'P'
+              res.city=res.name
+            end
+            res.state=doc.elements['//geoname/adminCode1'].text if doc.elements['//geoname/adminCode1']
+            res.timezone = doc.elements['//geoname/timezone'].text if doc.elements['//geoname/timezone']
+            res.success=true
+          end
+        end
+      end
+
+      def self.cities_in_bounds(bounds)
+        params = "/cities?north=#{bounds.ne.lat}&south=#{bounds.sw.lat}&east=#{bounds.ne.lng}&west=#{bounds.sw.lng}"
+
+        self.do_call_geocoder_service(bounds.to_s, params) do |res, doc|
+          if doc.elements['//geonames/geoname']
+            # only take the first result
+            first = doc.elements['//geonames/geoname']
+            res.lat = first.elements['lat'].text
+            res.lng = first.elements['lng'].text
+            res.city = res.name = first.elements['name'].text
+            res.country_code = first.elements['countryCode'].text if first.elements['countryCode']
+            res.provider='geonames'
+            res.success = true
           end
-          res.state=doc.elements['//geoname/adminCode1'].text if doc.elements['//geoname/adminCode1']
-          res.timezone = doc.elements['//geoname/timezone'].text if doc.elements['//geoname/timezone']
-          res.success=true
         end
       end
 
@@ -376,15 +395,17 @@ module Geokit
         params = "/postalCodeSearch?placename=#{Geokit::Inflector::url_escape(address_string(address))}&maxRows=10"
         
         self.do_call_geocoder_service(address, params) do |res, doc|
-          # only take the first result
-          res.lat=doc.elements['//code/lat'].text if doc.elements['//code/lat']
-          res.lng=doc.elements['//code/lng'].text if doc.elements['//code/lng']
-          res.country_code=doc.elements['//code/countryCode'].text if doc.elements['//code/countryCode']
-          res.provider='geonames'
-          res.city=doc.elements['//code/name'].text if doc.elements['//code/name']
-          res.state=doc.elements['//code/adminName1'].text if doc.elements['//code/adminName1']
-          res.zip=doc.elements['//code/postalcode'].text if doc.elements['//code/postalcode']
-          res.success=true
+          if(doc.elements['//geonames/totalResultsCount'].text.to_i > 0)
+            # only take the first result
+            res.lat=doc.elements['//code/lat'].text if doc.elements['//code/lat']
+            res.lng=doc.elements['//code/lng'].text if doc.elements['//code/lng']
+            res.country_code=doc.elements['//code/countryCode'].text if doc.elements['//code/countryCode']
+            res.provider='geonames'
+            res.city=doc.elements['//code/name'].text if doc.elements['//code/name']
+            res.state=doc.elements['//code/adminName1'].text if doc.elements['//code/adminName1']
+            res.zip=doc.elements['//code/postalcode'].text if doc.elements['//code/postalcode']
+            res.success=true
+          end
         end
       end
 
@@ -401,25 +422,24 @@ module Geokit
         end
       end
 
-      def self.do_call_geocoder_service(address, params)
+      def self.do_call_geocoder_service(request, params)
         res = self.call_geocoder_service(url(params))
-        
+
         raise GeocodeError.new("HTTP request failed: #{res.class}") if !res.is_a?(Net::HTTPSuccess)
-        
+
         xml=res.body
-        logger.debug "Geonames geocoding. Address: #{address}. Result: #{xml}"
+        logger.debug "Geonames gecoder. Request: #{request}. Result: #{xml}"
         doc=REXML::Document.new(xml)
-        
-        if(doc.elements['//geonames/totalResultsCount'].text.to_i > 0)
-          res=GeoLoc.new
 
-          yield res, doc
-        
-          return res
-        else 
-          logger.info "Geonames was unable to geocode address: "+address
-          return GeoLoc.new
+        res=GeoLoc.new
+
+        yield res, doc
+
+        if !res.success?
+          logger.info "Geonames was unable to process request: #{request}"
         end
+
+        res
       end
     end
 

data/test/test_geonames_reverse_geocoder.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), 'test_base_geocoder')
+
+class GeonamesReverseGeocoderTest < BaseGeocoderTest #:nodoc: all
+  def test_cities_in_bounds
+    ne = GeoKit::LatLng.new(48.97, 2.47)
+    sw = GeoKit::LatLng.new(48.79, 2.21)
+    bounds = GeoKit::Bounds.new(sw, ne)
+
+    @response = MockSuccess.new
+    @response.expects(:body).returns(fixture('geonames/cities_in_bounds'))
+
+    url = "http://ws.geonames.org/cities?north=48.97&south=48.79&east=2.47&west=2.21"
+    Geokit::Geocoders::GeonamesGeocoder.expects(:call_geocoder_service).with(url).returns(@response)
+
+    res=Geokit::Geocoders::GeonamesGeocoder.cities_in_bounds(bounds)
+    assert_equal "Paris", res.city 
+    assert_equal "48.85341,2.3488", res.ll
+    assert !res.is_us?
+    assert_equal "Paris, FR", res.full_address
+    assert_equal "geonames", res.provider
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: eugenebolshakov-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer
@@ -40,6 +45,7 @@ files:
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
 - test/test_geonames_geocoder.rb
+- test/test_geonames_reverse_geocoder.rb
 has_rdoc: true
 homepage: http://geokit.rubyforge.org
 licenses: []
@@ -54,18 +60,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: geokit
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: none
@@ -85,3 +93,4 @@ test_files:
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
 - test/test_geonames_geocoder.rb
+- test/test_geonames_reverse_geocoder.rb