os_map_ref 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d54845568c88b7000830b89f9cf22dc0dd869f
-  data.tar.gz: 3724276fae454400abc143894458372ae74f012a
+  metadata.gz: 33f03aae748ea34533802aec1d29da649b90e627
+  data.tar.gz: 4cb4d085108ec682ee4100d3619dace122676f98
 SHA512:
-  metadata.gz: a89ed1be4cc0d2651a61ba9a1cba8bbc5ccf2b83bdf2fec3f2071f29b9ea44c2a0cd172a673a0c05da8645d2370146a0ff9e53d9dfc94ac78124405bf83828e6
-  data.tar.gz: 2b2fe98324f2e80b6550d5459c63120bebb0a3ed46ac334f10ff0fc9b11689c9a35673c028bafb78679dc159ac4bc833a87598b377c361cdd6650d1056d9720f
+  metadata.gz: 9d5d63cb4e0ad3eb0bc35e0a599eb1d1098152016c00209f714dba475593b1e127adc3323d177d6f8f43c1521e0e415a85316b2a891b57f1c39709b3ca793e5c
+  data.tar.gz: 86a8f5b31c0551689685de669d490344d5c2fef6cd23ba0a07ae27fa6c8c2f9508352a8c57ca3e0244d14bf9ac0e1e1972291f39dcea40f2b7f4b039cc4902e5

data/lib/os_map_ref/location.rb

@@ -62,11 +62,11 @@ module OsMapRef
     end
 
     def northing_from_map_reference
-      northing_easting_from_map_reference[0].to_s + map_reference_parts[2]
+      prefix_coordinates[0].to_s + map_reference_parts[2]
     end
 
     def easting_from_map_reference
-      northing_easting_from_map_reference[1].to_s + map_reference_parts[1]
+      prefix_coordinates[1].to_s + map_reference_parts[1]
     end
 
     # The parts should be a pair of letters then two sets of numbers
@@ -74,11 +74,24 @@ module OsMapRef
     def map_reference_parts
       @map_reference_parts ||= map_reference.split
     end
+    
+    def prefix
+      map_reference_parts[0]
+    end
 
-    # Returns array of [grid_northing, grid_easting] for the gird element
-    # matching the map reference start. So 'ST 58901 71053' will return [1, 3]
-    def northing_easting_from_map_reference
-      @northing_easting_from_map_reference ||= matrix.index map_reference_parts[0]
+    # Returns array of [grid_northing, grid_easting] for the grid element
+    # matching the map reference prefix. So 'ST 58901 71053' will return [1, 3]
+    # which are the coordinates of the prefix 'ST' in the grid.
+    def prefix_coordinates
+      @prefix_coordinates ||= get_prefix_coordinates
+    end
+    
+    def get_prefix_coordinates
+      matrix.index(prefix) || raise_prefix_error(prefix)
+    end
+    
+    def raise_prefix_error(prefix)
+      raise OsMapRef::Error, "Unable to process map reference #{@map_reference}: #{prefix} not found"
     end
 
     def matrix
@@ -94,12 +107,12 @@ module OsMapRef
         %w[HQ HR HS HT HU JQ JR JS JT JU],
         %w[HV HW HX HY HZ JV JW JX JY JZ],
         %w[NA NB NC ND NE OA OB OC OD OE],
-        %w[NF NG NH NJ NK OF OG OH OI OJ],
+        %w[NF NG NH NJ NK OF OG OH OJ OK],
         %w[NL NM NN NO NP OL OM ON OO OP],
         %w[NQ NR NS NT NU OQ OR OS OT OU],
         %w[NV NW NX NY NZ OV OW OX OY OZ],
         %w[SA SB SC SD SE TA TB TC TD TE],
-        %w[SF SG SH SJ SK TF TG TH TI TJ],
+        %w[SF SG SH SJ SK TF TG TH TJ TK],
         %w[SL SM SN SO SP TL TM TN TO TP],
         %w[SQ SR SS ST SU TQ TR TS TT TU],
         %w[SV SW SX SY SZ TV TW TX TY TZ]

data/lib/os_map_ref/version.rb

@@ -1,3 +1,3 @@
 module OsMapRef
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: os_map_ref
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler