geo_swap 0.0.2 → 0.1.0

data/geo_swap.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '10.0.3'
   gem.add_development_dependency 'rspec', '2.12.0'
+  gem.add_development_dependency 'pry', '0.9.11.4'
 end

data/lib/geo_swap/utm_point.rb

@@ -0,0 +1,18 @@
+module GeoSwap
+  class UtmPoint
+
+    attr_reader :zone, :easting, :northing, :hemisphere
+
+    def initialize(attrs)
+      @easting = attrs.fetch(:easting)
+      @northing = attrs.fetch(:northing)
+      @zone = attrs.fetch(:zone)
+      @hemisphere = attrs.fetch(:hemisphere)
+    end
+
+    def to_s
+      "#{zone.number}#{zone.letter} #{easting}mE #{northing}mN"
+    end
+
+  end
+end

data/lib/geo_swap/version.rb

@@ -1,3 +1,3 @@
 module GeoSwap
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/geo_swap/zone.rb

@@ -1,6 +1,7 @@
 module GeoSwap
   class Zone
-    def initialize(longitude)
+    def initialize(latitude, longitude)
+      @latitude = latitude
       @longitude = longitude.to_f
     end
 
@@ -15,5 +16,32 @@ module GeoSwap
     def origin
       @origin ||= ((number - 1) * 6) - 177
     end
+
+    def letter
+      case @latitude
+      when 72..84   then 'X'
+      when 64...72  then 'W'
+      when 56...64  then 'V'
+      when 48...56  then 'U'
+      when 40...48  then 'T'
+      when 32...40  then 'S'
+      when 24...32  then 'R'
+      when 16...24  then 'Q'
+      when 8...16   then 'P'
+      when 0...8    then 'N'
+      when -8...0   then 'M'
+      when -16...-8 then 'L'
+      when -24...-16 then 'K'
+      when -32...-24 then 'J'
+      when -40...-32 then 'H'
+      when -48...-40 then 'G'
+      when -56...-48 then 'F'
+      when -64...-56 then 'E'
+      when -72...-64 then 'D'
+      when -80...-72 then 'C'
+      else
+        'Z'
+      end
+    end
   end
 end

data/lib/geo_swap.rb

@@ -1,6 +1,8 @@
+require 'pry'
 require "geo_swap/version"
 require 'geo_swap/zone'
 require 'geo_swap/utilities'
+require 'geo_swap/utm_point'
 
 module GeoSwap
   extend Utilities
@@ -10,10 +12,10 @@ module GeoSwap
     lat_radians = degrees_to_radians(lat)
     long_radians = degrees_to_radians(long)
 
-    zone = Zone.new(long)
+    zone = Zone.new(lat, long)
     origin_radians = degrees_to_radians(zone.origin)
 
-    equator_factor = (EQUATORIAL_RADIUS / Math.sqrt(1 - (ECC_SQUARED * (Math.sin(lat_radians) ** 2)))
+    equator_factor = (EQUATORIAL_RADIUS / Math.sqrt(1 - (ECC_SQUARED * (Math.sin(lat_radians) ** 2))))
     squared_lat_tangent = Math.tan(lat_radians) ** 2
     ecc_prime_factor = ECC_PRIME_SQUARED * (Math.cos(lat_radians) ** 2)
     origin_factor = Math.cos(lat_radians) * (long_radians - origin_radians)
@@ -36,6 +38,25 @@ module GeoSwap
       ecc_4 * latRad_4
     )
 
+    utm_easting = (MERIDIAN_SCALE * equator_factor * 
+      (origin_factor + (1 - squared_lat_tangent + ecc_prime_factor) *
+      (origin_factor ** 3) / 6 +
+      (5 - 18 * squared_lat_tangent + (squared_lat_tangent ** 2) + 72 * ecc_prime_factor - 58 * ECC_PRIME_SQUARED) *
+      (origin_factor ** 5) / 120) + EASTING_OFFSET)
+
+    utm_northing = (
+      MERIDIAN_SCALE * ( northing_factor + equator_factor * Math.tan(lat_radians) * (origin_factor ** 2) / 2 + (5 - squared_lat_tangent + 9 * ecc_prime_factor + 4 * (ecc_prime_factor ** 2)) * (origin_factor ** 4) / 2 +
+     (61 - 58 * squared_lat_tangent + (squared_lat_tangent ** 2) + 600 * ecc_prime_factor - 330 * ECC_PRIME_SQUARED) *
+     (origin_factor ** 6) / 720))
+
+    utm_northing += 10000000 if utm_northing < 0
+
+    UtmPoint.new(
+      easting: utm_easting.round,
+      northing: utm_northing.round,
+      zone: zone,
+      hemisphere: (lat < 0 ? 'S' : 'N')
+    )
   end
 
   module_function :lat_long_to_utm
@@ -53,6 +74,10 @@ module GeoSwap
   EQUATORIAL_RADIUS = 6378137.0
   ECC_SQUARED = 0.006694380023
   ECC_PRIME_SQUARED = ECC_SQUARED / (1 - ECC_SQUARED)
+  MERIDIAN_SCALE = 0.9996
+
+  EASTING_OFFSET = 500000.0
+  NORTHING_OFFSET = 10000000.0
 
   def self.validate_range(lat, long)
     unless lat.between?(MIN_LATITUDE, MAX_LATITUDE) && long.between?(MIN_LONGITUDE, MAX_LONGITUDE)

data/spec/geo_swap_spec.rb

@@ -12,7 +12,7 @@ module GeoSwap
       {
         lat: 41.8901694,
         long: 12.4922694,
-        utm: "33T 291952mE 4640623mN",
+        utm: "33T 291952mE 4640622mN",
       }
     ]
 
@@ -40,7 +40,8 @@ module GeoSwap
 
       it 'correctly converts several reference points' do
         DATA.each do |data|
-          GeoSwap.lat_long_to_utm(data[:lat], data[:long]).should == data[:utm]
+          GeoSwap.lat_long_to_utm(data[:lat], data[:long]).to_s.
+            should == data[:utm]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_swap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.11.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.11.4
 description: Simple utility functions for converting between coordinate systems (Lat/Long,
   UTM, USNG)
 email:
@@ -60,6 +76,7 @@ files:
 - geo_swap.gemspec
 - lib/geo_swap.rb
 - lib/geo_swap/utilities.rb
+- lib/geo_swap/utm_point.rb
 - lib/geo_swap/version.rb
 - lib/geo_swap/zone.rb
 - spec/geo_swap/utilities_spec.rb
@@ -79,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -10926259193031771
+      hash: 3526420961644426813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -10926259193031771
+      hash: 3526420961644426813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23