geonames 0.2.0 → 0.2.1

data/geonames.gemspec

@@ -3,7 +3,7 @@ require 'date'
 
 SPEC = Gem::Specification.new do |s| 
   s.name = "geonames" 
-  s.version = "0.2.0" 
+  s.version = "0.2.1" 
   s.author = "Adam Wisniewski" 
   s.email = "adamw@tbcn.ca" 
   s.date = s.date = Date.today.to_s

data/lib/geonames.rb

@@ -29,6 +29,7 @@ require 'postal_code_search_criteria'
 require 'timezone'
 require 'country_subdivision'
 require 'wikipedia_article'
+require 'intersection'
 
 module Geonames
   

data/lib/intersection.rb

@@ -18,7 +18,24 @@
 
 module Geonames
     class Intersection
-    
+        attr :street_1
+        attr :street_2
+        attr :latitude
+        attr :longitude
+        attr :distance
+        attr :postal_code
+        attr :place_name
+        attr :country_code
+        attr :admin_code_1
+        attr :admin_name_2
+        attr :admin_code_2
+        attr :admin_name_1
+        
+        attr_writer :street_1, :street_2
+        attr_writer :postal_code, :place_name, :country_code
+        attr_writer :latitude, :longitude, :admin_name_1
+        attr_writer :admin_code_1, :admin_name_2, :admin_code_2
+        attr_writer :distance 
     end
 end
 

data/lib/main.rb

@@ -1,6 +1,7 @@
 #=============================================================================
 #
 # Copyright 2007 Adam Wisniewski <adamw@tbcn.ca> 
+# Contributions by Andrew Turner, High Earth Orbit
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
@@ -19,15 +20,19 @@
 require 'geonames'
 require 'pp'
 
+# get the nearest intersection
+intersection = Geonames::WebService.find_nearest_intersection 40.7574053333333, -73.9734773333333
+puts intersection.street_1 #=> Park Ave
+puts intersection.street_2 #=> E 51st St
+
 # get wikipedia articles by lat / long
-# articles_nearby = Geonames::WebService.findNearbyWikipedia :lat => 43.900120387, :long => -78.882869834
-# p articles_nearby
+articles_nearby = Geonames::WebService.find_nearby_wikipedia :lat => 43.900120387, :long => -78.882869834
+p articles_nearby
 
 # get wikipedia articles by bounding box
-articles_nearby = Geonames::WebService.findBoundingBoxWikipedia :north => 43.900120387, :east => -78.882869834, :south => 43.82, :west => 79.0
+articles_nearby = Geonames::WebService.find_bounding_box_wikipedia :north => 43.900120387, :east => -78.882869834, :south => 43.82, :west => 79.0
 p articles_nearby
 
-Process.exit
 # get list of places near by longitude/longitude location
 places_nearby = Geonames::WebService.find_nearby_place_name 43.900120387, -78.882869834
 p places_nearby

data/lib/web_service.rb

@@ -1,6 +1,7 @@
 #=============================================================================
 #
 # Copyright 2007 Adam Wisniewski <adamw@tbcn.ca>
+# Contributions by Andrew Turner, High Earth Orbit
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
@@ -16,7 +17,6 @@
 #
 #=============================================================================
 
-
 module Geonames
   class WebService
     def WebService.get_element_child_text( element, child )
@@ -69,11 +69,11 @@ module Geonames
       article.longitude             = WebService::get_element_child_float( element, 'lng' )
       article.thumbnail_img         = WebService::get_element_child_text( element, 'thumbnailImg' )
       article.distance              = WebService::get_element_child_float( element, 'distance' )
-      
+
       return article
 
     end
-    
+
     def WebService.element_to_toponym ( element )
       toponym = Toponym.new
 
@@ -96,6 +96,27 @@ module Geonames
 
     end
 
+    def WebService.element_to_intersection ( element )
+      intersection = Intersection.new
+
+      intersection.street_1        = WebService::get_element_child_text( element, 'street1' )
+      intersection.street_2        = WebService::get_element_child_text( element, 'street2' )
+      intersection.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      intersection.admin_code_1    = WebService::get_element_child_text( element, 'adminCode1' )
+      intersection.admin_code_2    = WebService::get_element_child_text( element, 'adminCode2' )
+      intersection.admin_name_1    = WebService::get_element_child_text( element, 'adminName1' )
+      intersection.admin_name_2    = WebService::get_element_child_text( element, 'adminName2' )
+      intersection.country_code    = WebService::get_element_child_text( element, 'countryCode' )
+      intersection.distance        = WebService::get_element_child_float( element, 'distance' )
+      intersection.longitude       = WebService::get_element_child_float( element, 'lat' )
+      intersection.latitude        = WebService::get_element_child_float( element, 'lng' )
+      intersection.place_name      = WebService::get_element_child_text( element, 'name' )
+      intersection.postal_code     = WebService::get_element_child_text( element, 'postalcode' )
+
+      return intersection
+
+    end
+
     def WebService.postal_code_search( postal_code, place_name, country_code )
       postal_code_sc = PostalCodeSearchCriteria.new
       postal_code_sc.postal_code = postal_code
@@ -183,6 +204,34 @@ module Geonames
 
     end
 
+    def WebService.find_nearest_intersection( lat, long )
+
+      url = Geonames::GEONAMES_SERVER + "/findNearestIntersection?a=a"
+
+      url = url + "&lat=" + lat.to_s
+      url = url + "&lng=" + long.to_s
+
+      uri = URI.parse(url)
+
+      req = Net::HTTP::Get.new(uri.path + '?' + uri.query)
+
+      res = Net::HTTP.start( uri.host, uri.port ) { |http|
+        http.request( req )
+      }
+
+      doc = REXML::Document.new res.body
+
+      intersection = []
+      doc.elements.each("geonames/intersection") do |element|
+
+        intersection = WebService::element_to_intersection( element )
+
+      end
+
+      return intersection
+
+    end
+
     def WebService.timezone( lat, long )
       timezone = Timezone.new
 
@@ -212,8 +261,13 @@ module Geonames
     end
 
     def WebService.findNearbyWikipedia( hashes )
+      # here for backwards compatibility
+      WebService.find_nearby_wikipedia( hashes )
+    end
+    
+    def WebService.find_nearby_wikipedia( hashes )
       articles = Array.new
-      
+
       lat = hashes[:lat]
       long = hashes[:long]
       lang = hashes[:lang]
@@ -254,10 +308,15 @@ module Geonames
       return articles
 
     end
-    
+
     def WebService.findBoundingBoxWikipedia( hashes )
+      # here for backwards compatibility
+      WebService.find_bounding_box_wikipedia( hashes )
+    end
+    
+    def WebService.find_bounding_box_wikipedia( hashes )
       articles = Array.new
-      
+
       north = hashes[:north]
       east = hashes[:east]
       south = hashes[:south]
@@ -294,7 +353,7 @@ module Geonames
 
       return articles
 
-    end    
+    end
 
     def WebService.country_subdivision ( lat, long )
       country_subdivision = CountrySubdivision.new
@@ -426,9 +485,9 @@ module Geonames
 
       return toponym_sr
     end
-
-
+    
   end
 end
 
-
+#alias WebService.find_nearby_wikipedia findNearbyWikipedia
+#alias find_bounding_box_wikipedia findBoundingBoxWikipedia

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: geonames
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-04-01 00:00:00 -04:00
+  version: 0.2.1
+date: 2007-04-02 00:00:00 -04:00
 summary: Ruby library for Geonames Web Services (http://www.geonames.org/export/)
 require_paths: 
 - lib