geocode 0.2.0 → 0.2.1

data/bin/geocode

@@ -19,6 +19,8 @@ opts = Trollop.options do
   opt :viewport, "Show viewport (map extents) of location", :type => :boolean, :default => false
   opt :accuracy, "Show accuracy level of geocoded location", :type => :boolean, :default => false
   opt :dump, "Dump the geocoded results", :type => :boolean, :default => false
+  # TODO: Show this in metric as well as Burmese Units...
+  opt :miles, "Show the viewport size in miles", :type => :boolean, :default => false
   opt :quiet, "Don't show labels", :type => :boolean, :default => false
 end
 
@@ -32,10 +34,11 @@ if opts[:reverse] && opts[:latlng]
   opts[:latlng] = false
   opts[:viewport] = false
   opts[:accuracy] = false
+  opts[:miles] = false
 end
 
 # Default latlng to true if no other options have been given
-opts[:latlng] = true unless [:reverse, :viewport, :accuracy].any? { |option| opts[option] }
+opts[:latlng] = true unless [:miles, :reverse, :viewport, :accuracy].any? { |option| opts[option] }
 
 
 # geocode the address or lat/lng given
@@ -57,6 +60,11 @@ if opts[:viewport]
   vp = geo.viewport
   puts "%f,%f %f,%f" % vp
 end
+
+if opts[:miles]
+  print 'Viewport Height (miles): ' unless opts[:quiet]
+  puts "%f" % geo.viewport_height
+end
   
 if opts[:accuracy]
   print 'Accuracy: ' unless opts[:quiet]

data/lib/geocode.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'google_geocode'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'google', 'geocode'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'google', 'result'))
 
 class Geocode
   def self.new_geocoder(service, options)
     case service
     when :google
-      GoogleGeocode.new options[:google_api_key]
+      Google::Geocode.new options[:google_api_key], options[:client]
     else
       raise "Unsupported geocode service: #{service}"
     end
   end
-  
+
   def geocode()
     raise "geocode(): Unimplemented method! Child class must override!"
   end

data/lib/google/geocode.rb

@@ -0,0 +1,31 @@
+require 'net/http'
+require 'yaml'
+
+module Google
+  class Geocode
+    attr_reader :api_key
+    def initialize(api_key, client)
+      @api_key = api_key
+      @client = client
+    end
+
+    def do_geocode(location)
+      url = "http://maps.google.com/maps/geo?sensor=false&key=#{@api_key}&output=json&q=#{location}&client=#{@client}"
+      resp = Net::HTTP.get_response(URI.parse(url))
+      data = resp.body
+
+      Google::Result.new(data)
+    end
+
+    def geocode(location)
+      # change whitespace to %20 for the URL
+      result = do_geocode location.gsub(/\s+/, '%20')
+    end
+
+
+    def reverse_geocode(location)
+      # reverse geocodes should not have any spaces in them
+      result = do_geocode location.gsub(/\s+/, '')
+    end
+  end
+end

data/lib/google/result.rb

@@ -0,0 +1,46 @@
+require 'json'
+
+module Google
+  class Result
+    attr_accessor :data
+    
+    def initialize(data)
+      @data = JSON.parse data
+    end
+    
+    def success?
+      data["Status"]["code"] == 200
+    end
+    
+    def error?
+      !success?
+    end
+    
+    def dump
+      data.to_yaml
+    end
+    
+    def latlng
+      data["Placemark"][0]["Point"]["coordinates"][0..1].reverse
+    end
+
+    def address
+      data["Placemark"][0]["address"]
+    end
+
+    def accuracy
+      data["Placemark"][0]["AddressDetails"]["Accuracy"]
+    end
+    
+    # returns viewport in tlbr format
+    def viewport
+      @vp ||= [:north, :west, :south, :east].map {|dir| data["Placemark"][0]["ExtendedData"]["LatLonBox"][dir.to_s] }
+    end
+    
+    def viewport_height
+      vp = viewport
+      vs = (vp[0] - vp[2]) * 67.0
+    end
+
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: geocode
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - David Brady
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -07:00
+date: 2010-09-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: geocode, a ruby library and command-line tool for geocoding addresses and reverse geocoding coordinates.
 email: github@shinybit.com
 executables: 
@@ -48,7 +57,8 @@ files:
 - README.rdoc
 - bin/geocode
 - lib/geocode.rb
-- lib/google_geocode.rb
+- lib/google/geocode.rb
+- lib/google/result.rb
 has_rdoc: true
 homepage: http://github.com/dbrady/geocode/
 licenses: []
@@ -67,18 +77,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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Geocoding library and CLI tool

data/lib/google_geocode.rb

@@ -1,60 +0,0 @@
-require 'net/http'
-require 'json'
-require 'yaml'
-
-class GoogleGeocode
-  attr_reader :api_key
-  def initialize(api_key)
-    @api_key = api_key
-  end
-
-  def do_geocode(location)
-    url = "http://maps.google.com/maps/geo?sensor=false&key=#{@api_key}&output=json&q=#{location}"
-    resp = Net::HTTP.get_response(URI.parse(url))
-    data = resp.body
-    
-    result = JSON.parse(data)
-    class << result
-      def success?
-        self["Status"]["code"] == 200
-      end
-      
-      def error?
-        !success?
-      end
-      
-      def dump
-        self.to_yaml
-      end
-      
-      def latlng
-        self["Placemark"][0]["Point"]["coordinates"][0..1].reverse
-      end
-
-      def address
-        self["Placemark"][0]["address"]
-      end
-
-      def accuracy
-        self["Placemark"][0]["AddressDetails"]["Accuracy"]
-      end
-      
-      # returns viewport in tlbr format
-      def viewport
-        vp = [:north, :west, :south, :east].map {|dir| self["Placemark"][0]["ExtendedData"]["LatLonBox"][dir.to_s] }
-      end
-    end
-    result
-  end
-
-  def geocode(location)
-    # change whitespace to %20 for the URL
-    result = do_geocode location.gsub(/\s+/, '%20')
-  end
-  
-  
-  def reverse_geocode(location)
-    # reverse geocodes should not have any spaces in them
-    result = do_geocode location.gsub(/\s+/, '')
-  end
-end