ym4r 0.6.0 → 0.6.1

data/lib/ym4r/google_maps/geocoding.rb

@@ -4,73 +4,127 @@ require 'rexml/document'
 
 module Ym4r
   module GoogleMaps
-    module Geocoding
+	module Geocoding
 
-      GEO_SUCCESS = 200
-      GEO_MISSING_ADDRESS = 601
-      GEO_UNKNOWN_ADDRESS = 602
-      GEO_UNAVAILABLE_ADDRESS = 603
-      GEO_BAD_KEY = 610
-      GEO_TOO_MANY_QUERIES = 620
-      GEO_SERVER_ERROR = 500
-      
-      #Gets placemarks by querying the Google Maps Geocoding service with the +request+ string
-      def self.get(request)
-        
-        url = "http://maps.google.com/maps/geo?q=#{request}&key=#{API_KEY}&output=xml"
-        begin
-          xml = open(URI.encode(url)).read
-        rescue
-          raise ConnectionException.new("Unable to connect to Google Maps Geocoding service")
-        end
-        
-        doc = REXML::Document.new(xml) 
-                        
-        response = doc.elements['//Response']
-        placemarks = Placemarks.new(response.elements['name'].text,response.elements['Status/code'].text.to_i)
-        response.elements.each("Placemark") do |placemark|
-          data = placemark.elements
-          data_country = data['descendant::CountryNameCode']
-          data_administrative = data['descendant::AdministrativeAreaName']
-          data_sub_administrative = data['descendant::SubAdministrativeAreaName']
-          data_locality = data['descendant::LocalityName']
-          data_dependent_locality = data['descendant::DependentLocalityName']
-          data_thoroughfare = data['descendant::ThoroughfareName']
-          data_postal_code = data['descendant::PostalCodeNumber']
-          placemarks << Geocoding::Placemark.new(data['address'].text,
-                                                 data_country.nil? ? "" : data_country.text,
-                                                 data_administrative.nil? ? "" : data_administrative.text,
-                                                 data_sub_administrative.nil? ? "" : data_sub_administrative.text,
-                                                 data_locality.nil? ? "" : data_locality.text,
-                                                 data_dependent_locality.nil? ? "" : data_dependent_locality.text,
-                                                 data_thoroughfare.nil? ? "" : data_thoroughfare.text,
-                                                 data_postal_code.nil? ? "" : data_postal_code.text,
-                                                 *(data['descendant::coordinates'].text.split(",")[0..1].collect {|l| l.to_f }))
-        end
-        placemarks
-      end
+	  GEO_SUCCESS = 200
+	  GEO_MISSING_ADDRESS = 601
+	  GEO_UNKNOWN_ADDRESS = 602
+	  GEO_UNAVAILABLE_ADDRESS = 603
+	  GEO_BAD_KEY = 610
+	  GEO_TOO_MANY_QUERIES = 620
+	  GEO_SERVER_ERROR = 500
+	  
+	  #Gets placemarks by querying the Google Maps Geocoding service with the +request+ string. Options can either an explicity GMaps API key (<tt>:key</tt>) or a host, (<tt>:host</tt>). 
+	  def self.get(request,options = {})
+	    api_key = options[:key]
+	    output =  options[:output] || "kml"
+	    url = "http://maps.google.com/maps/geo?q=#{URI.encode(request)}&key=#{api_key}&output=#{output}"
 
-      #Group of placemarks returned by the Geocoding service. If the result is valid the +statius+ attribute should be equal to <tt>Geocoding::GEI_SUCCESS</tt>
-      class Placemarks < Array
-        attr_accessor :name,:status
+	    res = open(url).read
 
-        def initialize(name,status)
-          super(0)
-          @name = name
-          @status = status
-        end
-      end
+	    case output.to_sym
+	    when :json
+	      res = eval(res.gsub(":","=>")) #!!!EVAL EVAL EVAL EVAL!!! hopefully we can trust google...
+	      placemarks = Placemarks.new(res['name'],res['Status']['code'])
+	      if res['Placemark']
+	        placemark = res['Placemark']
+	        
+	        placemark.each do |data|
+	          
+	          data_country = data['Country']['CountryNameCode'] rescue ""
+	          data_administrative = data['Country']['AdministrativeArea']['AdministrativeAreaName'] rescue ""
+	          data_sub_administrative = data['Country']['AdministrativeArea']['SubAdministrativeArea']['SubAdministrativeAreaName'] rescue ""
+	          data_locality = data['Country']['AdministrativeArea']['SubAdministrativeArea']['Locality']['LocalityName'] rescue ""
+	          data_dependent_locality = data['Country']['AdministrativeArea']['SubAdministrativeArea']['Locality']['DependentLocality']['DependentLocalityName'] rescue ""
+	          data_thoroughfare = data['Country']['AdministrativeArea']['SubAdministrativeArea']['Locality']['DependentLocality']['Thoroughfare']['ThoroughfareName'] rescue ""
+	          data_postal_code = data['Country']['AdministrativeArea']['SubAdministrativeArea']['Locality']['DependentLocality']['Thoroughfare']['PostalCode']['PostalCodeNumber'] rescue ""
+	          lon, lat = data['Point']['coordinates'][0,2]
+	          data_accuracy = data['Accuracy']
+	          unless data_accuracy.nil?
+	            data_accuracy = data_accuracy.to_i
+	          end
+	          
+	          placemarks << Geocoding::Placemark.new(data['address'],
+	                                                 data_country,
+	                                                 data_administrative,
+	                                                 data_sub_administrative,
+	                                                 data_locality,
+	                                                 data_dependent_locality,
+	                                                 data_thoroughfare,
+	                                                 data_postal_code,
+	                                                 lon, lat, data_accuracy)
+	          
+	        end
+	      end
+	    when :kml, :xml
+	      
+	      doc = REXML::Document.new(res) 
 
-      #A result from the Geocoding service.
-      class Placemark < Struct.new(:address,:country_code,:administrative_area,:sub_administrative_area,:locality,:dependent_locality,:thoroughfare,:postal_code,:longitude,:latitude)
-        def lonlat
-          [longitude,latitude]
-        end
+	      response = doc.elements['//Response']
+	      placemarks = Placemarks.new(response.elements['name'].text,response.elements['Status/code'].text.to_i)
+	      response.elements.each(".//Placemark") do |placemark|
+	        data = placemark.elements
+	        data_country = data['.//CountryNameCode']
+	        data_administrative = data['.//AdministrativeAreaName']
+	        data_sub_administrative = data['.//SubAdministrativeAreaName']
+	        data_locality = data['.//LocalityName']
+	        data_dependent_locality = data['.//DependentLocalityName']
+	        data_thoroughfare = data['.//ThoroughfareName']
+	        data_postal_code = data['.//PostalCodeNumber']
+	        lon, lat = data['.//coordinates'].text.split(",")[0..1].collect {|l| l.to_f }
+	        data_accuracy = data['.//*[local-name()="AddressDetails"]'].attributes['Accuracy']
+	        unless data_accuracy.nil?
+	          data_accuracy = data_accuracy.to_i
+	        end
+	        placemarks << Geocoding::Placemark.new(data['address'].text,
+	                                               data_country.nil? ? "" : data_country.text,
+	                                               data_administrative.nil? ? "" : data_administrative.text,
+	                                               data_sub_administrative.nil? ? "" : data_sub_administrative.text,
+	                                               data_locality.nil? ? "" : data_locality.text,
+	                                               data_dependent_locality.nil? ? "" : data_dependent_locality.text,
+	                                               data_thoroughfare.nil? ? "" : data_thoroughfare.text,
+	                                               data_postal_code.nil? ? "" : data_postal_code.text,
+	                                               lon, lat, data_accuracy )
+	      end
+	    end
+	    
+	    placemarks
+	  end
 
-        def latlon
-          [latitude,longitude]
-        end
-      end
+	  #Group of placemarks returned by the Geocoding service. If the result is valid the +status+ attribute should be equal to <tt>Geocoding::GE0_SUCCESS</tt>
+	  class Placemarks < Array
+	    attr_accessor :name,:status
+
+	    def initialize(name,status)
+	      super(0)
+	      @name = name
+	      @status = status
+	    end
+	  end
+
+	  #A result from the Geocoding service.
+	  class Placemark < Struct.new(:address,:country_code,:administrative_area,:sub_administrative_area,:locality,:dependent_locality,:thoroughfare,:postal_code,:longitude,:latitude,:accuracy)
+	    def lonlat
+	      [longitude,latitude]
+	    end
+
+	    def latlon
+	      [latitude,longitude]
+	    end
+	  end
+
+	  def self.accuracy(code)
+	    {0 => "Unknown location",
+	     1 => "Country level accuracy",
+	     2 => "Region (state, province, prefecture, etc.) level accuracy",
+	     3 => "Sub-region (county, municipality, etc.) level accuracy",
+	     4 => "Town (city, village) level accuracy",
+	     5 => "Post code (zip code) level accuracy",
+	     6 => "Street level accuracy",
+	     7 => "Intersection level accuracy",
+	      8 => "Address level accuracy"}[code]
+	    
+	  end
     
       #Raised when the connection to the service is not possible
       class ConnectionException < StandardError

data/rakefile.rb

@@ -24,13 +24,13 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'ym4r'
-  s.version = "0.6.0"
+  s.version = "0.6.1"
   s.summary = "Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails"
   s.description = <<EOF
 EOF
   s.author = 'Guilhem Vellut'
-  s.email = 'guilhem.vellut+ym4r@gmail.com'
-  s.homepage = "http://thepochisuperstarmegashow.com/projects/#ym4r"
+  s.email = 'guilhem.vellut@gmail.com'
+  s.homepage = "http://ym4r.rubyforge.org"
   
   s.requirements << 'none'
   s.require_path = 'lib'

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: ym4r
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-09-12 00:00:00 +02:00
-summary: Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails
-require_paths: 
-- lib
-email: guilhem.vellut+ym4r@gmail.com
-homepage: http://thepochisuperstarmegashow.com/projects/#ym4r
-rubyforge_project: 
-description: ""
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.6.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Guilhem Vellut
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-02-07 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: ""
+email: guilhem.vellut@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - lib/ym4r/google_maps/api_key.rb
 - lib/ym4r/google_maps/geocoding.rb
@@ -50,22 +43,36 @@ files:
 - README
 - MIT-LICENSE
 - rakefile.rb
+has_rdoc: true
+homepage: http://ym4r.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: 
+- none
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails
 test_files: 
 - test/test_geocoding.rb
 - test/test_gm_geocoding.rb
 - test/test_local_search.rb
 - test/test_map_image.rb
 - test/test_traffic.rb
-rdoc_options: 
-- --main
-- README
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
-requirements: 
-- none
-dependencies: []
-