silva 0.1.0 → 0.1.1

data/Rakefile

@@ -1,6 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
 
-task :test do
-  ruby "test/test_helper.rb"
+$:.unshift File.expand_path("../lib", __FILE__)
+require "silva/version"
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/silva/test_*.rb'
 end

data/lib/silva/location.rb

@@ -1,3 +1,5 @@
+require 'silva/system'
+
 module Silva
   ##
   # A spoonful of syntactic sugar for creating location systems from the relevant parameters:
@@ -8,7 +10,7 @@ module Silva
   module Location
     ##
     # Create a location system from the given parameters.
-    # 
+    #
     # @param [Symbol] system_name The name of the system -- at present, :wgs84, :en, :osgb36 or :gridref.
     # @param [Hash] options Parameters relevant to the system (see individual systems for details).
     # @return [Silva::System] A new location system.

data/lib/silva/system/base.rb

@@ -1,20 +1,5 @@
 module Silva
-  ##
-  # A location system -- :wgs84, :osgb36, :en or :gridref.
   module System
-    ##
-    # A factory method to simplify and moderate creation of location systems.
-    # @param [Symbol] system_name The name of the system to be created.
-    # @param [Hash] options Parameters relevant to the given system.
-    # @return [Silva::System] A valid location system.
-    # @raises Silva::InvalidSystemError If the given system can't be created.
-    def self.create(system_name, options)
-      system = Silva::System.const_get(system_name.to_s.capitalize)
-      system.new(options)
-    rescue NameError
-      raise Silva::InvalidSystemError, "Can't create system: #{system_name}"
-    end
-
     ##
     # Provides basic utility functions.
     #
@@ -38,7 +23,7 @@ module Silva
 
       ##
       # Transforms the base system to a different system.
-      # 
+      #
       # @param [Symbol] target_system_name The system to convert to.
       # @param [Hash] options Parameters relevant to the target system.
       # @return [Silva::System] A new location system of type target_system_name.

data/lib/silva/system/en.rb

@@ -1,3 +1,7 @@
+require 'silva/system/base'
+require 'silva/system/osen'
+require 'silva/transform'
+
 module Silva
   module System
     ##
@@ -9,8 +13,8 @@ module Silva
       def to_s
         [easting, northing].to_s
       end
-      
-      private 
+
+      private
 
       def to_osgb36(options = nil)
         Silva::Transform.en_to_osgb36(self)

data/lib/silva/system/gridref.rb

@@ -1,8 +1,12 @@
+require 'silva/system/base'
+require 'silva/system/osen'
+require 'silva/transform'
+
 module Silva
   module System
     ##
     # Location system representing Ordnance Survey Standard Grid References.
-    # 
+    #
     # Can be created given the options :easting => e, :northing => n or :gridref => g
     #
     class Gridref < Base
@@ -39,7 +43,7 @@ module Silva
           n100k = (northing / 100000).floor
           index = n100k * OSGB_GRID_WIDTH + e100k
           prefix = OSGB_PREFIXES[index]
-          
+
           e = ((easting % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
           n = ((northing % OSGB_GRID_SCALE) / (10**(5 - @digits / 2))).round
 

data/lib/silva/system/osgb36.rb

@@ -1,3 +1,7 @@
+require 'silva/system/base'
+require 'silva/system/co_ordinate'
+require 'silva/transform'
+
 module Silva
   module System
     ##

data/lib/silva/system/wgs84.rb

@@ -1,3 +1,7 @@
+require 'silva/system/base'
+require 'silva/system/co_ordinate'
+require 'silva/transform'
+
 module Silva
   module System
     ##

data/lib/silva/transform.rb

@@ -1,3 +1,5 @@
+require 'silva/system'
+
 module Silva
   ##
   # Encapsulates the hairy maths required to perform the various transforms.
@@ -23,7 +25,7 @@ module Silva
     LAMBDA0 = -2 * Math::PI / 180
 
     # Helmert transform parameters
-    HELMERT_PARAMS = { 
+    HELMERT_PARAMS = {
       :tx=> -446.448, :ty=> 125.157, :tz=> -542.060, # m
       :rx=> -0.1502, :ry=> -0.2470, :rz=> -0.8421, # sec
       :s=> 20.4894 # ppm
@@ -42,7 +44,6 @@ module Silva
       helmert_transform(osgb36, :wgs84, AIRY1830, HELMERT_PARAMS.inject({}) { |h, (k, v)| h[k] = v * -1; h }, GRS80)
     end
 
-
     ##
     # Convert a :wgs84 co-ordinate system to :osgb36
     #
@@ -112,7 +113,7 @@ module Silva
 
       nu, rho, eta2 = transverse_and_meridional_radii(phi, ellipsoid)
       m = meridional_arc(phi, ellipsoid)
-      
+
       i = m + N0
       ii = (nu / 2) * Math.sin(phi) * Math.cos(phi)
       iii = (nu / 24) * Math.sin(phi) * Math.cos(phi)**3 * (5 - Math.tan(phi)**2 + 9 * eta2)
@@ -121,15 +122,15 @@ module Silva
       v = (nu / 6) * Math.cos(phi)**3 * (nu / rho - Math.tan(phi)**2)
       vi = (nu / 120) * Math.cos(phi)**5 * \
       (5 - 18 * Math.tan(phi)**2 + Math.tan(phi)**4 + 14 * eta2 - 58 * Math.tan(phi)**4 * eta2)
-      
+
       n = i + ii * (lambda - LAMBDA0)**2 + iii * (lambda - LAMBDA0)**4 + iiia * (lambda - LAMBDA0)**6
       e = E0 + iv * (lambda - LAMBDA0) + v * (lambda - LAMBDA0)**3 + vi * (lambda - LAMBDA0)**5
-      
+
       System.create(:en, :easting => e.round, :northing => n.round)
     end
 
     # Transform to/from :osgb36/:wgs84 co-ordinate systems.
-    # Algorithm from: 
+    # Algorithm from:
     # http://www.ordnancesurvey.co.uk/oswebsite/gps/information/coordinatesystemsinfo/guidecontents/guide6.html
     # Portions of code from:
     # http://www.harrywood.co.uk/blog/2010/06/29/ruby-code-for-converting-to-uk-ordnance-survey-coordinate-systems-from-wgs84/
@@ -138,40 +139,40 @@ module Silva
       phi = to_rad(source_system.lat)
       lambda = to_rad(source_system.long)
       h = source_system.alt
-      
+
       a1 = ellipsoid_1[:a]
-      
+
       # convert co-ordinates to 3D Cartesian. See:
       # http://www.ordnancesurvey.co.uk/oswebsite/gps/docs/A_Guide_to_Coordinate_Systems_in_Great_Britain.pdf
       e_sq1 = eccentricity_squared(ellipsoid_1)
       nu = a1 / Math.sqrt(1 - e_sq1 * Math.sin(phi)**2)
-      
+
       x1 = (nu + h) * Math.cos(phi) * Math.cos(lambda)
       y1 = (nu + h) * Math.cos(phi) * Math.sin(lambda)
       z1 = ((1 - e_sq1) * nu + h) * Math.sin(phi)
-      
+
       # apply Helmert transformation
       tx = transform[:tx]
       ty = transform[:ty]
       tz = transform[:tz]
-      rx = transform[:rx] / 3600 * Math::PI / 180 
+      rx = transform[:rx] / 3600 * Math::PI / 180
       ry = transform[:ry] / 3600 * Math::PI / 180
       rz = transform[:rz] / 3600 * Math::PI / 180
-      s1 = transform[:s] / 1e6 + 1 
-      
+      s1 = transform[:s] / 1e6 + 1
+
       x2 = tx + x1 * s1 - y1 * rz + z1 * ry
       y2 = ty + x1 * rz + y1 * s1 - z1 * rx
       z2 = tz - x1 * ry + y1 * rx + z1 * s1
-      
+
       # convert 3D Cartesian co-ordinates back to lat, long, alt
       a2 = ellipsoid_2[:a]
       precision = 4 / a2
-      
+
       e_sq2 = eccentricity_squared(ellipsoid_2)
       p = Math.sqrt(x2**2 + y2**2)
       phi = Math.atan2(z2, p * (1 - e_sq2))
       phi_prime = 2 * Math::PI
-      
+
       while ((phi - phi_prime).abs > precision) do
         nu = a2 / Math.sqrt(1 - e_sq2 * Math.sin(phi)**2)
         phi_prime = phi
@@ -180,7 +181,7 @@ module Silva
 
       lambda = Math.atan2(y2, x2)
       h = p / Math.cos(phi) - nu
-      
+
       System.create(target_system, :lat => to_deg(phi).round(DEGREE_ROUNDING_PLACES),\
                     :long => to_deg(lambda).round(DEGREE_ROUNDING_PLACES), :alt => h)
     end

data/lib/silva/version.rb

@@ -1,3 +1,3 @@
 module Silva
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/silva.rb

@@ -1,4 +1,4 @@
-# Silva makes it simple to convert WGS84 (GPS) location data to and from the UK 
+# Silva makes it simple to convert WGS84 (GPS) location data to and from the UK
 # Ordnance Survey OSGB36 formats (grid references, eastings/northings, and longitude/latitude).
 #
 # Silva was inspired by the work of Chris Veness and Harry Wood:
@@ -6,9 +6,9 @@
 # http://www.harrywood.co.uk/blog/2010/06/29/ruby-code-for-converting-to-uk-ordnance-survey-coordinate-systems-from-wgs84/
 #
 # Portions of Harry's code remain, especially in Silva::Transform::helmert_transform,
-# but algorithms have been clarified so as to be easily comparable with those given by 
+# but algorithms have been clarified so as to be easily comparable with those given by
 # Ordnance Survey.
-# 
+#
 # Usage:
 # location = Silva::Location.from(:wgs84, data[:wgs84]).to(:gridref, :digits => 8)
 #
@@ -17,14 +17,24 @@
 # Requires::  Ruby 1.9
 # License::   Provided under the FreeBSD License (http://www.freebsd.org/copyright/freebsd-license.html)
 
-require_relative 'silva/version'
-require_relative 'silva/exception'
-require_relative 'silva/location'
-require_relative 'silva/transform'
-require_relative 'silva/system/base'
-require_relative 'silva/system/co_ordinate'
-require_relative 'silva/system/osen'
-require_relative 'silva/system/wgs84'
-require_relative 'silva/system/osgb36'
-require_relative 'silva/system/en'
-require_relative 'silva/system/gridref'
+require 'silva/version'
+require 'silva/location'
+require 'silva/system'
+
+module Silva
+  ##
+  # Indicates that an invalid system name has been passed.
+  class InvalidSystemError < StandardError; end
+  ##
+  # Indicates that an invalid transform has been attempted.
+  class InvalidTransformError < StandardError; end
+  ##
+  # Indicates that an invalid parameter has been passed.
+  class InvalidParamError < StandardError; end
+  ##
+  # Indicates that an invalid parameter value has been passed.
+  class InvalidParamValueError < StandardError; end
+  ##
+  # Indicates that an insufficient parameters have been passed.
+  class InsufficientParamsError < StandardError; end
+end

data/silva.gemspec

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/silva/version', __FILE__)
+lib = File.expand_path('../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+require 'silva/version'
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Robert Dallas Gray"]
@@ -9,8 +11,7 @@ Gem::Specification.new do |gem|
   gem.homepage        = "http://github.com/rdallasgray/silva"
   gem.license         = "FreeBSD"
   gem.required_ruby_version      = ">= 1.9"
-  gem.add_development_dependency "test/unit"
-
+  gem.add_development_dependency "test-unit"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/{test_bad_data.rb → silva/test_bad_data.rb}

@@ -1,3 +1,5 @@
+require_relative '../test_helper'
+
 class TestBadData < Test::Unit::TestCase
   def setup
     @data = Silva::Test::DATA_BAD
@@ -16,4 +18,3 @@ class TestBadData < Test::Unit::TestCase
     end
   end
 end
-

data/test/{test_en.rb → silva/test_en.rb}

@@ -1,3 +1,5 @@
+require_relative '../test_helper'
+
 class TestEn < Test::Unit::TestCase
 
   def test_en_to_wgs84

data/test/{test_gridref.rb → silva/test_gridref.rb}

@@ -1,3 +1,5 @@
+require_relative '../test_helper'
+
 class TestGridref < Test::Unit::TestCase
   def test_gridref_no_digits
     Silva::Test::DATA.each do |data|
@@ -5,7 +7,7 @@ class TestGridref < Test::Unit::TestCase
       assert_equal(data[:gridref], l.to_s)
     end
   end
-  
+
   def test_gridref_to_en
     Silva::Test::DATA.each do |data|
       options = { :gridref => data[:gridref], :digits => 8 }

data/test/{test_location.rb → silva/test_location.rb}

@@ -1,6 +1,8 @@
+require_relative '../test_helper'
+
 class TestLocation < Test::Unit::TestCase
   def test_invalid_system_raises_error
-    assert_raise Silva::InvalidSystemError do 
+    assert_raise Silva::InvalidSystemError do
       l = Silva::Location.from(:invalid, nil)
     end
   end

data/test/{test_osgb36.rb → silva/test_osgb36.rb}

@@ -1,3 +1,5 @@
+require_relative '../test_helper'
+
 class TestOsgb36 < Test::Unit::TestCase
   def test_osgb36_to_en
     Silva::Test::DATA.each do |data|

data/test/{test_wgs84.rb → silva/test_wgs84.rb}

@@ -1,3 +1,5 @@
+require_relative '../test_helper'
+
 class TestWgs84 < Test::Unit::TestCase
   def test_wgs84_to_en
     Silva::Test::DATA.each do |data|
@@ -22,4 +24,3 @@ class TestWgs84 < Test::Unit::TestCase
     end
   end
 end
-

data/test/test_helper.rb

@@ -1,9 +1,3 @@
-require 'test/unit'
-require_relative '../lib/silva'
-require_relative 'test_data'
-require_relative 'test_location'
-require_relative 'test_wgs84'
-require_relative 'test_en'
-require_relative 'test_osgb36'
-require_relative 'test_gridref'
-require_relative 'test_bad_data'
+require 'test-unit'
+require 'silva'
+require_relative 'silva/test_data'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silva
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test/unit
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -41,7 +41,6 @@ files:
 - README.md
 - Rakefile
 - lib/silva.rb
-- lib/silva/exception.rb
 - lib/silva/location.rb
 - lib/silva/system/base.rb
 - lib/silva/system/co_ordinate.rb
@@ -53,14 +52,14 @@ files:
 - lib/silva/transform.rb
 - lib/silva/version.rb
 - silva.gemspec
-- test/test_bad_data.rb
-- test/test_data.rb
-- test/test_en.rb
-- test/test_gridref.rb
+- test/silva/test_bad_data.rb
+- test/silva/test_data.rb
+- test/silva/test_en.rb
+- test/silva/test_gridref.rb
+- test/silva/test_location.rb
+- test/silva/test_osgb36.rb
+- test/silva/test_wgs84.rb
 - test/test_helper.rb
-- test/test_location.rb
-- test/test_osgb36.rb
-- test/test_wgs84.rb
 homepage: http://github.com/rdallasgray/silva
 licenses:
 - FreeBSD
@@ -88,12 +87,12 @@ specification_version: 3
 summary: Convert between the GPS (WGS84) location standard and UK Ordnance Survey
   standards.
 test_files:
-- test/test_bad_data.rb
-- test/test_data.rb
-- test/test_en.rb
-- test/test_gridref.rb
+- test/silva/test_bad_data.rb
+- test/silva/test_data.rb
+- test/silva/test_en.rb
+- test/silva/test_gridref.rb
+- test/silva/test_location.rb
+- test/silva/test_osgb36.rb
+- test/silva/test_wgs84.rb
 - test/test_helper.rb
-- test/test_location.rb
-- test/test_osgb36.rb
-- test/test_wgs84.rb
 has_rdoc: 

data/lib/silva/exception.rb

@@ -1,17 +0,0 @@
-module Silva
-  ##
-  # Indicates that an invalid system name has been passed.
-  class InvalidSystemError < StandardError; end
-  ##
-  # Indicates that an invalid transform has been attempted.
-  class InvalidTransformError < StandardError; end
-  ##
-  # Indicates that an invalid parameter has been passed.
-  class InvalidParamError < StandardError; end
-  ##
-  # Indicates that an invalid parameter value has been passed.
-  class InvalidParamValueError < StandardError; end
-  ##
-  # Indicates that an insufficient parameters have been passed.
-  class InsufficientParamsError < StandardError; end
-end