geomap 0.0.9 → 0.0.10

data/lib/geomap.rb

@@ -6,47 +6,56 @@ require 'active_record'
 class Geomap
 
   attr_accessor :latitude, :longitude, :address
+  
   class << self
-  def reverse_geocode lat, lng
-    get_results [lat, lng], true
-  end
+  
+    def reverse_geocode lat, lng
+      get_results [lat, lng]
+    end
     
-  def geocode address
-    address = address.gsub(/\s/, '+')
-    get_results [address], false
-  end
+    def geocode address
+      address = address.gsub(/\s/, '+')
+      get_results [address]
+    end
 
-  
-  def get_results args, cond
+    def get_results args
 
-    geocoder_url = "http://maps.googleapis.com/maps/api/geocode/json?"
-    params = ""
+      geocoder_url = "http://maps.googleapis.com/maps/api/geocode/json?"
+      params = ""
   
-    params = cond ? "latlng=#{args[0]},#{args[1]}" : "address=#{args[0]}"
+      params = args.size == 2 ? "latlng=#{args[0]},#{args[1]}" : "address=#{args[0]}"
 
-    url ="#{geocoder_url}#{params}&sensor=true"
+      url ="#{geocoder_url}#{params}&sensor=true"
   
-    resp = Net::HTTP.get_response(URI.parse(url))
-    data = resp.body
+      resp = Net::HTTP.get_response(URI.parse(url))
+      data = resp.body
 
-    result = JSON.parse(data)
+      result = JSON.parse(data)
     
-    if result.nil?
-      raise "Error --- invalid input"
-    end
+      if result.nil?
+        raise "Error --- invalid input"
+      end
     
-    if result.has_key? 'Error'
-      raise "web service error"
-    end
-
-
-    if cond
-      result ["results"].first["address_components"].first["long_name"]
-    else
-      [result["results"].first["geometry"]["location"]["lat"], result["results"].first["geometry"]["location"]["lng"]]
-    end
+      if result.has_key? 'Error'
+        raise "web service error"
+      end
     
-  end
+        
+      puts result
+       
+    
+     if result["status"] == "OK"
+        if args.size == 2
+          result["results"].first["address_components"].first["long_name"]
+        else
+          [result["results"].first["geometry"]["location"]["lat"], result["results"].first["geometry"]["location"]["lng"]]
+          
+        end
+     else    
+        return args.size == 2 ? "" : [0, 0]
+      
+     end
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: geomap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - choodur