geo_magic 0.2.1 → 0.2.1.1

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.1.1

data/geo_magic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.1"
+  s.version = "0.2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/geo_magic/meta.rb",
     "lib/geo_magic/point.rb",
     "lib/geo_magic/radius.rb",
+    "lib/geo_magic/rectangle.rb",
     "lib/geo_magic/remote.rb",
     "lib/geo_magic/util.rb",
     "lib/rails/config.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "spec/geo_magic/plane_dist_spec.rb",
     "spec/geo_magic/remote_spec.rb",
     "spec/geo_magic/select_nearest_spec.rb",
+    "spec/geo_magic/within_rect_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/geo_magic}
@@ -62,6 +64,7 @@ Gem::Specification.new do |s|
     "spec/geo_magic/plane_dist_spec.rb",
     "spec/geo_magic/remote_spec.rb",
     "spec/geo_magic/select_nearest_spec.rb",
+    "spec/geo_magic/within_rect_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/geo_magic/rectangle.rb

@@ -0,0 +1,52 @@
+module GeoMagic
+  class Rectangle
+    attr_accessor :top_left_point, :bottom_right_point
+    
+    def initialize point_a, point_b
+      @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 overlaps? point
+      # puts "inside_top_left?: #{point} -> #{inside_top_left?(point)}"
+      # puts "inside_bottom_right?: #{point} -> #{inside_bottom_right?(point)}"
+      inside_top_left?(point) && inside_bottom_right?(point)
+    end
+
+    def to_s
+      "#{top_left_point} - #{bottom_right_point}"
+    end
+    
+    protected
+
+    def top_long point_a, point_b      
+      return point_a.longitude if point_a.longitude > point_b.longitude
+      point_b.longitude
+    end
+
+    def bot_long point_a, point_b      
+      return point_a.longitude if point_a.longitude < point_b.longitude
+      point_b.longitude
+    end
+
+    def left_lat point_a, point_b
+      return point_a.latitude if point_a.latitude < point_b.latitude
+      point_b.latitude
+    end
+
+    def right_lat point_a, point_b
+      return point_a.latitude if point_a.latitude > point_b.latitude
+      point_b.latitude
+    end
+
+    
+    def inside_top_left? point
+      top_left_point.latitude < point.latitude && top_left_point.longitude < point.longitude
+    end
+
+    def inside_bottom_right? point
+      bottom_right_point.latitude > point.latitude && bottom_right_point.longitude > point.longitude
+    end
+  end
+end
+  

data/lib/geo_magic/util.rb

@@ -1,3 +1,5 @@
+require 'geo_magic/rectangle'
+
 module GeoMagic
   module Util #:nodoc:
     def self.extract_point point
@@ -37,9 +39,9 @@ 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]      
+      from_loc = get_location get_dist_obj(options[:from])
 
       dist = dist_obj.distance  / (RAD_PER_DEG * rad[dist_obj.unit])
 
@@ -56,6 +58,12 @@ module GeoMagic
       res
     end
 
+    def get_within_rect rectangle
+      self.select do |point|
+        rectangle.overlaps? point
+      end
+    end
+
     def get_closest number, options = {}
       calc_method = get_proc(options[:precision] || :normal)
       from_loc = get_location options[:from]

data/spec/geo_magic/select_nearest_spec.rb

@@ -60,8 +60,10 @@ describe "GeoMagic closest" do
   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
     
-    closest = persons.as_map_points.get_within 5.km, :from => @center_point
-    puts "Persons within 4 km: #{closest.inspect}"        
+    people_within = persons.as_map_points.get_within 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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'geo_magic'
+
+describe "GeoMagic within rectanlge" do
+  before do
+    @lat1 = 104.88544
+    @long1 = 39.06546
+
+    @center_point = GeoMagic::Point.new @lat1, @long1
+    @radius = @center_point.within(10.km)
+    @points = @radius.create_points_in_square 10
+  end
+    
+  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
+    puts "points: #{@points}"
+    
+    puts "---"
+    
+    puts "points within rectangle #{rectangle} :"
+    puts points_in_rectangle.inspect
+  end
+end
+
+describe "GeoMagic within rectangle - negative longitude" do
+  before do
+    @lat1 = -104.88544
+    @long1 = 39.06546
+
+    @center_point = GeoMagic::Point.new @lat1, @long1    
+    @radius = @center_point.within(10.km)
+    @points = @radius.create_points_in_square 10
+  end
+    
+  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
+    puts "points: #{@points}"
+    
+    puts "---"
+    
+    puts "points within rectangle #{rectangle} :"
+    puts points_in_rectangle.inspect
+  end
+end
+

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 1
-  version: 0.2.1
+  - 1
+  version: 0.2.1.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -164,6 +165,7 @@ files:
 - lib/geo_magic/meta.rb
 - lib/geo_magic/point.rb
 - lib/geo_magic/radius.rb
+- lib/geo_magic/rectangle.rb
 - lib/geo_magic/remote.rb
 - lib/geo_magic/util.rb
 - lib/rails/config.rb
@@ -175,6 +177,7 @@ files:
 - spec/geo_magic/plane_dist_spec.rb
 - spec/geo_magic/remote_spec.rb
 - spec/geo_magic/select_nearest_spec.rb
+- spec/geo_magic/within_rect_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/geo_magic
@@ -190,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 27646408712887287
+      hash: -1898968996463192661
       segments: 
       - 0
       version: "0"
@@ -217,4 +220,5 @@ test_files:
 - spec/geo_magic/plane_dist_spec.rb
 - spec/geo_magic/remote_spec.rb
 - spec/geo_magic/select_nearest_spec.rb
+- spec/geo_magic/within_rect_spec.rb
 - spec/spec_helper.rb