geo_calc 0.6.1 → 0.7.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_calc
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-31 00:00:00.000000000Z
+date: 2011-06-11 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: &2158917420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158917420
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: &2158916800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158916800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154539880 !ruby/object:Gem::Requirement
+  requirement: &2158916220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2154539880
+  version_requirements: *2158916220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154539000 !ruby/object:Gem::Requirement
+  requirement: &2158915520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2154539000
+  version_requirements: *2158915520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154537680 !ruby/object:Gem::Requirement
+  requirement: &2158914860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2154537680
+  version_requirements: *2158914860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2154536760 !ruby/object:Gem::Requirement
+  requirement: &2158914180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154536760
+  version_requirements: *2158914180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154535520 !ruby/object:Gem::Requirement
+  requirement: &2158913340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2154535520
+  version_requirements: *2158913340
 description: Geo calculations in ruby and javascript
 email: kmandrup@gmail.com
 executables: []
@@ -91,18 +113,35 @@ files:
 - lib/geo_calc/calc/intersection.rb
 - lib/geo_calc/calc/midpoint.rb
 - lib/geo_calc/calc/rhumb.rb
-- lib/geo_calc/core_ext.rb
-- lib/geo_calc/geo.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_calc/geo_spec.rb
+- spec/geo_units/converter_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascript/geo_calc.js
 homepage: http://github.com/kristianmandrup/geo_calc
@@ -120,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1394595154528736354
+      hash: -4137681882050840880
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Geo calculation library

data/lib/geo_calc/core_ext.rb

@@ -1,318 +0,0 @@
-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
-
-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 
-
-  # all degrees between -180 and 180
-  def normalize_lng deg
-    case deg 
-    when -360..-180
-      deg % 180      
-    when -180..0 
-      -180 + (deg % 180) 
-    when 0..180
-      deg
-    when 180..360
-      deg % 180
-    else
-      raise ArgumentError, "Degrees #{deg} out of range, must be between -360 to 360"
-    end
-  end
-
-  # all degrees between -90 and 90
-  def normalize_lat deg
-    case deg 
-    when -360..-270
-      deg % 90      
-    when -270..-180
-      90 - (deg % 90)
-    when -180..-90
-      - (deg % 90)
-    when -90..0 
-      -90 + (deg % 90) 
-    when 0..90
-      deg
-    when 90..180 
-      deg % 90
-    when 180..270 
-      - (deg % 90)
-    when 270..360 
-      - 90 + (deg % 90)
-    else
-      raise ArgumentError, "Degrees #{deg} out of range, must be between -360 to 360"    
-    end 
-  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
-  end
-
-  def to_lat_dms format = :dms, dp = nil
-    Geo.to_lat self, format, dp
-  end
-
-  def to_lon_dms format = :dms, dp = nil
-    Geo.to_lon self, format, dp
-  end
-  
-  # Converts numeric degrees to radians
-  def to_rad
-    self * 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
-    self * 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
-
-   
-  # Formats the significant digits of a number, using only fixed-point notation (no exponential)
-  # 
-  # @param   {Number} precision: Number of significant digits to appear in the returned string
-  # @returns {String} A string representation of number which contains precision significant digits
-  def to_precision precision
-    self.round(precision).to_s
-  end
-  alias_method :to_fixed, :to_precision
-
-  # all degrees between -180 and 180
-  def normalize_lng
-    case self 
-    when -360, 0, 360
-      0
-    when -360..-180
-      self % 180      
-    when -180..0 
-      -180 + (self % 180) 
-    when 0..180
-      self
-    when 180..360
-      self % 180
-    else
-      return (self % 360).normalize_lng if self > 360
-      return (360 - (self % 360)).normalize_lng if self < -360
-      raise ArgumentError, "Degrees #{self} out of range"
-    end
-  end
-
-  # all degrees between -90 and 90
-  def normalize_lat
-    case self 
-    when -360, 0, 360
-      0
-    when -180, 180
-      0
-    when -360..-270
-      self % 90      
-    when -270..-180
-      90 - (self % 90)
-    when -180..-90
-      - (self % 90)
-    when -90..0 
-      -90 + (self % 90) 
-    when 0..90
-      self
-    when 90..180 
-      self % 90
-    when 180..270 
-      - (self % 90)
-    when 270..360 
-      - 90 + (self % 90)
-    else
-      return (self % 360).normalize_lat if self > 360
-      return (360 - (self % 360)).normalize_lat if self < -360
-      raise ArgumentError, "Degrees #{self} out of range"      
-    end
-  end
-
-  def normalize_deg shift = 0
-    (self + shift) % 360 
-  end
-  alias_method :normalize_degrees, :normalize_deg  
-end            
-
-module Math
-  def self.log10e
-    0.4342944819032518
-  end
-end
-
-module NumericLatLngExt
-  def to_lat 
-    normalize_lat
-  end
-
-  def to_lng 
-    normalize_lng
-  end
-    
-  def is_between? lower, upper
-    (lower..upper).cover? self
-  end
-end
-
-class Array
-  def geo_point
-    GeoPoint.new to_lat_lng
-  end  
-  
-  def to_lat_lng
-    raise "Array must contain at least two elements to be converted to latitude and longitude" if !(size >= 2)
-    [to_lat, to_lng]
-  end 
-
-  def to_lat
-    raise "Array must contain at least one element to return the latitude" if empty?
-    first.to_lat
-  end
-
-  def to_lng
-    raise "Array must contain at least two elements to return the longitude" if !self[1]
-    self[1].to_lng
-  end
-  
-  def trim
-    join.trim
-  end
-end
-
-class Symbol
-  def self.lng_symbols
-    [:lon, :long, :lng, :longitude]  
-  end
-
-  def self.lat_symbols
-    [:lat, :latitude]
-  end
-end
-
-class Hash
-  def to_lat_lng
-    [to_lat, to_lng]
-  end
-  
-  def to_lat
-    v = Symbol.lat_symbols.select {|key| self[key] }
-    return self[v.first].to_lat if !v.empty?
-    raise "Hash must contain either of the keys: [:lat, :latitude] to be converted to a latitude"
-  end
-
-  def to_lng
-    v = Symbol.lng_symbols.select {|key| self[key] }
-    return self[v.first].to_lng if !v.empty?
-    raise "Hash must contain either of the keys: [:lon, :long, :lng, :longitude] to be converted to a longitude"
-  end  
-  
-  def geo_point
-    GeoPoint.new to_lat_lng
-  end
-end  
-
-class String
-  def concat *args
-    args.inject(self) do |res, arg| 
-      res << arg.to_s
-      res
-    end
-  end
-
-  def parse_dms
-    Geo.parse_dms self
-  end
-
-  def to_rad
-    parse_dms.to_rad
-  end
-
-  def trim
-    strip
-  end
-
-  def geo_clean
-    self.gsub(/^\(/, '').gsub(/\)$/, '').trim
-  end
-
-  def geo_point
-    GeoPoint.new to_lat_lng
-  end
-    
-  def to_lat_lng  
-    geo_clean.split(',').to_lat_lng
-  end
-  
-  def to_lat
-    raise "An empty String has no latitude" if empty?
-    geo_clean.parse_dms.to_f.to_lat
-  end
-
-  def to_lng
-    raise "An empty String has no latitude" if empty?
-    geo_clean.parse_dms.to_f.to_lng
-  end
-end
-
-class Fixnum
-  include NumericGeoExt 
-  include NumericLatLngExt  
-end
-
-class Float
-  include NumericGeoExt   
-  include NumericLatLngExt
-end
-

data/lib/geo_calc/geo.rb

@@ -1,171 +0,0 @@
-require 'geo_calc/core_ext'
-
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  
- #  Geodesy representation conversion functions (c) Chris Veness 2002-2010
- #   - www.movable-type.co.uk/scripts/latlong.html
- #
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  
-
-# Parses string representing degrees/minutes/seconds into numeric degrees
-# 
-# This is very flexible on formats, allowing signed decimal degrees, or deg-min-sec optionally
-# suffixed by compass direction (NSEW). A variety of separators are accepted (eg 3º 37' 09"W) 
-# or fixed-width format without separators (eg 0033709W). Seconds and minutes may be omitted. 
-# (Note minimal validation is done).
-# 
-# @param   {String|Number} dmsStr: Degrees or deg/min/sec in variety of formats
-# @returns {Number} Degrees as decimal number
-# @throws  ArgumentError
-
-module Geo
-  extend self  
-  extend ::NumericCheckExt
-  include ::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
-
-
-  # Convert numeric degrees to deg/min/sec latitude (suffixed with N/S)
-  # 
-  # @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/min/seconds
-
-  def to_lat deg, format = :dms, dp = 0
-    deg = deg.normalize_lat
-    _lat = to_dms deg, format, dp
-    _lat == '' ? '' : _lat[1..-1] + (deg<0 ? 'S' : 'N')  # knock off initial '0' for lat!
-  end
-
-
-  # Convert numeric degrees to deg/min/sec longitude (suffixed with E/W)
-  # 
-  # @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/min/seconds
-
-  def to_lon deg, format = :dms, dp = 0
-    deg = deg.normalize_lng
-    lon = to_dms deg, format, dp
-    lon == '' ? '' : lon + (deg<0 ? 'W' : 'E')
-  end
-
-
-  # Convert numeric degrees to deg/min/sec as a bearing (0º..360º)
-  # 
-  # @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/min/seconds
-
-  def to_brng deg, format = :dms, dp = 0
-    deg = (deg.to_f + 360) % 360  # normalise -ve values to 180º..360º
-    brng =  to_dms deg, format, dp
-    brng.gsub /360/, '0'  # just in case rounding took us up to 360º!
-  end 
-  
-  protected
-
-  include NumericCheckExt
-end
-
-# class String
-#   include ::Geo
-# end