geo_magic 0.2.1.1 → 0.2.1.2

data/README.textile

@@ -81,7 +81,27 @@ I have also just created a Geocode adapter for _Geocode_ and _Graticule_ (see: _
 
 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!
+* @create_points_in_square@ 
+* @create_points_in_circle@
+
+h3. Points within an area or distance
+
+Within distance:
+
+<pre>@points.as_map_points.within_distance 4.km, :from => @center_point</pre>
+
+The closest n:
+
+<pre>@points.as_map_points.the_closest 4, :from => @center_point</pre>
+
+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.1.1
+0.2.1.2

data/geo_magic.gemspec

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

data/lib/geo_magic/rectangle.rb

@@ -6,6 +6,10 @@ module GeoMagic
       @top_left_point     = GeoMagic::Point.new left_lat(point_a, point_b), bot_long(point_a, point_b)
       @bottom_right_point = GeoMagic::Point.new right_lat(point_a, point_b), top_long(point_a, point_b)
     end
+
+    def create_from_coords lat1, long1, lat2, long2
+      self.new GeoMagic::Point.new(lat1, long1), GeoMagic::Point.new(lat2, long2)
+    end 
     
     def overlaps? point
       # puts "inside_top_left?: #{point} -> #{inside_top_left?(point)}"

data/lib/geo_magic/util.rb

@@ -39,7 +39,7 @@ module GeoMagic
       {:km => 6371, :miles => 3956, :feet => 20895592, :meters => 6371000}                     
     end    
     
-    def get_within dist_obj, options = {:precision => :lowest}
+    def within_distance dist_obj, options = {:precision => :lowest}
       calc_method = get_proc(options[:precision] || :normal)
       from_loc = get_location get_dist_obj(options[:from])
 
@@ -58,13 +58,13 @@ module GeoMagic
       res
     end
 
-    def get_within_rect rectangle
+    def within_rectangle rectangle
       self.select do |point|
         rectangle.overlaps? point
       end
     end
 
-    def get_closest number, options = {}
+    def the_closest number, options = {}
       calc_method = get_proc(options[:precision] || :normal)
       from_loc = get_location options[:from]
       populate_distance(calc_method, from_loc).sort_by_distance[0..number]

data/spec/geo_magic/select_nearest_spec.rb

@@ -37,33 +37,44 @@ describe "GeoMagic closest" do
     @long1 = -104.88544
     @lat1 = 39.06546
 
-    @center_point = GeoMagic::Point.new @long1, @lat1    
+    @center_point = GeoMagic::Point.new @long1, @lat1
     @radius = @center_point.within(10.km)
     @points = @radius.create_points_in_square 10
+    
+    @circle_points = @radius.create_points_in_square 4
   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
+  it "should select the closest 3 points" do
+    # puts "radius: #{@radius.inspect}"    
+    # puts "points: #{@points.inspect}"        
+    closest = @points.as_map_points.the_closest 3, :from => @center_point    
+    puts "3 closest points: #{closest.inspect}"        
+  end
+  
+  it "should select all points within 5 km" do
     # puts "radius: #{@radius.inspect}"    
     # puts "points: #{@points.inspect}"        
-    closest = @points.as_map_points.get_within 4.km, :from => @center_point    
+    closest = @points.as_map_points.within_distance 5.km, :from => @center_point    
     puts "points within 4 km: #{closest.inspect}"        
   end
 
+  it "should select all points within 4 km (circle points)" do
+    # puts "radius: #{@radius.inspect}"    
+    # puts "points: #{@points.inspect}"        
+    closest = @circle_points.as_map_points.within_distance 4.km, :from => @center_point    
+    puts "circle_points: #{@circle_points}"
+    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
 
     center_person = Person.new 'Man in the center', @center_point
     
-    people_within = persons.as_map_points.get_within 5.km, :from => center_person
+    people_within = persons.as_map_points.within_distance 5.km, :from => center_person
     puts "Persons within 4 km of Man in the center: #{people_within.inspect}"        
   end
 end

data/spec/geo_magic/within_rect_spec.rb

@@ -13,7 +13,7 @@ describe "GeoMagic within rectanlge" do
     
   it "should select all points in rectangle" do
     rectangle = GeoMagic::Rectangle.new(GeoMagic::Point.new(115, 50), GeoMagic::Point.new(100, 20))
-    points_in_rectangle = @points.as_map_points.get_within_rect rectangle
+    points_in_rectangle = @points.as_map_points.within_rectangle rectangle
     puts "points: #{@points}"
     
     puts "---"
@@ -35,7 +35,7 @@ describe "GeoMagic within rectangle - negative longitude" do
     
   it "should select all points in rectangle" do
     rectangle = GeoMagic::Rectangle.new(GeoMagic::Point.new(-115, 50), GeoMagic::Point.new(-100, 20))
-    points_in_rectangle = @points.as_map_points.get_within_rect rectangle
+    points_in_rectangle = @points.as_map_points.within_rectangle rectangle
     puts "points: #{@points}"
     
     puts "---"

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 1
-  - 1
-  version: 0.2.1.1
+  - 2
+  version: 0.2.1.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1898968996463192661
+      hash: -1865177309588779558
       segments: 
       - 0
       version: "0"