geo_calc 0.5.1 → 0.5.2

data/Gemfile

@@ -3,8 +3,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 2.5.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "rspec",    ">= 2.5.0"
+  gem "bundler",  ">= 1"
+  gem "jeweler",  ">= 1.5.2"
+  gem "rcov",     ">= 0"
+  gem "rake",     ">= 0.9"
 end

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/geo_calc.gemspec

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

data/lib/geo_calc/core_ext.rb

@@ -10,6 +10,39 @@ module NumericCheckExt
   end  
 end
 
+module GeoUnits
+  module Converter
+    # Converts numeric degrees to radians
+    def to_rad degrees
+      degrees * Math::PI / 180
+    end
+    alias_method :to_radians, :to_rad
+    alias_method :as_rad,     :to_rad
+    alias_method :as_radians, :to_rad
+    alias_method :in_rad,     :to_rad
+    alias_method :in_radians, :to_rad
+
+
+    # Converts radians to numeric (signed) degrees
+    # latitude (north to south) from equator +90 up then -90 down (equator again) = 180 then 180 for south = 360 total 
+    # longitude (west to east)  east +180, west -180 = 360 total
+    def to_deg radians
+      radians * 180 / Math::PI
+    end
+
+    alias_method :to_degrees, :to_deg
+    alias_method :as_deg,     :to_deg
+    alias_method :as_degrees, :to_deg
+    alias_method :in_deg,     :to_deg
+    alias_method :in_degrees, :to_deg
+  end 
+  
+  def normalize_deg degrees, shift = 0
+    (degrees + shift) % 360 
+  end
+  alias_method :normalize_degrees, :normalize_deg  
+end
+
 module NumericGeoExt 
   def to_dms format = :dms, dp = nil
     Geo.to_dms self, format, dp

data/lib/geo_calc/geo_point.rb

@@ -21,21 +21,9 @@ class GeoPoint
   # - Numeric lon: longitude in numeric degrees
   # - Numeric [rad=6371]: radius of earth if different value is required from standard 6,371km
 
-  attr_reader :lat, :lon, :unit, :radius
+  attr_reader   :lat, :lon
+  attr_accessor :radius
   
-  (Symbol.lng_symbols - [:lon]).each do |sym|
-    class_eval %{
-      alias_method :#{sym}, :lon
-    }
-  end    
-
-  (Symbol.lat_symbols - [:lat]).each do |sym|
-    class_eval %{
-      alias_method :#{sym}, :lat
-    }
-  end    
-
-
   def initialize *args
     rad = args.delete(args.size) if is_numeric?(args.last) && args.last.is_between?(6350, 6380)
     rad ||= 6371 # default
@@ -49,6 +37,32 @@ class GeoPoint
     end
   end
 
+  def unit
+    :degrees
+  end
+
+  def lat= value 
+    @lat = value.to_lat
+  end
+
+  def lon= value 
+    @lon = lon.to_lng
+  end
+
+  (Symbol.lng_symbols - [:lon]).each do |sym|
+    class_eval %{
+      alias_method :#{sym}, :lon
+      alias_method :#{sym}=, :lon=
+    }
+  end    
+
+  (Symbol.lat_symbols - [:lat]).each do |sym|
+    class_eval %{
+      alias_method :#{sym}, :lat
+      alias_method :#{sym}=, :lat=
+    }
+  end
+
   def [] key
     case key
     when Fixnum   
@@ -96,8 +110,7 @@ class GeoPoint
     rad ||= 6371  # earth's mean radius in km
     @lat    = lat.to_lat
     @lon    = lon.to_lng
-    @radius = rad
-    @unit = :degrees
+    @radius = rad    
   end  
 end
 

data/spec/geo_calc/geo_point_spec.rb

@@ -176,6 +176,29 @@ describe GeoPoint do
     end
   end
 
+  describe '#lat=' do
+    before :each do
+      @p1 = GeoPoint.new 50, 5
+    end
+  
+    it 'should set new latitude' do
+      @p1.lat = 60
+      @p1.lat.should == 60
+    end
+
+    it 'should set new latitude within allowed range' do
+      @p1.lat = 520
+      @p1.lat.should be_between(0, 360)
+    end
+
+    describe '#latitude (alias)' do
+      it 'should set latitude' do
+        @p1.lat = 72
+        @p1.latitude.should == 72
+      end
+    end
+  end
+
   describe '#[]' do
     before :each do
       @p1 = GeoPoint.new 50, 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-05-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152964520 !ruby/object:Gem::Requirement
+  requirement: &2157580520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152964520
+  version_requirements: *2157580520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152963980 !ruby/object:Gem::Requirement
+  requirement: &2157580040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152963980
+  version_requirements: *2157580040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152955240 !ruby/object:Gem::Requirement
+  requirement: &2157579560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152955240
+  version_requirements: *2157579560
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152954660 !ruby/object:Gem::Requirement
+  requirement: &2157579080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152954660
+  version_requirements: *2157579080
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -95,9 +95,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4431488091185684901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: