silva 0.0.8 → 0.0.9

data/lib/silva/system/base.rb

@@ -9,7 +9,8 @@ module Silva
     # @return [Silva::System] A valid location system.
     # @raises Silva::InvalidSystemError If the given system can't be created.
     def self.create(system_name, options)
-      return Silva::System.const_get(system_name.to_s.capitalize).new(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

data/lib/silva/system/gridref.rb

@@ -37,14 +37,13 @@ module Silva
         unless @gridref
           e100k = (easting / 100000).floor
           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
-          
-          @gridref = prefix + e.to_s.rjust(@digits / 2) + n.to_s.rjust(@digits / 2)
+
+          @gridref = prefix + e.to_s.rjust(@digits / 2, '0') + n.to_s.rjust(@digits / 2, '0')
         end
 
         @gridref
@@ -67,16 +66,21 @@ module Silva
 
       def to_en(options = nil)
         e100k, n100k = prefix_to_en
-        gridref.delete!(' ')
-        en = gridref[2..-1]
+        en = get_suffix
         e = en[0, (en.length / 2)].ljust(5, '5').to_i + e100k
         n = en[(en.length / 2)..-1].ljust(5, '5').to_i + n100k
 
         System.create(:en, :easting => e, :northing => n )
       end
 
-      def get_prefix
-        gridref[0..1]
+      def get_prefix(g = nil)
+        g ||= gridref
+        g[0..1]
+      end
+
+      def get_suffix(g = nil)
+        g ||= gridref
+        g[2..-1]
       end
 
       def prefix_to_en
@@ -91,8 +95,12 @@ module Silva
         [6, 8, 10].include?(digits)
       end
 
-      def validate_gridref(gridref)
-        gridref.match /[HJNOST][A-Z][0-9]{3,5}[0-9]{3,5}/
+      def validate_gridref(g)
+        OSGB_PREFIXES.include?(get_prefix(g)) && valid_suffix?(get_suffix(g))
+      end
+
+      def valid_suffix?(suffix)
+        suffix.length > 1 && suffix.length % 2 == 0 && suffix =~ /[0-9]+/
       end
 
       def params_satisfied?(options)

data/lib/silva/version.rb

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

data/test/test_data.rb

@@ -9,11 +9,18 @@ module Silva
             },
             {
               # greenwich
-              :wgs84 => { :lat => 51.478017, :long => -0.001619, :alt => 0},
+              :wgs84 => { :lat => 51.478017, :long => -0.001619 },
               :osgb36 => { :lat => 51.477501, :long => 0, :alt => 0 },
               :en => { :easting => 538874, :northing => 177344 },
               :gridref => "TQ38877734"
             }]
+
+    DATA_BAD = {
+      :wgs84 => { :lat => 30, :long => 10 },
+      :en => { :easting => 50, :northing => 220000 },
+      :gridref => {:gridref => "TC00502200" }
+    }
+
     LAT_DELTA = 5e-5
     LONG_DELTA = 2.5e-5
     EN_DELTA = 10

data/test/test_en.rb

@@ -1,4 +1,5 @@
 class TestEn < Test::Unit::TestCase
+
   def test_en_to_wgs84
     Silva::Test::DATA.each do |data|
       l = Silva::Location.from(:en, data[:en]).to(:wgs84)

data/test/test_helper.rb

@@ -6,3 +6,4 @@ require_relative 'test_wgs84'
 require_relative 'test_en'
 require_relative 'test_osgb36'
 require_relative 'test_gridref'
+require_relative 'test_bad_data'

data/test/test_location.rb

@@ -26,8 +26,9 @@ class TestLocation < Test::Unit::TestCase
   def test_co_ordinates_set_correctly
     Silva::Test::DATA.each do |data|
       l = Silva::Location.from(:wgs84, data[:wgs84]).to(:wgs84)
-      assert(l.lat == data[:wgs84][:lat] && l.long == data[:wgs84][:long] && l.alt == data[:wgs84][:alt], \
-             "Failed assigning co-ords to System::Wgs84")
+      hash_data = { :lat => l.lat, :long => l.long }
+      hash_data[:alt] = l.alt if data[:wgs84][:alt]
+      assert_equal(data[:wgs84], hash_data)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silva
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test/unit