grid_square 0.0.5 → 0.0.6

data/lib/grid_square.rb

@@ -2,76 +2,74 @@ require 'location'
 require 'radix_enumerator'
 require 'string_ext'
 
-module GridSquare
-  class GridSquare
-    attr_reader :grid_reference, :origin
-  
-    # location can be a string containing a GS reference or a pair
-    # containing longitude and latitude.
-    def initialize(grid_reference)
-      @grid_reference = grid_reference
-      decode
-    end
-  
-    def self.encode(longitude, latitude, precision=4 )
-      longitude += 180
-      latitude += 90
-      radixes = RadixEnumerator.new
-      grid_reference = ''
-      size = Location.new(360.0, 180.0)
-      precision.times do
-        zero,radix = *radixes.next
-  
-        lng = (radix * longitude / size.longitude).floor
-        lat = (radix * latitude / size.latitude).floor
-  
-        grid_reference += "%s%s" % [(zero + lng).chr, (zero + lat).chr]
-        size /= radix
-        longitude -= lng * size.longitude
-        latitude -= lat * size.latitude
-      end
-  
-      new grid_reference.downcase_last
-    end
-  
-    # Maidenhead locator names
-    def field; precision 1; end
-    def square; precision 2; end
-    def subsquare; precision 3; end
-    def extended_subsquare; precision 4; end
-  
-    # Return code to a given number of 2-digit fields
-    def precision(num_fields)
-      raise IndexError.new "GridSquare.square: insufficient precision to index #{num_fields} fields" unless grid_reference.length >= num_fields * 2
-      grid_reference[0...num_fields*2].downcase_last
-    end
-  
-    def decode
-      radixes = RadixEnumerator.new
-      @origin, @size = Location.new(-180.0, -90.0), Location.new(360.0, 180.0)
-  
-      @grid_reference.upcase.chars.each_slice(2) do |lng, lat|
-        zero, radix = *radixes.next
-        @size /= radix
-        @origin += Location.new(@size.longitude * (lng.ord - zero), @size.latitude * (lat.ord - zero))
-      end
+class GridSquare
+  attr_reader :grid_reference, :origin
+
+  # location can be a string containing a GS reference or a pair
+  # containing longitude and latitude.
+  def initialize(grid_reference)
+    @grid_reference = grid_reference
+    decode
+  end
+
+  def self.encode(longitude, latitude, precision=4 )
+    longitude += 180
+    latitude += 90
+    radixes = RadixEnumerator.new
+    grid_reference = ''
+    size = Location.new(360.0, 180.0)
+    precision.times do
+      zero,radix = *radixes.next
+
+      lng = (radix * longitude / size.longitude).floor
+      lat = (radix * latitude / size.latitude).floor
+
+      grid_reference += "%s%s" % [(zero + lng).chr, (zero + lat).chr]
+      size /= radix
+      longitude -= lng * size.longitude
+      latitude -= lat * size.latitude
     end
-  
-    def width; @size.longitude; end
-    def height; @size.latitude; end
-  
-    def left; @origin.longitude; end
-    def bottom; @origin.latitude; end
-    def top; (@origin + @size).latitude; end
-    def right; (@origin + @size).longitude; end
-  
-    alias :west :left
-    alias :south :bottom
-    alias :east :right
-    alias :north :top
-  
-    def center
-      @origin + @size/2
+
+    new grid_reference.downcase_last
+  end
+
+  # Maidenhead locator names
+  def field; precision 1; end
+  def square; precision 2; end
+  def subsquare; precision 3; end
+  def extended_subsquare; precision 4; end
+
+  # Return code to a given number of 2-digit fields
+  def precision(num_fields)
+    raise IndexError.new "GridSquare.square: insufficient precision to index #{num_fields} fields" unless grid_reference.length >= num_fields * 2
+    grid_reference[0...num_fields*2].downcase_last
+  end
+
+  def decode
+    radixes = RadixEnumerator.new
+    @origin, @size = Location.new(-180.0, -90.0), Location.new(360.0, 180.0)
+
+    @grid_reference.upcase.chars.each_slice(2) do |lng, lat|
+      zero, radix = *radixes.next
+      @size /= radix
+      @origin += Location.new(@size.longitude * (lng.ord - zero), @size.latitude * (lat.ord - zero))
     end
   end
+
+  def width; @size.longitude; end
+  def height; @size.latitude; end
+
+  def left; @origin.longitude; end
+  def bottom; @origin.latitude; end
+  def top; (@origin + @size).latitude; end
+  def right; (@origin + @size).longitude; end
+
+  alias :west :left
+  alias :south :bottom
+  alias :east :right
+  alias :north :top
+
+  def center
+    @origin + @size/2
+  end
 end

data/lib/grid_square/version.rb

@@ -1,3 +1,3 @@
 module GridSquare
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/location.rb

@@ -1,4 +1,4 @@
-module GridSquare
+class GridSquare
   class Location
     attr_accessor :longitude, :latitude
     def initialize(longitude, latitude)

data/lib/radix_enumerator.rb

@@ -1,4 +1,4 @@
-module GridSquare
+class GridSquare
   class RadixEnumerator
     def next
       if @enum.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_square
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: