geo_magic 0.2.0 → 0.2.1

data/README.textile

@@ -79,6 +79,10 @@ Lots of extra features has been added recently. For now, please check out the sp
 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_).
 I have also just created a Geocode adapter for _Geocode_ and _Graticule_ (see: _geocoder_spec.rb_) - This can also easily be configured for Rails.
 
+h3. Create random points in Radius
+
+@create_points_in_square@ works, but @create_points_in_circle@ is currently broken. Please help fix this ASAP ;) Thanks!
+
 h2. Meta magic
 
 You can also include the functionality directly into any class like this

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/geo_magic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/lib/geo_magic/util.rb

@@ -25,7 +25,7 @@ class Array
   end
   
   def sort_by_distance
-    self.sort_by { |item| item.dist }
+    self.sort_by { |item| get_dist_obj(item).dist }
   end  
 end
 
@@ -37,7 +37,7 @@ module GeoMagic
       {:km => 6371, :miles => 3956, :feet => 20895592, :meters => 6371000}                     
     end    
     
-    def get_within dist_obj, options = {:precision => :lowest}
+    def get_within dist_obj, options = {:precision => :lowest}      
       calc_method = get_proc(options[:precision] || :normal)
       from_loc = get_location options[:from]      
 
@@ -46,7 +46,8 @@ module GeoMagic
       res = []
       spots = populate_distance(calc_method, from_loc)
       spots.sort_by_distance.select do |item|
-        if item.dist <= dist
+        it = get_dist_obj(item)
+        if it.dist <= dist
           res << item 
         else 
           break 
@@ -63,10 +64,19 @@ module GeoMagic
 
     protected
 
+    def get_dist_obj dist_obj
+      return dist_obj if dist_obj.respond_to? :dist
+      [:point, :to_point, :location].each do |loc|        
+        return dist_obj.send(loc) if dist_obj.respond_to? loc
+      end
+      raise "Invalid Point object: a valid Point object must either be a sublclass of MapPoint or have a #point #to_point or #location method that returns a MapPoint from which can be calculated a distance"
+    end
+
     def populate_distance calc_method, from_loc
       self.map! do |item|
-        dist_obj = calc_method.call(from_loc, item)
-        item.dist = dist_obj.distance
+        dist_item = get_dist_obj(item)
+        dist_obj = calc_method.call(from_loc, dist_item)
+        dist_item.dist = dist_obj.distance
         item
       end      
     end

data/spec/geo_magic/select_nearest_spec.rb

@@ -2,6 +2,36 @@ require 'spec_helper'
 require 'geo_magic'
 require 'geo_magic/remote'
 
+class Person
+  attr_accessor :location, :name
+
+  def initialize name, location
+    @name = name
+    @location = location
+  end
+  
+  def to_point
+    location
+  end
+  
+  class << self
+    def names
+      ['Hansi', 'Michel', 'Sandy', 'Sam', 'Thomas']
+    end
+    
+    def random_at points
+      points.inject([]) do |res, point|
+        res << Person.new(names[rand_index], point)
+        res
+      end
+    end
+    
+    def rand_index
+      rand(names.size)
+    end
+  end
+end
+
 describe "GeoMagic closest" do
   before do
     @long1 = -104.88544
@@ -9,22 +39,29 @@ describe "GeoMagic closest" do
 
     @center_point = GeoMagic::Point.new @long1, @lat1    
     @radius = @center_point.within(10.km)
-    @points = @radius.create_points_in_circle 10
+    @points = @radius.create_points_in_square 10
   end
     
 
-  it "should select the closest 3 points" do
-    # puts "radius: #{@radius.inspect}"    
-    # puts "points: #{@points.inspect}"        
-    closest = @points.as_map_points.get_closest 3, :from => @center_point    
-    puts "3 closest points: #{closest.inspect}"        
-  end
-  
+  # it "should select the closest 3 points" do
+  #   # puts "radius: #{@radius.inspect}"    
+  #   # puts "points: #{@points.inspect}"        
+  #   closest = @points.as_map_points.get_closest 3, :from => @center_point    
+  #   puts "3 closest points: #{closest.inspect}"        
+  # end
+  # 
   it "should select all points within 4 km" do
     # puts "radius: #{@radius.inspect}"    
     # puts "points: #{@points.inspect}"        
     closest = @points.as_map_points.get_within 4.km, :from => @center_point    
     puts "points within 4 km: #{closest.inspect}"        
   end
-  
+
+  it "should select all points within 4 km" do
+    points = @radius.create_points_in_square 4  
+    persons = Person.random_at points
+    
+    closest = persons.as_map_points.get_within 5.km, :from => @center_point
+    puts "Persons within 4 km: #{closest.inspect}"        
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3345832224946490091
+      hash: 27646408712887287
       segments: 
       - 0
       version: "0"