geo_calc 0.7.1 → 0.7.3

data/spec/geo_calc/include_apis_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+class CalcApis
+  include GeoCalc
+end
+
+class CalcDistance
+  include GeoCalc::Distance
+end
+
+
+
+# - www.movable-type.co.uk/scripts/latlong.html
+describe GeoPoint do 
+  describe 'include all Apis' do
+    it 'should have Bearing api' do
+      CalcApis.new.should respond_to :bearing_to
+    end
+  end
+
+  describe 'include select Apis' do
+    it 'should not have Bearing api' do
+      dist = CalcDistance.new
+      dist.should_not respond_to :bearing_to
+    end
+    
+    it 'should have Distance api' do
+      dist = CalcDistance.new
+      dist.should respond_to :distance_to
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,19 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'geo_calc'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+class GeoPoint
+  attr_accessor :lat, :lon
+  
+  def initialize lat, lon
+    @lat = lat
+    @lon = lon
+  end
+  
+  def lng
+    lon
+  end
+end
+
 
 RSpec.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-11 00:00:00.000000000Z
+date: 2011-06-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2158917420 !ruby/object:Gem::Requirement
+  requirement: &2153783140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,54 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158917420
+  version_requirements: *2153783140
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158916800 !ruby/object:Gem::Requirement
+  requirement: &2153782640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5.2
+        version: 0.4.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2158916800
+  version_requirements: *2153782640
+- !ruby/object:Gem::Dependency
+  name: geo_units
+  requirement: &2153782120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153782120
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2153781640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153781640
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2153781060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153781060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158916220 !ruby/object:Gem::Requirement
+  requirement: &2153780540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +76,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2158916220
+  version_requirements: *2153780540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158915520 !ruby/object:Gem::Requirement
+  requirement: &2153779960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +87,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2158915520
+  version_requirements: *2153779960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158914860 !ruby/object:Gem::Requirement
+  requirement: &2153779440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +98,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2158914860
+  version_requirements: *2153779440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2158914180 !ruby/object:Gem::Requirement
+  requirement: &2153778720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158914180
+  version_requirements: *2153778720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158913340 !ruby/object:Gem::Requirement
+  requirement: &2153778000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +120,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2158913340
+  version_requirements: *2153778000
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -113,35 +146,19 @@ files:
 - lib/geo_calc/calc/intersection.rb
 - lib/geo_calc/calc/midpoint.rb
 - lib/geo_calc/calc/rhumb.rb
-- lib/geo_calc/dms.rb
-- lib/geo_calc/dms/converter.rb
 - lib/geo_calc/extensions.rb
 - lib/geo_calc/extensions/array.rb
 - lib/geo_calc/extensions/hash.rb
-- lib/geo_calc/extensions/math.rb
-- lib/geo_calc/extensions/numeric.rb
 - lib/geo_calc/extensions/string.rb
 - lib/geo_calc/extensions/symbol.rb
-- lib/geo_calc/geo_point.rb
-- lib/geo_calc/geo_point/class_methods.rb
-- lib/geo_calc/geo_point/core_extension.rb
-- lib/geo_calc/geo_point/shared.rb
 - lib/geo_calc/pretty_print.rb
-- lib/geo_units.rb
-- lib/geo_units/converter.rb
-- lib/geo_units/numeric_ext.rb
 - spec/geo_calc/calculations_spec.rb
 - spec/geo_calc/core_ext/array_ext_spec.rb
 - spec/geo_calc/core_ext/hash_ext_spec.rb
 - spec/geo_calc/core_ext/numeric_geo_ext_spec.rb
 - spec/geo_calc/core_ext/string_ext_spec.rb
 - spec/geo_calc/core_ext_spec.rb
-- spec/geo_calc/dms/converter_spec.rb
-- spec/geo_calc/geo_point/class_methods_spec.rb
-- spec/geo_calc/geo_point/initializer_spec.rb
-- spec/geo_calc/geo_point/lat_lon.rb
-- spec/geo_calc/geo_point_spec.rb
-- spec/geo_units/converter_spec.rb
+- spec/geo_calc/include_apis_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascript/geo_calc.js
 homepage: http://github.com/kristianmandrup/geo_calc
@@ -159,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4137681882050840880
+      hash: -4458324713817276308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/geo_calc/dms/converter.rb

@@ -1,106 +0,0 @@
-module GeoCalc
-  module Dms
-    module Converter
-      include GeoCalc::NumericCheckExt
-
-      def parse_dms dms_str  
-        # check for signed decimal degrees without NSEW, if so return it directly
-        return dms_str if is_numeric?(dms_str)
-
-        # strip off any sign or compass dir'n & split out separate d/m/s
-        dms = dms_str.trim.gsub(/^-/,'').gsub(/[NSEW]$/i,'').split(/[^0-9.,]+/).map(&:trim).map(&:to_f)
-        return nil if dms.empty?
-
-        # and convert to decimal degrees...
-        deg = case dms.length      
-        when 3 # interpret 3-part result as d/m/s
-           dms[0]/1 + dms[1]/60 + dms[2]/3600
-        when 2 # interpret 2-part result as d/m
-          dms[0]/1 + dms[1]/60        
-        when 1 # just d (possibly decimal) or non-separated dddmmss        
-          d = dms[0];
-          # check for fixed-width unseparated format eg 0033709W
-          d = "0#{d}" if (/[NS]/i.match(dms_str)) # - normalise N/S to 3-digit degrees
-          d = "#{d.slice(0,3)/1}#{deg.slice(3,5)/60}#{deg.slice(5)/3600}" if (/[0-9]{7}/.match(deg)) 
-          d
-        else
-          nil
-        end
-        return nil if !deg
-        deg = (deg * -1) if (/^-|[WS]$/i.match(dms_str.trim)) # take '-', west and south as -ve
-        deg.to_f
-      end
-
-      # Convert decimal degrees to deg/min/sec format
-      #  - degree, prime, double-prime symbols are added, but sign is discarded, though no compass
-      #    direction is added
-      # 
-      # 
-      # @param   {Number} deg: Degrees
-      # @param   {String} [format=dms]: Return value as 'd', 'dm', 'dms'
-      # @param   {Number} [dp=0|2|4]: No of decimal places to use - default 0 for dms, 2 for dm, 4 for d
-      # @returns {String} deg formatted as deg/min/secs according to specified format
-      # @throws  {TypeError} deg is an object, perhaps DOM object without .value?
-
-      def to_dms deg, format = :dms, dp = nil 
-        deg = begin
-          deg.to_f
-        rescue
-          nil
-        end
-        return nil if !deg # give up here if we can't make a number from deg   
-
-        # default values
-        format ||= :dms
-        dp = if dp.nil?
-          case format.to_sym
-          when :d 
-            4
-          when :dm 
-            2
-          else
-            0 # default
-          end
-        end
-        dp ||= 0
-
-        deg = deg.abs # (unsigned result ready for appending compass dir'n)
-
-        case format
-        when :d
-          d = deg.round(dp)       # round degrees
-          ds = "0#{d}" if (d <100)    # pad with leading zeros
-          ds = "0#{ds}" if (d <10) 
-          dms = ds.to_s.concat("\u00B0")  # add º symbol
-        when :dm            
-          min = (deg*60).round(dp)   # convert degrees to minutes & round
-          d = d.to_i
-          d = (min / 60).floor          # get component deg/min
-          m = (min % 60).round(dp)   # pad with trailing zeros
-          ds = d
-          ms = m
-          ds = "0#{d}" if (d<100)        # pad with leading zeros
-          ds = "0#{d}" if (d<10)
-          ms = "0#{m}" if (m<10)               
-          dms = ds.to_s.concat("\u00B0", ms, "\u2032") # add º, ' symbols
-        when :dms
-          sec = (deg * 3600).round   # convert degrees to seconds & round
-          d = (sec / 3600).floor          # get component deg/min/sec
-          m = ((sec / 60) % 60).floor
-          s = (sec % 60).round(dp)     # pad with trailing zeros
-          ds = d
-          ms = m
-          ss = s
-          ds = "0#{d}" if (d < 100)          # pad with leading zeros
-          ds = "0#{ds}" if (d < 10) 
-          ms = "0#{m}" if (m < 10) 
-          ss = "0#{s}" if (s < 10) 
-          dms = ds.to_s.concat("\u00B0", ms, "\u2032", ss, "\u2033")  # add º, ', " symbols
-        end
-        return dms
-      end
-      
-      extend self
-    end
-  end
-end

data/lib/geo_calc/dms.rb

@@ -1,5 +0,0 @@
-module GeoCalc
-  module Dms
-    autoload :Converter, 'geo_calc/dms/converter'
-  end
-end

data/lib/geo_calc/extensions/math.rb

@@ -1,6 +0,0 @@
-module Math
-  def self.log10e
-    0.4342944819032518
-  end
-end
-  

data/lib/geo_calc/extensions/numeric.rb

@@ -1,24 +0,0 @@
-require 'geo_units'
-
-module GeoCalc
-  module NumericCheckExt
-    def is_numeric? arg
-      arg.is_a? Numeric
-    end  
-
-    alias_method :is_num?, :is_numeric?
-  
-    def check_numeric! arg
-      raise ArgumentError, "Argument must be Numeric" if !is_numeric? arg
-    end  
-  end
-end
-
-class Fixnum
-  include ::GeoUnits::NumericExt 
-end
-
-class Float
-  include ::GeoUnits::NumericExt
-end
-

data/lib/geo_calc/geo_point/class_methods.rb

@@ -1,15 +0,0 @@
-require 'geo_calc/geo_point/shared'
-
-class GeoPoint
-  module ClassMethods
-    def earth_radius_km  
-      @earth_radius_km ||= 6371
-    end    
-
-    def coord_mode  
-      @coord_mode ||= :lat_lng
-    end    
-           
-    include Shared
-  end
-end

data/lib/geo_calc/geo_point/core_extension.rb

@@ -1,11 +0,0 @@
-class GeoPoint
-  module CoreExtension
-    def to_coords    
-      send(:"to_#{GeoPoint.coord_mode}")
-    end
-
-    def geo_point
-      GeoPoint.new to_coords
-    end
-  end
-end

data/lib/geo_calc/geo_point/shared.rb

@@ -1,29 +0,0 @@
-class GeoPoint
-  module Shared
-    def unit
-      :degrees
-    end
-
-    def earth_radius_km= radius_km
-      raise ArgumentException, "Not a valid earth km radius: #{radius_km}" unless valid_earth_radius? radius_km
-      @earth_radius_km = radius_km
-    end
-
-    def coord_mode= mode
-      raise ArgumentException, "Not a valid coordinates mode: #{mode}" unless valid_mode? mode
-      @coord_mode = mode
-    end
-  
-    protected
-
-    include GeoCalc::NumericCheckExt
-
-    def valid_earth_radius? radius_km
-      is_numeric?(radius_km) && radius_km.is_between?(6350, 6380)            
-    end           
-
-    def valid_mode? mode 
-      [:lng_lat, :lat_lng].include? mode
-    end    
-  end
-end

data/lib/geo_calc/geo_point.rb

@@ -1,135 +0,0 @@
-require 'sugar-high/arguments'
-require 'geo_calc/calc'
-require 'geo_calc/extensions'
-require 'geo_calc/geo_point/shared'
-
- #  Sample usage:                                                                                 
- #    p1 = GeoPoint.new(51.5136, -0.0983)                                                      
- #    p2 = GeoPoint.new(51.4778, -0.0015)                                                      
- #    dist = p1.distance_to(p2)          # in km                                             
- #    brng = p1.bearing_to(p2)           # in degrees clockwise from north                   
- #    ... etc                                                                                     
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  
-
-class GeoPoint
-  include GeoCalc::Calc::All
-
-  autoload :Shared,         'geo_calc/geo_point/shared'
-  autoload :ClassMethods,   'geo_calc/geo_point/class_methods'
-  autoload :CoreExtension,  'geo_calc/geo_point/core_extension'
-
-  attr_reader   :lat, :lon  
-
-  # Creates a point on the earth's surface at the supplied latitude / longitude
-  # 
-  # - Numeric latitude in numeric degrees
-  # - Numeric longitude in numeric degrees  
-
-  # Optional options
-  # - :radius - earth radius in km
-  # - :mode - coordinates mode, either :lng_lat or :lat_lng, otherwise uses global setting as per GeoPoint.coord_mode
-  def initialize *args
-    options = args.is_a?(GeoPoint) ? {} : args.last_option
-    earth_radius_km = options[:radius]
-    coord_mode = options[:mode]
-    
-    case args.size
-    when 1
-      create_from_one args
-    when 2
-      create_from_two *args
-    else
-      raise "GeoPoint must be initialized with either one or to arguments defining the (latitude, longitude) coordinate on the map"
-    end
-  end
-
-  extend ClassMethods
-  include Shared
-
-  def coord_mode
-    @coord_mode ||= GeoPoint.coord_mode
-  end
-
-  def earth_radius_km  
-    @earth_radius_km ||= GeoPoint.earth_radius_km  # default
-  end
-
-  def lat= value 
-    @lat = value.to_lat
-  end
-
-  def lon= value
-    @lon = value.to_lng
-  end
-
-  (Symbol.lng_symbols - [:lon]).each do |sym|
-    class_eval %{
-      alias_method :#{sym}, :lon
-      alias_method :#{sym}=, :lon=
-    }
-  end    
-  alias_method :to_lng, :lng
-
-  (Symbol.lat_symbols - [:lat]).each do |sym|
-    class_eval %{
-      alias_method :#{sym}, :lat
-      alias_method :#{sym}=, :lat=
-    }
-  end
-  alias_method :to_lat, :lat
-
-  def [] key
-    case key
-    when Fixnum   
-      raise ArgumentError, "Index must be 0 or 1" if !(0..1).cover?(key)
-      to_a[key] 
-    when String, Symbol
-      send(key) if respond_to? key
-    else
-      raise ArgumentError, "Key must be a Fixnum (index) or a method name"  
-    end    
-  end
-
-  alias_method :to_dms, :to_s
-
-  def reverse_point!
-    self.lat = lat * -1
-    self.lng = lng * -1
-    self    
-  end
-
-  def reverse_point
-    self.dup.reverse_point!
-  end
-
-  def to_lat_lng
-    [lat, lng]
-  end
-
-  def to_lng_lat
-    [lng, lat]
-  end
-
-  def to_a
-    send(:"to_#{coord_mode}")
-  end
-  
-  protected
-
-  include ::GeoCalc::NumericCheckExt
-
-  def to_coords points
-    points.send(:"to_#{coord_mode}")
-  end
-  
-  def create_from_one args
-    args = args.first
-    create_from_two *to_coords(args)
-  end
-  
-  def create_from_two lat, lon
-    @lat    = lat.to_lat
-    @lon    = lon.to_lng
-  end  
-end
-