andre-geokit 1.2.1 → 1.2.2

data/lib/geokit/geocoders.rb

@@ -10,13 +10,13 @@ module Geokit
     extend self
    
     def titleize(word)
-      humanize(underscore(word)).gsub(/\b([a-z])/) { $1.capitalize }
+      humanize(underscore(word)).gsub(/\b([a-z])/u) { $1.capitalize }
     end
    
     def underscore(camel_cased_word)
       camel_cased_word.to_s.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      gsub(/([A-Z]+)([A-Z][a-z])/u,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/u,'\1_\2').
       tr("-", "_").
       downcase
     end
@@ -26,14 +26,14 @@ module Geokit
     end
     
     def snake_case(s)
-      return s.downcase if s =~ /^[A-Z]+$/
-      s.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/, '_\&') =~ /_*(.*)/
+      return s.downcase if s =~ /^[A-Z]+$/u
+      s.gsub(/([A-Z]+)(?=[A-Z][a-z]?)|\B[A-Z]/u, '_\&') =~ /_*(.*)/
         return $+.downcase
       
     end
     
     def url_escape(s)
-    s.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+    s.gsub(/([^ a-zA-Z0-9_.-]+)/nu) do
       '%' + $1.unpack('H2' * $1.size).join('%').upcase
       end.tr(' ', '+')
     end
@@ -211,11 +211,12 @@ module Geokit
       
       # Template method which does the reverse-geocode lookup.
       def self.do_reverse_geocode(latlng)
-        res = self.call_geocoder_service("http://maps.google.com/maps/geo?ll=#{Geokit::Inflector::url_escape(latlng)}&output=xml&key=#{Geokit::Geocoders::google}&oe=utf-8")
+        latlng=LatLng.normalize(latlng)
+        res = self.call_geocoder_service("http://maps.google.com/maps/geo?ll=#{Geokit::Inflector::url_escape(latlng.ll)}&output=xml&key=#{Geokit::Geocoders::google}&oe=utf-8")
   #        res = Net::HTTP.get_response(URI.parse("http://maps.google.com/maps/geo?ll=#{Geokit::Inflector::url_escape(address_str)}&output=xml&key=#{Geokit::Geocoders::google}&oe=utf-8"))
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         xml = res.body
-        logger.debug "Google reverse-geocoding. LL: #{latlng}. Result: #{xml}"
+        logger.debug "Google reverse-geocoding. LL: #{latlng.ll}. Result: #{xml}"
         return self.xml2GeoLoc(xml)        
       end
 
@@ -482,4 +483,4 @@ module Geokit
       end
     end   
   end
-end
+end

data/lib/geokit/mappable.rb

@@ -75,8 +75,8 @@ module Geokit
       def endpoint(start,heading, distance, options={})
         units = options[:units] || Geokit::default_units
         radius = case units
-          when :kms: EARTH_RADIUS_IN_KMS
-          when :nms: EARTH_RADIUS_IN_NMS
+          when :kms; EARTH_RADIUS_IN_KMS
+          when :nms; EARTH_RADIUS_IN_NMS
           else EARTH_RADIUS_IN_MILES
         end
         start=Geokit::LatLng.normalize(start)        
@@ -132,8 +132,8 @@ module Geokit
       # Returns the multiplier used to obtain the correct distance units.
       def units_sphere_multiplier(units)
         case units
-          when :kms: EARTH_RADIUS_IN_KMS
-          when :nms: EARTH_RADIUS_IN_NMS
+          when :kms; EARTH_RADIUS_IN_KMS
+          when :nms; EARTH_RADIUS_IN_NMS
           else EARTH_RADIUS_IN_MILES
         end
       end
@@ -141,8 +141,8 @@ module Geokit
       # Returns the number of units per latitude degree.
       def units_per_latitude_degree(units)
         case units
-          when :kms: KMS_PER_LATITUDE_DEGREE
-          when :nms: NMS_PER_LATITUDE_DEGREE
+          when :kms; KMS_PER_LATITUDE_DEGREE
+          when :nms; NMS_PER_LATITUDE_DEGREE
           else MILES_PER_LATITUDE_DEGREE
         end
       end
@@ -151,8 +151,8 @@ module Geokit
       def units_per_longitude_degree(lat, units)
         miles_per_longitude_degree = (LATITUDE_DEGREES * Math.cos(lat * PI_DIV_RAD)).abs
         case units
-          when :kms: miles_per_longitude_degree * KMS_PER_MILE
-          when :nms: miles_per_longitude_degree * NMS_PER_MILE
+          when :kms; miles_per_longitude_degree * KMS_PER_MILE
+          when :nms; miles_per_longitude_degree * NMS_PER_MILE
           else miles_per_longitude_degree
         end
       end  

data/test/test_base_geocoder.rb

@@ -45,7 +45,7 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
   end
   
   def test_find_geocoder_methods
-    public_methods = Geokit::Geocoders::Geocoder.public_methods
+    public_methods = Geokit::Geocoders::Geocoder.public_methods.map { |m| m.to_s }
     assert public_methods.include?("yahoo_geocoder")
     assert public_methods.include?("google_geocoder")
     assert public_methods.include?("ca_geocoder")
@@ -53,4 +53,4 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
     assert public_methods.include?("multi_geocoder")
     assert public_methods.include?("ip_geocoder")
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andre-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer
@@ -9,18 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
-    version: 
+dependencies: []
+
 description: Geokit Gem
 email: 
 - andre@earthcode.com / bill_eisenhauer@yahoo.com