geo3x3 0.0.2 → 0.0.3

data/lib/geo3x3/version.rb

@@ -1,3 +1,3 @@
 module Geo3x3
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/geo3x3.rb

@@ -1,4 +1,4 @@
-require "geo3x3/version"
+require File.expand_path("../geo3x3/version", __FILE__)
 
 class Numeric 
   def east_longitude?
@@ -21,34 +21,35 @@ end
 
 class String 
   def east_longitude?
-    self[0] == "E" 
+    self[0] == "E" or self[0] == "+"
   end
 
   def west_longitude?
-    self[0] == "W" 
+    self[0] == "W" or self[0] == "-"
   end
 end
 
 module Geo3x3
 
   def self.encode(params)
-    lat = params[:lat]
-    lng = params[:lng]
+    lat = params[:lat].to_f
+    lng = params[:lng].to_f
     level = params[:level]
+    raise ArgumentError if level < 1
 
     code = 
       if lng.east_longitude?
         "E"
       else
+        lng += 180
         "W"
-        lng = (180-lng)
       end
 
     lat = 90 - lat
 
-    unit = 180 
-    (level-1).times do |i|
-      unit /= 3.0
+    unit = 180.0 
+    (level-1).times do
+      unit /= 3
       x = (lng/unit).floor
       y = (lat/unit).floor
       code += ((x + y*3) + 1).to_s
@@ -61,24 +62,37 @@ module Geo3x3
   end
 
   def self.decode(code)
-    unit = 180
-    lat = 0
-    lng = 0
+    code =
+      case code
+      when Integer
+        code.west_longitude? ? "W#{code}" : "E#{code}"
+      when String
+        raise ArgumentError if code.empty?
+        code
+      else
+        raise ArgumentError
+      end
+
+    unit = 180.0
+    lat = 0.0
+    lng = 0.0
     level = 1
 
     code[1..-1].each_char do |c|
       break if c == "0"
       n = c.to_i
 
-      unit /= 3.0
+      unit /= 3
       n -= 1
       lng += (n % 3) * unit
-      lat += (n / 3).floor * unit
+      lat += (n / 3) * unit
       level += 1
     end
 
-    lng -= 180 if code.west_longitude?
+    lat += unit / 2
+    lng += unit / 2
     lat = 90 - lat
+    lng -= 180 if code.west_longitude?
 
     {
       lat:   lat,

data/test/test_geo3x3.rb

@@ -0,0 +1,49 @@
+require "minitest/unit"
+require "minitest/autorun"
+require File.expand_path("../../lib/geo3x3", __FILE__)
+
+class TestGeo3x3 < MiniTest::Unit::TestCase
+
+  def test_decode
+    assert_equal({
+      lat: 40.0,
+      lng: -86.2962962962963,
+      level: 6,
+      unit:  0.7407407407407408}, Geo3x3.decode("W28644"))
+    assert_equal({
+      lat: 11.111111111111114,
+      lng: 105.55555555555556,
+      level: 5.0,
+      unit: 2.2222222222222223}, Geo3x3.decode("E5379"))
+    assert_equal({
+      lat: 40.0,
+      lng: -86.2962962962963,
+      level: 6,
+      unit: 0.7407407407407408}, Geo3x3.decode("-28644"))
+  end
+
+  def test_encode
+    accepts = [
+      %w(W
+         W2
+         W28
+         W286
+         W2864
+         W28644
+         W286445
+         W2864455
+         W28644555)
+    ]
+
+    [
+      [40.0, -86.2962962962963]
+    ].each_with_index do |params, i|
+      assert_raises(ArgumentError) do
+        Geo3x3.encode(lat: params[0], lng: params[1], level: 0)
+      end
+      (1..9).each do |l|
+        assert_equal accepts[i][l - 1], Geo3x3.encode(lat: params[0], lng: params[1], level: l)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo3x3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,6 +44,7 @@ files:
 - lib/geo3x3/version.rb
 - spec/geo3x3_spec.rb
 - spec/spec_helper.rb
+- test/test_geo3x3.rb
 homepage: https://github.com/kitak/geo3x3
 licenses: []
 post_install_message: 
@@ -71,3 +72,5 @@ summary: geo zone encoding
 test_files:
 - spec/geo3x3_spec.rb
 - spec/spec_helper.rb
+- test/test_geo3x3.rb
+has_rdoc: