geohex 2.0.0 → 2.0.1

data/lib/geohex.rb

@@ -7,7 +7,7 @@ require 'rubygems'
 require 'ostruct'
 
 module GeoHex
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   H_KEY = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
   H_BASE = 20037508.34;
@@ -43,7 +43,7 @@ module GeoHex
     def hexCoords
       h_lat = self.lat;
       h_lon = self.lon;
-      h_xy = GeoHex.loc2xy(h_lon, h_lat);
+      h_xy = GeoHex::Zone.loc2xy(h_lon, h_lat);
       h_x = h_xy.x
       h_y = h_xy.y
       h_deg = Math.tan(Math::PI * (60 / 180));
@@ -201,17 +201,19 @@ module GeoHex
     end
   end
     
-  def loc2xy(_lon,_lat) 
-    x=_lon*H_BASE/180;
-    y= Math.log(Math.tan((90+_lat)*Math::PI/360)) / (Math::PI / 180 );
-    y= y * H_BASE / 180;
-    return OpenStruct.new("x"=>x, "y"=>y);
-  end
-  
-  def xy2loc(_x,_y) 
-    lon=(_x/H_BASE)*180;
-    lat=(_y/H_BASE)*180;
+  class << Zone
+    def loc2xy(_lon,_lat) 
+      x=_lon*H_BASE/180;
+      y= Math.log(Math.tan((90+_lat)*Math::PI/360)) / (Math::PI / 180 );
+      y= y * H_BASE / 180;
+      return OpenStruct.new("x"=>x, "y"=>y);
+    end
+    
+    def xy2loc(_x,_y) 
+      lon=(_x/H_BASE)*180;
+      lat=(_y/H_BASE)*180;
     lat=180.0/Math::PI*(2.0*Math.atan(Math.exp(lat*Math::PI/180))-Math::PI/2);
-    return OpenStruct.new("lon" => lon,"lat" => lat);
+      return OpenStruct.new("lon" => lon,"lat" => lat);
+    end
   end
 end

data/spec/geohex_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../lib/geohex.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/geohex.rb"
 require "pp"
 include GeoHex
 
@@ -6,13 +6,13 @@ describe GeoHex do
   before(:all) do
     @test_ll2hex = []
     @test_hex2ll = []
-    File.open("#{File.dirname(__FILE__)}/testdata_ll2hex.txt").read.each_line do |l|
+    File.open("#{File.expand_path(File.dirname(__FILE__))}/testdata_ll2hex.txt").read.each_line do |l|
       if l.slice(0,1) != "#"
         d = l.strip.split(',')
         @test_ll2hex << [d[0].to_f, d[1].to_f, d[2].to_i, d[3]]
       end
     end
-    File.open("#{File.dirname(__FILE__)}/testdata_hex2ll.txt").read.each_line do |l|
+    File.open("#{File.expand_path(File.dirname(__FILE__))}/testdata_hex2ll.txt").read.each_line do |l|
       if l.slice(0,1) != "#"
         d = l.strip.split(',')
         @test_hex2ll << [d[0],d[1].to_f, d[2].to_f,d[3].to_i]

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: geohex
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors: 
 - hal_sk
@@ -15,41 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +09:00
+date: 2011-02-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
+        version: 2.9.0
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id002
 description: |-
   This GeoHex Ruby gem can convert latitude/longitude to GeoHex code each others.
     * Encode from latitude/longitude to GeoHex code to an arbitrary level of precision
@@ -71,6 +45,7 @@ files:
 - Rakefile
 - lib/geohex.rb
 - spec/geohex_spec.rb
+- .gemtest
 has_rdoc: true
 homepage: http://geohex.rubyforge.org/
 licenses: []
@@ -86,23 +61,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: geohex
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: This GeoHex Ruby gem can convert latitude/longitude to GeoHex code each others