lib/graticule/geocoders/local_search_map.rb lib/graticule/geocoders/postcode_anywhere.rb test/fixtures/responses/postcode_anywhere/badkey.xml test/fixtures/responses/postcode_anywhere/success.xml test/unit/graticule/geocoders/postcode_anywhere_test.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require 'graticule' +require 'graticule/cli' Graticule::Cli.start ARGV \ No newline at end of file bin/geocode @@ -9,10 +9,10 @@ require 'graticule/geocoders/rest' require 'graticule/geocoders/google' require 'graticule/geocoders/yahoo' require 'graticule/geocoders/geocoder_us' +require 'graticule/geocoders/local_search_map' require 'graticule/geocoders/meta_carta' +require 'graticule/geocoders/postcode_anywhere' require 'graticule/distance' require 'graticule/distance/haversine' require 'graticule/distance/spherical' require 'graticule/distance/vincenty' - -require 'graticule/cli' \ No newline at end of file lib/graticule.rb @@ -1,3 +1,4 @@ +require 'graticule' require 'optparse' module Graticule lib/graticule/cli.rb @@ -46,15 +46,14 @@ module Graticule # Extracts a Location from +xml+. def parse_response(xml) #:nodoc: address = REXML::XPath.first(xml, '//xal:AddressDetails', 'xal' => "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0") - breakpoint longitude, latitude, = xml.elements['/kml/Response/Placemark/Point/coordinates'].text.split(',').map { |v| v.to_f } Location.new \ :street => value(address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/Thoroughfare/ThoroughfareName/text()']), - :city => value(address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/LocalityName/text()']), - :state => value(address.elements['Country/AdministrativeArea/AdministrativeAreaName/text()']), - :zip => value(address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/PostalCode/PostalCodeNumber/text()']), + :locality => value(address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/LocalityName/text()']), + :region => value(address.elements['Country/AdministrativeArea/AdministrativeAreaName/text()']), + :postal_code => value(address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/PostalCode/PostalCodeNumber/text()']), :country => value(address.elements['Country/CountryNameCode/text()']), :latitude => latitude, :longitude => longitude, @@ -63,7 +62,7 @@ module Graticule # Extracts and raises an error from +xml+, if any. def check_error(xml) #:nodoc: - status ||= xml.elements['/kml/Response/Status/code'].text.to_i + status = xml.elements['/kml/Response/Status/code'].text.to_i case status when 200 then # ignore, ok when 500 then lib/graticule/geocoders/google.rb @@ -69,9 +69,9 @@ module Graticule #:nodoc: location.longitude = r.elements['Longitude'].text.to_f location.street = r.elements['Address'].text.titleize unless r.elements['Address'].text.blank? - location.city = r.elements['City'].text.titleize unless r.elements['City'].text.blank? - location.state = r.elements['State'].text - location.zip = r.elements['Zip'].text + location.locality = r.elements['City'].text.titleize unless r.elements['City'].text.blank? + location.region = r.elements['State'].text + location.postal_code = r.elements['Zip'].text location.country = r.elements['Country'].text locations << location lib/graticule/geocoders/yahoo.rb @@ -2,12 +2,16 @@ module Graticule # A geographic location class Location - attr_accessor :latitude, :longitude, :street, :city, :state, :zip, :country, :precision, :warning + attr_accessor :latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision, :warning + alias_method :city, :locality + alias_method :state, :region + alias_method :zip, :postal_code def initialize(attrs = {}) attrs.each do |key,value| instance_variable_set "@#{key}", value end + self.precision ||= :unknown end # Returns an Array with latitude and longitude. @@ -16,7 +20,7 @@ module Graticule end def ==(object) - super(object) || [:latitude, :longitude, :street, :city, :state, :zip, :country, :precision].all? do |m| + super(object) || [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :precision].all? do |m| object.respond_to?(m) && self.send(m) == object.send(m) end end @@ -37,7 +41,7 @@ module Graticule def to_s(coordinates = false) result = "" result << "#{street}\n" if street - result << [city, [state, zip, country].compact.join(" ")].compact.join(", ") + result << [locality, [region, postal_code, country].compact.join(" ")].compact.join(", ") result << "\nlatitude: #{latitude}, longitude: #{longitude}" if coordinates && [latitude, longitude].any? result end lib/graticule/location.rb @@ -11,9 +11,9 @@ module Graticule location = Location.new( :street => "1600 Amphitheatre Pkwy", - :city => "Mountain View", - :state => "CA", - :zip => "94043", + :locality => "Mountain View", + :region => "CA", + :postal_code => "94043", :country => "US", :longitude => -122.083739, :latitude => 37.423021, test/unit/graticule/geocoders/geocoders.rb @@ -11,9 +11,9 @@ module Graticule @geocoder = YahooGeocoder.new 'APP_ID' @location = Location.new( :street => "701 First Ave", - :city => "Sunnyvale", - :state => "CA", - :zip => "94089-1019", + :locality => "Sunnyvale", + :region => "CA", + :postal_code => "94089-1019", :country => "US", :longitude => -122.024853, :latitude => 37.416384, test/unit/graticule/geocoders/yahoo_test.rb @@ -10,7 +10,7 @@ module Graticule end def test_responds_to - [:latitude, :longitude, :street, :city, :state, :zip, :country, :coordinates, :precision].each do |m| + [:latitude, :longitude, :street, :locality, :region, :postal_code, :country, :coordinates, :precision].each do |m| assert Location.new.respond_to?(m), "should respond to #{m}" end end @@ -24,7 +24,7 @@ module Graticule assert_equal Location.new, Location.new attrs = {:latitude => 100.5389, :longitude => -147.5893, :street => '123 A Street', - :city => 'Somewhere', :state => 'NO', :zip => '12345', :country => 'USA', :precision => :address} + :locality => 'Somewhere', :region => 'NO', :postal_code => '12345', :country => 'USA', :precision => :address} assert_equal Location.new(attrs), Location.new(attrs) attrs.each do |k,v| test/unit/graticule/location_test.rb 94c14760571edf8412c5022132dca3b393f2a0ad Brandon Keepers brandon@collectiveidea.com http://github.com/collectiveidea/graticule/commit/758ba5c3e974cc23fd3eb35d47f898f1b740b451 758ba5c3e974cc23fd3eb35d47f898f1b740b451 2007-03-12T10:54:30-07:00 2007-03-12T10:54:30-07:00 added international geocoders international-ized the location class 09e56f6e841e4b73c9b7ff2d0278576d13572b0d Brandon Keepers brandon@collectiveidea.com