geo_magic 0.2.2.1 → 0.2.3

data/README.textile

@@ -77,8 +77,16 @@ h2. Extra features
 
 Lots of extra features has been added recently. For now, please check out the specs to get an idea of the features included.
 Most recently I have added support to filter a list of points for those who are within a radius of another point (see _select_neares_spec.rb_).
+
+h3. Geocoder adapters
+
 I have also just created a Geocode adapter for _Geocode_ and _Graticule_ (see: _geocoder_spec.rb_) - This can also easily be configured for Rails.
 
+I recently discovered that the Geocode adapter didn't work for all addresses, so I made some improvements to make it more "stable". 
+I'm sure there are still corner cases it wont handle, so please join in the effort to fix this!
+
+Also note that the API has changed a little bit, so that it uses the same GeoMagic namespace as the rest of _geo_magic_.
+
 h3. Create random points in Radius
 
 * @create_points_in_square@ 
@@ -90,17 +98,23 @@ Within distance:
 
 <pre>@points.as_map_points.within_distance 4.km, :from => @center_point</pre>
 
-The closest n:
+The closest n points:
 
 <pre>@points.as_map_points.the_closest 4, :from => @center_point</pre>
 
+Or using container objects (objects containing a location):
+
+@people.as_map_points.the_closest 4, :from => @house
+
+Where @people is an array of Person and @house is an instance of House and where both House and Person has a #location, #to_point or #point method that returns an object
+with latitude and longitude methods that each return a float.
+
 Within bounding rectangle:
 
 <pre>rectangle = GeoMagic::Rectangle.new(GeoMagic::Point.new(-115, 50), GeoMagic::Point.new(-100, 20))
 # or
 # rect = GeoMagic::Rectangle.create_from_coords lat1, long1, lat2, long2
 @points.as_map_points.within_rectangle rect, :from => @center_point
-
 </pre>
 
 h2. Meta magic

data/VERSION

@@ -1 +1 @@
-0.2.2.1
+0.2.3

data/geo_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-22}
   s.description = %q{Get IP and location data using freegeoip.net - can also  calculate of distance between map points using haversine supporting multiple distance units}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     "lib/geo_magic/remote.rb",
     "lib/geo_magic/util.rb",
     "lib/rails/config.rb",
-    "spec/fixtures/config.yaml",
+    "spec/fixtures/map_api_keys.yaml",
     "spec/geo_magic/calculate_spec.rb",
     "spec/geo_magic/geocoder_spec.rb",
     "spec/geo_magic/include_calc_spec.rb",

data/lib/geo_magic/geocode/config.rb

@@ -1,4 +1,4 @@
-module GeoMap
+module GeoMagic
   module ServiceAdapter
     attr_reader :geo_coder, :config
 

data/lib/geo_magic/geocode/geocoder.rb

@@ -3,7 +3,7 @@ require 'active_support/inflector'
 require 'geocode'
 require 'graticule'
 
-module GeoMap 
+module GeoMagic 
   class GeoAdapter
     attr_accessor :service_name, :environment
     
@@ -53,32 +53,41 @@ module GeoMap
       geo_coder.geocode(location_str).extend GeocodeAPI
     end
 
-    module GeocodeAPI      
-      def country
-        country_api["CountryNameCode"]
+    module GeocodeAPI
+      # Address
+      
+      def street
+        thoroughfare["ThoroughfareName"]
       end
 
-      def country_name
-        country_api["CountryName"]
-      end
-    
-      def state
-        adm_api["AdministrativeAreaName"]
-      end
-    
       def postal_code
-        subadm_api["Locality"]["PostalCode"]["PostalCodeNumber"]
+        locality["PostalCode"]["PostalCodeNumber"]
       end 
       alias_method :zip, :postal_code
     
-      def street
-        subadm_api["Thoroughfare"]["ThoroughfareName"]
-      end
-
       def city
         subadm_api["SubAdministrativeAreaName"]
       end
 
+      def state
+        adm_api["AdministrativeAreaName"]
+      end
+
+      def country_code
+        country_api["CountryNameCode"]
+      end
+
+      def country_name
+        country_api["CountryName"].gsub(/Bundesrepublik /, '')
+      end
+      alias_method :country, :country_name
+
+      def address_hash
+        {:street => street, :postal_code => postal_code, :city => city, :state => state, :country => country, :country_code => country_code}
+      end
+    
+      # Location
+    
       def latitude
         coords[1]
       end
@@ -86,9 +95,31 @@ module GeoMap
       def longitude
         coords[0]
       end
+
+      def location_hash
+        {:longitude => longitude, :latitude => latitude}
+      end
     
       protected
 
+      def thoroughfare
+        @thoroughfare ||= begin
+          thorough = [:subadm_api, :locality_api, :dependent_locality_api].select do |api|
+            send(api)["Thoroughfare"]
+          end         
+          send(thorough.first)["Thoroughfare"]   
+        end
+      end
+
+      def locality
+        @locality ||= begin
+          thorough = [:locality_api, :dependent_locality_api].select do |api|
+            send(api)["PostalCode"]
+          end         
+          send(thorough.first)   
+        end
+      end
+
       def api
         data["Placemark"].first
       end
@@ -112,6 +143,14 @@ module GeoMap
       def subadm_api
         adm_api["SubAdministrativeArea"]
       end
+
+      def locality_api
+        subadm_api["Locality"]
+      end
+
+      def dependent_locality_api
+        locality_api["DependentLocality"]
+      end
     end
 
     def reverse_geocode latitude, longitude
@@ -125,7 +164,7 @@ module GeoMap
       service_name = options[:service_name] || :google
       type  = options[:type] || :geocode
       env   = options[:env]
-      "GeoMap::#{type.to_s.classify}Adapter".constantize.new service_name, env
+      "GeoMagic::#{type.to_s.classify}Adapter".constantize.new service_name, env
     end 
   
     def geocode location_str

data/lib/rails/config.rb

@@ -1,4 +1,4 @@
-module GeoMap
+module GeoMagic
   module RailsServiceAdapter
     attr_reader :geo_coder
 
@@ -17,7 +17,7 @@ module GeoMap
     end
   
     def config
-      @config ||= ::YAML.load_file("#{::Rails.root}/config/google_map.yml")[env]
+      @config ||= ::YAML.load_file("#{::Rails.root}/config/map_api_keys.yml")[env]
     end
 
     def google_key

data/spec/fixtures/{config.yaml → map_api_keys.yaml}

@@ -1,2 +1,4 @@
 development:
   google_key: "ABQIAAAAUzkItq4p7LYo2YIR_gtjpRTJQa0g3IQ9GZqIMmInSLzwtGDKaBSzEc8_FNxIfQLkpKOh9R4JB87Rig" 
+test:
+  google_key: "ABQIAAAAUzkItq4p7LYo2YIR_gtjpRTJQa0g3IQ9GZqIMmInSLzwtGDKaBSzEc8_FNxIfQLkpKOh9R4JB87Rig" 

data/spec/geo_magic/geocoder_spec.rb

@@ -3,8 +3,8 @@ require 'geo_magic'
 
 describe "GeoMagic Geocoder" do
   before do
-    @geocoder = GeoMap.geo_coder
-    @geocoder.configure File.expand_path('../fixtures/config.yaml', File.dirname(__FILE__)), :development
+    @geocoder = GeoMagic.geo_coder
+    @geocoder.configure File.expand_path('../fixtures/map_api_keys.yaml', File.dirname(__FILE__)), :development
   end
   
   it "should geocode" do    
@@ -18,8 +18,21 @@ describe "GeoMagic Geocoder" do
     p location.longitude
   end        
 
+  it "should create location and address hashes" do
+    location = @geocoder.instance.geocode "Marienplatz 14, munich, Germany"
+    p location.location_hash
+    p location.address_hash
+  end        
+
+  # Geocoder with Rails 3
+
+  # Expects map api keys (fx for google maps) to be defined in ROOT/config/map_api_keys.yml
+  # See spec/fixtures/map_api_keys.yml for example
+
+  # Use @geocoder.configure(path, env) to customize this 
+
   # it "should geocode for rails" do        
-  #   @geocoder = GeoMap.geo_coder :env => :rails    
+  #   @geocoder = GeoMap.geo_coder(:env => :rails)
   #   location = @geocoder.instance.geocode "Mullerstrasse 9, Munich"
   #   location.city.should == 'Munich'
   # end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  - 1
-  version: 0.2.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-01-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,7 +168,7 @@ files:
 - lib/geo_magic/remote.rb
 - lib/geo_magic/util.rb
 - lib/rails/config.rb
-- spec/fixtures/config.yaml
+- spec/fixtures/map_api_keys.yaml
 - spec/geo_magic/calculate_spec.rb
 - spec/geo_magic/geocoder_spec.rb
 - spec/geo_magic/include_calc_spec.rb
@@ -193,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -191356599515187652
+      hash: -701075083202968492
       segments: 
       - 0
       version: "0"