silva 0.0.9 → 0.1.0

data/.gitignore

@@ -1,3 +1,4 @@
+
 *.gem
 *.rbc
 .bundle
@@ -15,4 +16,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.#
+.#
+.emacs.desktop*
+TAGS

data/Rakefile

@@ -1,2 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task :test do
+  ruby "test/test_helper.rb"
+end

data/lib/silva/exception.rb

@@ -1,7 +1,17 @@
 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/lib/silva/transform.rb

@@ -42,6 +42,7 @@ 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
     #
@@ -139,7 +140,6 @@ module Silva
       h = source_system.alt
       
       a1 = ellipsoid_1[:a]
-      b1 = ellipsoid_1[:b]
       
       # convert co-ordinates to 3D Cartesian. See:
       # http://www.ordnancesurvey.co.uk/oswebsite/gps/docs/A_Guide_to_Coordinate_Systems_in_Great_Britain.pdf
@@ -165,7 +165,6 @@ module Silva
       
       # convert 3D Cartesian co-ordinates back to lat, long, alt
       a2 = ellipsoid_2[:a]
-      b2 = ellipsoid_2[:b]
       precision = 4 / a2
       
       e_sq2 = eccentricity_squared(ellipsoid_2)

data/lib/silva/version.rb

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

data/test/test_bad_data.rb

@@ -0,0 +1,19 @@
+class TestBadData < Test::Unit::TestCase
+  def setup
+    @data = Silva::Test::DATA_BAD
+  end
+
+  def test_wgs84_to_en
+    l = Silva::Location.from(:wgs84, @data[:wgs84])
+    assert_raise Silva::InvalidParamValueError do
+      l.to(:en)
+    end
+  end
+
+  def test_gridref_to_en
+    assert_raise Silva::InvalidParamValueError do
+      l = Silva::Location.from(:gridref, @data[:gridref])
+    end
+  end
+end
+

data/test/test_osgb36.rb

@@ -1,2 +1,25 @@
 class TestOsgb36 < Test::Unit::TestCase
+  def test_osgb36_to_en
+    Silva::Test::DATA.each do |data|
+      l = Silva::Location.from(:osgb36, data[:osgb36]).to(:en)
+      assert_in_delta data[:en][:easting], l.easting, Silva::Test::EN_DELTA
+      assert_in_delta data[:en][:northing], l.northing, Silva::Test::EN_DELTA
+    end
+  end
+
+  def test_osgb36_to_wgs84
+    Silva::Test::DATA.each do |data|
+      l = Silva::Location.from(:osgb36, data[:osgb36]).to(:wgs84)
+      assert_in_delta data[:wgs84][:lat], l.lat, Silva::Test::LAT_DELTA
+      assert_in_delta data[:wgs84][:long], l.long, Silva::Test::LONG_DELTA
+    end
+  end
+
+  def test_osgb36_to_gridref
+    Silva::Test::DATA.each do |data|
+      l = Silva::Location.from(:osgb36, data[:osgb36]).to(:gridref, :digits => 8)
+      # Final digit too sensitive in os examples
+      assert_equal data[:gridref][0..-2], l.gridref[0..-2]
+    end
+  end
 end

data/test/test_wgs84.rb

@@ -1,10 +1,4 @@
 class TestWgs84 < Test::Unit::TestCase
-  def setup
-  end
-
-  def teardown
-  end
-
   def test_wgs84_to_en
     Silva::Test::DATA.each do |data|
       l = Silva::Location.from(:wgs84, data[:wgs84]).to(:en)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silva
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test/unit
@@ -53,6 +53,7 @@ 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
@@ -87,6 +88,7 @@ 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