geohex-v3 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecce8cac7df6b2460124ba67294887a8f5bcfbb0
-  data.tar.gz: 689f25c1b7d486c162b6b439490fb8cc037963fc
+  metadata.gz: 69d42df0ee03c5697e44ab0755ee8e992bc008d1
+  data.tar.gz: bf82d530fe1d72e4cd30c0afa97917b0b4bcf77b
 SHA512:
-  metadata.gz: 3720c443a22c91089030fb5dd147c742646539f1bebd1b2da8eeecb11d337c4ae6985f5922a990340197759f83c5087f16d5113764e95ee591ee5e34e763e750
-  data.tar.gz: 513d49cd34873ee6e8da0fc5ace4ae1efa302479bb6a10d7b1e54739095dc9df4957a06dc789c50b3de8f01ce7cd975c4c1107fe1f8db04453ccda1ce908d7da
+  metadata.gz: e81269a49d87a3b87715fbc9b89e15118080c6edd93767b1cbe2ad0e38678692eba21c2cc02adee6e6bf400b5db29b144cbfe5ed4ca0701e9bc6ec92d83ee426
+  data.tar.gz: 534e3e5073b9fe8457f2273b846f9b980d99ade76199cab2811c58b70f5e08f49b2b594c83484a676b8ebda428c0bd9f95375ea63dcb43c8378b6586cfa936a5

data/lib/geohex.rb

@@ -2,5 +2,15 @@ require "geohex/version"
 require "geohex/v3"
 
 module Geohex
-  # Your code goes here...
+  def encode(latitude, longitude, level)
+    Geohex::V3::Zone.encode(latitude, longitude, level)
+  end
+  
+  def decode(code)
+    Geohex::V3::Zone.decode(code)
+  end
+  
+  def getZoneByXY(x, y, level)
+    Geohex::V3::Zone.getZoneByXY(x, y, level)
+  end
 end

data/lib/geohex/v3/zone.rb

@@ -28,10 +28,15 @@ module Geohex
 
           instance
         end
+
+        def getZoneByXY x, y, level
+          instance = self.new
+          instance.getZoneByXY x, y, level
+        end
       end
 
       def calcHexSize level
-        H_BASE / (3.0 ** (level + 1))
+        H_BASE / (3.0 ** (level + 3))
       end
 
       def loc2xy lon, lat
@@ -57,7 +62,7 @@ module Geohex
 
         @level = level
         level += 2
-        h_size = calcHexSize(level)
+        h_size = calcHexSize(@level)
 
         z_xy = loc2xy(longitude, latitude)
         lon_grid = z_xy.x
@@ -92,7 +97,7 @@ module Geohex
         z_loc_x = z_loc.lon
         z_loc_y = z_loc.lat
         if ((H_BASE - h_lon) < h_size)
-          z_loc_x = 180
+          z_loc_x = 180.0
           h_xy = h_x
           h_x = h_y
           h_y = h_xy
@@ -160,6 +165,7 @@ module Geohex
         h_x = 0
         h_y = 0
         h_dec9 = ((H_KEY.index(code.slice(0, 1)) * 30) + H_KEY.index(code.slice(1, 1))).to_s + code.slice(2, code.length)
+
         if h_dec9.slice(0, 1).match(/[15]/) and h_dec9.slice(1, 1).match(/[^125]/) and h_dec9.slice(2, 1).match(/[^125]/)
           if h_dec9.slice(0, 1) == "5"
             h_dec9 = "7" + h_dec9.slice(1, h_dec9.length)
@@ -210,22 +216,137 @@ module Geohex
           end
         end
 
-        h_lat_y = (H_K * h_x * unit_x + h_y * unit_y) / 2
-        h_lon_x = (h_lat_y - h_y * unit_y) / H_K
+        h_x, h_y, rev = adjust_xy h_x, h_y, @level
 
-        h_loc = xy2loc(h_lon_x, h_lat_y)
+        @latitude, @longitude, @x, @y, @code = getZoneByXY h_x, h_y, @level
 
-        h_loc.lon -= 360 if (h_loc.lon > 180)
-        h_loc.lon += 360 if (h_loc.lon < -180)
+        [@latitude, @longitude, @x, @y, @code]
+      end
 
-        @code = code
-        @x = h_x
-        @y = h_y
-        @latitude = h_loc.lat
-        @longitude = h_loc.lon
+      def getZoneByXY x, y, level
+        h_size = calcHexSize(level)
 
-        [@latitude, @longitude, @x, @y, @code]
+        h_x = x
+        h_y = y
+
+        unit_x = 6 * h_size
+        unit_y = 6 * h_size * H_K
+
+        h_lat = (H_K * h_x * unit_x + h_y * unit_y) / 2
+        h_lon = (h_lat - h_y * unit_y) / H_K
+
+        z_loc = xy2loc(h_lon, h_lat)
+        z_loc_x = z_loc.lon
+        z_loc_y = z_loc.lat
+
+        max_hsteps = 3 ** ( level + 2)
+        hsteps = (h_x - h_y).abs
+
+        if hsteps == max_hsteps
+          if h_x > h_y
+            tmp = h_x
+            h_x = h_y
+            h_y = tmp
+          end
+          z_loc_x = -180.0
+        end
+
+        h_code = ""
+        code3_x = []
+        code3_y = []
+        code3 = ""
+        code9 = ""
+        mod_x = h_x
+        mod_y = h_y
+
+        (level + 3).times do |i|
+          h_pow = 3 ** (level + 2 - i)
+          if mod_x >= (h_pow / 2.0).ceil
+            code3_x[i] = 2
+            mod_x -= h_pow
+          elsif mod_x <= -(h_pow / 2.0).ceil
+            code3_x[i] = 0
+            mod_x += h_pow
+          else
+            code3_x[i] = 1
+          end
+
+          if (mod_y >= (h_pow / 2.0).ceil)
+            code3_y[i] = 2
+            mod_y -= h_pow
+          elsif (mod_y <= -(h_pow / 2.0).ceil)
+            code3_y[i] = 0
+            mod_y += h_pow
+          else
+            code3_y[i] = 1
+          end
+
+          if i == 2 && (z_loc_x == -180 || z_loc_x >= 0)
+            if code3_x[0] == 2 && code3_y[0] == 1 && code3_x[1] == code3_y[1] && code3_x[2] == code3_y[2]
+              code3_x[0] = 1
+              code3_y[0] = 2
+            elsif
+              code3_x[0] == 1 && code3_y[0] == 0 && code3_x[1] == code3_y[1] && code3_x[2] == code3_y[2]
+              code3_x[0] = 0
+              code3_y[0] = 1
+            end
+          end
+        end
+
+        code3_x.length.times do |i|
+          code3 = "#{ code3_x[i] }#{ code3_y[i] }"
+          code9 = code3.to_i(3).to_s
+          h_code += code9.to_s
+        end
+
+        h_2 = h_code.slice(3, h_code.size).to_s
+        h_1 = h_code.slice(0, 3).to_i
+        h_a1 = (h_1 / 30).floor.to_i
+        h_a2 = h_1 % 30
+
+        code = "#{ H_KEY.slice(h_a1) }#{ H_KEY.slice(h_a2)}#{h_2}"
+
+        [ z_loc_y, z_loc_x, h_x, h_y, code ]
       end
+
+      def adjust_xy x, y, level
+        rev = 0
+        max_hsteps = (3 ** (level + 2))
+        hsteps = (x - y).abs
+
+        if hsteps == max_hsteps && x > y
+          tmp = x
+          x = y
+          y = tmp
+          rev = 1
+        elsif hsteps > max_hsteps
+          dif = hsteps - max_hsteps;
+          dif_x = (dif / 2).floor
+          dif_y = dif - dif_x
+
+          if x > y
+            edge_x = x - dif_x
+            edge_y = y + dif_y
+            h_xy = edge_x
+            edge_x = edge_y
+            edge_y = h_xy
+            x = edge_x + dif_x
+            y = edge_y - dif_y
+          elsif y > x
+            edge_x = x + dif_x
+            edge_y = y - dif_y
+            var h_xy = edge_x
+            edge_x = edge_y
+            edge_y = h_xy
+            x = edge_x - dif_x
+            y = edge_y + dif_y
+          end
+        end
+
+        [ x, y, rev ]
+      end
+      private :adjust_xy
+
     end
   end
 end

data/lib/geohex/version.rb

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

data/spec/fixtures/files/code2location.csv

@@ -1,15 +1,15 @@
 32.70505659484853,140,0,XM
 0,0,0,OY
--11.469624951364336,179.99999999999997,0,GI
-11.469624951364349,180,0,QU
--22.492949287972568,-160.00000000000003,0,GH
--77.56429515669194,179.99999999999997,0,EU
+-11.469624951364336,-180,0,GI
+11.469624951364336,-180,0,QU
+-22.492949287972582,-160,0,GH
+-77.56429515669195,-180,0,EU
 -85.44459258668755,120,0,CI
 -85.44459258668755,-80,0,BV
--49.88876303236152,-100.00000000000006,0,Fb
+-49.88876303236152,-99.99999999999999,0,Fb
 67.44237810333283,-80,0,SV
-84.42893127178179,179.99999999999994,0,TO
-81.67153816651363,179.99999999999997,0,TK
+84.42893127178179,-180,0,TO
+81.67153816651363,-180,0,TK
 83.1877023714706,-40.000000000000036,0,bD
 74.81716117480471,119.99999999999997,0,ZA
 77.56429515669195,19.99999999999999,0,aX
@@ -17,17 +17,17 @@
 -49.88876303236152,60,0,OK
 -78.36652525170464,-13.333333333333325,1,CZ3
 -84.79037346855579,120,1,CI8
--85.12842640497867,180,1,DO0
--74.81716117480471,-173.33333333333331,1,EX2
--78.36652525170464,173.33333333333337,1,LK1
+-85.12842640497867,-180,1,DO0
+-74.81716117480471,-173.33333333333337,1,EX2
+-78.36652525170464,173.33333333333337,1,EU1
 -49.88876303236154,60,1,OK4
--15.214003464478495,-173.33333333333331,1,GI3
--15.214003464478495,173.33333333333337,1,Mc1
-3.846110061441703,180,1,QU0
-15.214003464478509,-173.33333333333331,1,QU7
--15.214003464478495,-160,1,GH8
+-15.214003464478482,-173.33333333333334,1,GI3
+-15.214003464478495,173.33333333333337,1,GI1
+3.846110061441703,-180,1,QU0
+15.214003464478509,-173.33333333333337,1,QU7
+-15.214003464478509,-160,1,GH8
 -7.674947601297844,0,1,OY0
--52.30522167274754,-93.33333333333326,1,Fb3
+-52.305221672747535,-93.33333333333333,1,Fb3
 32.70505659484853,140,1,XM4
 35.884127591325736,40,1,PZ0
 71.48066686818822,-86.66666666666666,1,SW6
@@ -35,24 +35,24 @@
 75.79318460548843,20.000000000000018,1,aX0
 79.11767176735405,20.000000000000018,1,aX8
 81.67153816651366,-33.33333333333335,1,aZ2
-84.42893127178182,180,1,TO4
+84.42893127178182,-180,1,TO4
 83.1877023714706,173.33333333333337,1,aB6
-81.09508214542126,173.33333333333337,1,aA1
+81.09508214542126,173.33333333333337,1,TK1
 81.09508214542126,-173.33333333333334,1,TK3
 74.81716117480471,120.00000000000001,1,ZA4
 3.8461100614416903,-60,1,PA0
 -84.79037346855579,-80.00000000000003,1,BV8
 -85.12842640497867,131.1111111111111,2,CI76
 -85.01824615280158,111.11111111111113,2,CI55
--85.01824615280158,-177.7777777777778,2,DO07
--85.01824615280158,177.77777777777774,2,KE05
--79.11767176735403,-175.55555555555554,2,EU06
--78.62242518007724,175.55555555555554,2,LK13
--26.00162686336427,-157.7777777777778,2,GH32
+-85.01824615280158,-177.77777777777774,2,DO07
+-85.01824615280158,177.77777777777774,2,DO05
+-79.11767176735404,-175.55555555555554,2,EU06
+-78.62242518007724,175.55555555555554,2,EU13
+-26.001626863364294,-157.77777777777777,2,GH32
 -48.20715710294776,51.1111111111111,2,OK51
--10.209543472783297,-177.77777777777777,2,GI47
--8.944451331547656,175.55555555555554,2,Mc53
-6.401642087003743,180,2,QU08
+-10.20954347278331,-177.77777777777774,2,GI47
+-8.944451331547656,175.55555555555554,2,GI53
+6.40164208700373,-180,2,QU08
 6.401642087003718,-166.66666666666666,2,OC58
 20.10241692335465,173.33333333333334,2,XL60
 35.884127591325765,137.77777777777777,2,XM56
@@ -64,19 +64,19 @@
 -12.72410877326099,0,2,OU88
 2.5651438499496004,-4.444444444444445,2,OY53
 3.846110061441703,-60,2,PA04
--51.51375829311735,-104.44444444444443,2,Fb17
--52.30522167274754,-93.33333333333337,2,Fb34
--44.672411393419424,-95.5555555555556,2,Fb86
--16.44831186596187,-166.66666666666666,2,GH58
-81.48362471150257,-164.44444444444446,2,TK63
-83.77015010087217,-177.7777777777778,2,TO07
-84.42893127178182,175.55555555555554,2,aE42
-80.47907085748827,175.55555555555554,2,aA02
+-51.51375829311735,-104.44444444444444,2,Fb17
+-52.305221672747535,-93.33333333333333,2,Fb34
+-44.67241139341943,-95.55555555555556,2,Fb86
+-16.448311865961884,-166.66666666666666,2,GH58
+81.48362471150257,-164.44444444444443,2,TK63
+83.77015010087217,-177.77777777777774,2,TO07
+84.42893127178182,175.55555555555554,2,TO42
+80.47907085748827,175.55555555555554,2,TK02
 82.55108111056764,-35.555555555555536,2,bD31
 84.67256857383902,-51.11111111111112,2,bE73
 85.0182461528016,88.88888888888887,2,bb33
-85.12842640497868,179.99999999999994,2,TO84
-84.55210762141155,-177.7777777777778,2,TO47
+85.12842640497868,-180,2,TO84
+84.55210762141155,-177.77777777777774,2,TO47
 83.03381226166323,171.11111111111111,2,aB61
 73.41342238844585,120.00000000000003,2,ZA08
 78.62242518007724,11.111111111111107,2,aX55
@@ -87,23 +87,23 @@
 -24.842889690285062,0,2,OU40
 -85.12842640497867,-82.22222222222224,2,BV56
 -85.055246359875,128.14814814814815,3,CI771
--85.09197243860311,179.25925925925932,3,KE045
--85.01824615280158,179.25925925925924,3,KE056
+-85.09197243860311,179.25925925925932,3,DO045
+-85.01824615280158,179.25925925925924,3,DO056
 -84.9809697867981,-177.03703703703704,3,DO077
 -84.9434152165899,-71.11111111111111,3,BV778
 -85.055246359875,-82.22222222222224,3,BV568
 -78.53774837153644,-11.851851851851855,3,CZ335
--76.60898893146053,175.55555555555554,3,LK570
--75.58174046495694,-175.55555555555554,3,EU868
+-76.60898893146053,175.55555555555554,3,EU570
+-75.58174046495692,-175.55555555555554,3,EU868
 -49.33454485016383,64.44444444444446,3,OK468
 -0.4276628949350651,0.7407407407407408,3,OY443
 -10.209543472783297,0,3,OY004
--47.344970082046466,-109.62962962962962,3,Fb526
+-47.34497008204646,-109.62962962962963,3,Fb526
 -15.626274156012219,-166.66666666666666,3,GH588
--12.306605159163768,180,3,GI440
+-12.306605159163768,-180,3,GI440
 -11.469624951364336,-172.59259259259258,3,GI622
 6.826461637179052,-173.33333333333334,3,QU340
-3.8461100614416903,177.037037037037,3,XK026
+3.8461100614416903,177.037037037037,3,QU026
 33.77808654808929,137.77777777777777,3,XM454
 22.492949287972593,128.88888888888889,3,PS624
 44.36748324231291,142.22222222222223,3,XX038
@@ -121,27 +121,27 @@
 83.62936132439059,-33.33333333333335,3,bD744
 83.53374630039932,-49.629629629629626,3,bD515
 85.05524635987501,89.62962962962966,3,bb337
-84.98096978679811,180,3,TO808
-84.51135351620655,175.55555555555554,3,aE428
+84.98096978679811,-180,3,TO808
+84.51135351620655,175.55555555555554,3,TO428
 84.55210762141155,-177.7777777777778,3,TO474
-83.72356825638371,-177.03703703703698,3,TO073
+83.72356825638371,-177.03703703703704,3,TO073
 83.28841126938276,173.33333333333334,3,aB648
 70.50590211456444,97.77777777777777,3,YG168
 -85.06751874496823,-76.54320987654322,4,BV7511
 -85.03061013890785,-75.80246913580245,4,BV7541
--85.055246359875,178.02469135802468,4,KE0532
+-85.055246359875,178.02469135802468,4,DO0532
 -84.88020043270879,-177.53086419753086,4,DO3203
--77.6255431823326,-170.61728395061726,4,EU6235
--78.3377438281995,171.60493827160496,4,LK1425
+-77.6255431823326,-170.6172839506173,4,EU6235
+-78.3377438281995,171.60493827160496,4,EU1425
 -47.92134973633546,64.69135802469134,4,OK7172
 -78.92765772010968,-16.790123456790113,4,CZ0737
 -55.251983655277314,-104.44444444444443,4,Fb0200
--45.07649961065172,-95.55555555555554,4,Fb8608
--23.149924898842006,-160.24691358024694,4,GH4405
--11.190070126580682,170.12345679012347,4,Mc2651
+-45.07649961065172,-95.55555555555556,4,Fb8608
+-23.149924898842006,-160.2469135802469,4,GH4405
+-11.190070126580682,170.12345679012347,4,GI2651
 -1.4254091619935396,-177.28395061728392,4,OC2121
-17.946266278655543,-172.8395061728395,4,QU7871
-11.050191029226413,174.32098765432102,4,XK4212
+17.946266278655553,-172.83950617283952,4,QU7871
+11.050191029226413,174.32098765432102,4,QU4212
 -50.70830056151141,63.20987654320988,4,OK4362
 -10.34981081126957,5.185185185185185,4,OX2538
 3.7038637783779045,-0.4938271604938276,4,OY5663
@@ -149,9 +149,9 @@
 35.420785913410434,44.938271604938265,4,PZ0631
 70.60082366755294,-82.96296296296296,4,SV8518
 81.09508214542126,-177.28395061728395,4,TK3246
-81.5047101156331,171.60493827160494,4,aA1825
+81.5047101156331,171.60493827160494,4,TK1825
 83.35472580926526,174.32098765432096,4,aB6727
-85.05524635987501,-171.60493827160496,4,TR1202
+85.05524635987501,-171.60493827160494,4,TR1202
 82.92930196274219,-40.74074074074073,4,bD4054
 77.74714967960598,20.493827160493833,4,aX4486
 76.03603270206148,117.53086419753089,4,ZA5685
@@ -162,18 +162,18 @@
 22.62459744062219,129.62962962962962,4,PS6270
 -85.07976074632226,-79.42386831275724,5,BV80302
 -85.04704785300429,-78.93004115226337,5,BV80373
--84.93083484773156,-179.50617283950618,5,DO08354
--84.9601406144117,178.27160493827157,5,KE05758
--78.72508109998212,-176.1316872427984,5,EU31135
--77.47186327705677,177.6131687242798,5,LK45042
+-84.93083484773156,-179.50617283950612,5,DO08354
+-84.9601406144117,178.27160493827157,5,DO05758
+-78.72508109998212,-176.13168724279834,5,EU31135
+-77.47186327705677,177.6131687242798,5,EU45042
 -78.21221081913176,-15.47325102880659,5,CZ35087
 -54.569097632502626,64.36213991769546,5,OK06445
--46.33739563508728,-100.164609053498,5,Fb80457
--17.674819831740678,-160.65843621399182,5,GH80422
--7.156617561633078,-172.75720164609058,5,GI74753
--6.496077810333859,178.51851851851848,5,Mc80240
-2.612613889744312,176.70781893004116,5,XK01265
-18.487906116222756,-174.81481481481487,5,QU86344
+-46.33739563508728,-100.16460905349794,5,Fb80457
+-17.674819831740678,-160.65843621399173,5,GH80422
+-7.156617561633091,-172.75720164609046,5,GI74753
+-6.496077810333859,178.51851851851848,5,GI80240
+2.612613889744312,176.70781893004116,5,QU01265
+18.487906116222756,-174.8148148148148,5,QU86344
 4.556967978746024,9.87654320987654,5,OY77334
 -2.422723288518337,-9.1358024691358,5,OY15454
 3.466736260749132,-60.493827160493815,5,PA04170
@@ -188,29 +188,29 @@
 76.99947013952956,19.012345679012363,5,aX40264
 74.96578743743133,118.84773662551439,5,ZA44552
 83.27729497862227,-38.68312757201646,5,bD47117
-82.02192059895748,172.26337448559673,5,aA51615
-82.02192059895748,-174.40329218107001,5,TK71615
-84.32651565973768,-173.58024691358025,5,TO38458
-85.04294351619683,173.33333333333337,5,aE58484
+82.02192059895748,172.26337448559673,5,TK51615
+82.02192059895748,-174.40329218106993,5,TK71615
+84.32651565973765,-173.58024691358025,5,TO38458
+85.04294351619683,173.33333333333337,5,TO58484
 -85.03609541431689,-88.4224965706447,6,BV553581
 -85.02099635433396,118.46364883401921,6,CI802417
 -85.11090833582553,124.11522633744853,6,CI750110
--85.14051760404581,177.8875171467764,6,KE018862
--85.04978219412602,178.24417009602195,6,KE053505
--85.01824615280158,-177.119341563786,6,DO074664
+-85.14051760404581,177.8875171467764,6,DO018862
+-85.04978219412602,178.24417009602195,6,DO053505
+-85.0182461528016,-177.1193415637861,6,DO074664
 -78.13429857495768,-16.51577503429356,6,CZ351822
--77.84425402866793,176.13168724279836,6,LK412420
--77.15180611673658,-173.6076817558299,6,EU708101
+-77.84425402866793,176.13168724279836,6,EU412420
+-77.15180611673658,-173.60768175582993,6,EU708101
 -44.58222868649629,60.82304526748971,6,OK847038
--21.626844357539948,-166.99588477366254,6,GH501658
--3.8461100614416903,179.01234567901233,6,Mc842644
--4.9200310051179015,-176.48834019204386,6,GI836575
-6.669163764467299,-174.32098765432096,6,QU316588
-9.476049692387006,174.78737997256516,6,XK175485
--48.449371535419765,-96.68038408779142,6,Fb711277
+-21.626844357539934,-166.99588477366254,6,GH501658
+-3.8461100614416903,179.01234567901233,6,GI842644
+-4.9200310051179015,-176.48834019204392,6,GI836575
+6.669163764467287,-174.32098765432102,6,QU316588
+9.476049692387006,174.78737997256516,6,QU175485
+-48.449371535419765,-96.68038408779151,6,Fb711277
 4.556967978746024,2.469135802469136,6,OY728344
 2.470198516809545,-60.466392318244175,6,PA016372
-10.131590386552373,180,6,QU408880
+10.131590386552373,-180,6,QU408880
 32.55832421354656,138.87517146776406,6,XM442337
 21.935726236625015,127.62688614540467,6,PS387785
 43.83287620143813,143.07270233196158,6,XX037037
@@ -221,31 +221,31 @@
 82.4038568826114,-40.082304526749,6,bD080050
 78.90329568451087,18.271604938271615,6,aX817100
 75.49471609617443,123.04526748971193,6,ZA712478
-81.06807090685717,179.39643347050756,6,aA166315
+81.06807090685717,179.39643347050756,6,TK166315
 82.83509514206584,-177.09190672153633,6,TK873482
-84.2508548924535,-177.09190672153625,6,TO433402
-85.00585148249067,175.00685871056243,6,aE586342
+84.2508548924535,-177.09190672153633,6,TO433402
+85.00585148249067,175.00685871056243,6,TO586342
 85.03883578676745,88.42249657064474,6,bb335332
 -85.04750368112704,-79.67078189300406,7,BV8032788
 -85.05114879997076,128.01097393689983,7,CI7714524
--85.05251502947527,177.21993598536804,7,KE0514686
--85.05069330650984,177.3662551440329,7,KE0517300
--85.05205966144965,-177.3571101966164,7,DO0732687
+-85.05251502947527,177.21993598536804,7,DO0514686
+-85.05069330650984,177.3662551440329,7,DO0517300
+-85.05205966144965,-177.35711019661636,7,DO0732687
 -85.05023777122953,-177.39368998628257,7,DO0732768
--78.20681658015287,-179.46959304983994,7,EU4031833
--76.32483001774261,-179.817101051669,7,EU8072131
--75.6434006236876,174.55875628715137,7,LK8255485
+-78.20681658015287,-179.46959304983992,7,EU4031833
+-76.32483001774261,-179.81710105166894,7,EU8072131
+-75.6434006236876,174.55875628715137,7,EU8255485
 -78.06134107808937,-13.360768175582997,7,CZ3800810
 -52.26646412714779,56.424325560128025,7,OK1624776
 -47.31992145629309,68.02926383173298,7,OK7464515
--48.45987650641166,-104.59076360310928,7,Fb5316746
--51.834628009147735,-99.14037494284412,7,Fb4033527
+-48.45987650641166,-104.59076360310927,7,Fb5316746
+-51.834628009147735,-99.14037494284406,7,Fb4033527
 -21.454956946828297,-162.24965706447188,7,GH4540858
--12.383971425939675,-178.76543209876544,7,GI4351804
--4.0989331724795255,-177.53086419753086,7,GI8387484
-4.330617601639888,-177.1833561957019,7,QU0706771
+-12.383971425939663,-178.76543209876544,7,GI4351804
+-4.098933172479513,-177.53086419753086,7,GI8387484
+4.330617601639888,-177.18335619570186,7,QU0706771
 14.714128073890608,-179.99085505258344,7,QU4884047
-19.172525248647407,174.42158207590305,7,XK8251271
+19.172525248647407,174.42158207590305,7,QU8251271
 5.267123667292918,-60.82304526748971,7,PA0565644
 6.16022759188225,0.576131687242797,7,OY8320288
 -2.106180802162651,4.215820759030636,7,OY3556486
@@ -257,7 +257,7 @@
 38.20164704742394,145.67901234567904,7,XM7851800
 43.86333785879606,142.12162780064014,7,XX0345653
 30.851511008998052,156.14083219021487,7,XM6306347
-21.454956946828297,178.85688157293094,7,XK8827707
+21.454956946828297,178.85688157293094,7,QU8827707
 42.03559230187854,35.15317786922726,7,PZ4253332
 30.92400736452902,-116.4883401920439,7,OI8776718
 41.135210942868746,-95.40009144947416,7,PF2148656
@@ -268,30 +268,30 @@
 78.67023811301752,17.80521262002741,7,aX8100870
 83.19521359504485,-41.48148148148148,7,bD4424804
 84.18168672552544,-48.98948331047094,7,bE6100113
-81.87401287786506,171.91586648376767,7,aA5027217
-81.87326653740467,-172.62002743484226,7,TK7070414
-84.40581802575272,-171.21170553269323,7,TO6240542
-84.95967676595735,-170.50754458161867,7,TO7775738
-85.00768966906308,171.78783721993594,7,aE5821675
+81.87401287786506,171.91586648376767,7,TK5027217
+81.87326653740467,-172.62002743484223,7,TK7070414
+84.40581802575272,-171.21170553269317,7,TO6240542
+84.95967676595735,-170.50754458161862,7,TO7775738
+85.00768966906308,171.78783721993594,7,TO5821675
 85.05114879997076,89.41929583904891,7,bb3371862
 -85.05099697346348,-86.48376771833561,8,BV54870250
 -84.89431593312257,-74.9672306050907,8,BV78253862
 -84.95936750999883,116.01585124218866,8,CI57758513
 -85.05114879997076,125.85886297820451,8,CI75600226
--85.04735174306921,179.38424020728547,8,KE05603615
--85.04461606279176,-178.93918609967994,8,DO07152160
--78.0252444701795,178.41792409693645,8,LK41063674
+-85.04735174306921,179.38424020728547,8,DO05603615
+-85.04461606279176,-178.93918609967997,8,DO07152160
+-78.0252444701795,178.41792409693645,8,EU41063674
 -76.78353577417859,-179.38119189147997,8,EU72201265
 -78.27818254539632,-12.30300259106843,8,CZ34762511
--50.73615525197652,-94.92150586800796,8,Fb38241503
+-50.73615525197652,-94.92150586800793,8,Fb38241503
 -48.05798249478465,58.97881420515164,8,OK48511367
--16.05801314654258,-177.97286998933092,8,GI32042116
--8.506078730486957,-175.86648376771834,8,GI71565064
--21.289426163285523,-162.42341106538638,8,GH45442518
+-16.05801314654258,-177.9728699893309,8,GI32042116
+-8.50607873048697,-175.86648376771834,8,GI71565064
+-21.289426163285537,-162.42341106538635,8,GH45442518
 -5.014711132428624,6.947111720774272,8,OY33228746
 2.8112649508743917,-59.06416704770615,8,PA03278283
-11.177984463616795,175.0769699740893,8,XK42174351
-12.28425065422217,-179.20438957475994,8,QU47122108
+11.177984463616795,175.0769699740893,8,QU42174351
+12.28425065422217,-179.20438957475992,8,QU47122108
 29.229032433819672,140.97546105776559,8,XM32230826
 35.235560418824775,138.43316567596403,8,XM56301016
 21.453318946417433,129.7271757354062,8,PS61272751
@@ -307,29 +307,29 @@
 77.61799779414096,24.60905349794241,8,aX46486040
 74.95939479445362,129.37661941777165,8,ZA62754057
 83.44032235192313,-52.03170248437738,8,bD28367162
-80.76072843510799,177.89056546258192,8,aA05722747
-82.50462047799635,-178.85383325712542,8,TK83151057
-83.83815019303304,-176.04023776863286,8,TO31130720
-84.61506920309282,172.0073159579332,8,aE51331450
+80.76072843510799,177.89056546258192,8,TK05722747
+82.50462047799635,-178.85383325712547,8,TK83151057
+83.83815019303304,-176.04023776863284,8,TO31130720
+84.61506920309282,172.0073159579332,8,TO51331450
 85.04932657519551,88.85840573083371,8,bb33488116
 -85.02069085118825,-80.5080526342529,9,BV804240512
 -85.25892235752575,126.56200782401055,9,CI708565326
 -84.99009715358707,124.453589391861,9,CI754848748
--84.96312883886038,176.7921556673271,9,KE055580431
--85.05064269354392,178.51140578163896,9,KE053480025
+-84.96312883886038,176.7921556673271,9,DO055580431
+-85.05064269354392,178.51140578163896,9,DO053480025
 -85.05064269354392,-177.23111314332166,9,DO073506567
 -78.34947806021368,-12.656607224508448,9,CZ347013544
--77.91557130594418,178.59371030838793,9,LK413474586
--78.0620691964047,-175.7811309251639,9,EU354580674
+-77.91557130594418,178.59371030838793,9,EU413474586
+-78.0620691964047,-175.78113092516384,9,EU354580674
 -48.92264328551308,61.87471422039323,9,OK474555348
--47.9901039539973,-99.84351978865016,9,Fb484868583
+-47.990103953997306,-99.8435197886501,9,Fb484868583
 -25.800037734013387,-165.93710308387952,9,GH147081657
--9.797044998389046,-170.64675100340395,9,GI730641802
--6.316518377294901,176.6976578773561,9,Mc576514101
+-9.797044998389058,-170.64675100340395,9,GI730641802
+-6.316518377294901,176.6976578773561,9,GI576514101
 -8.406852481197332,-0.7031448458060258,9,OY041035522
 2.810093065032651,-4.005486968449931,9,OY537117080
 9.100307229345306,-61.66133211400701,9,PA402570238
-6.315352201442765,177.89056546258192,9,XK058877078
+6.315352201442765,177.89056546258192,9,QU058877078
 17.97695943266528,-179.43504547071078,9,QU832828267
 40.979941869938415,45.35182644922014,9,PZ382714446
 36.5981065089872,36.21094345374179,9,PZ028668414
@@ -338,17 +338,17 @@
 34.88453418992268,138.3772798861962,9,XM482452815
 43.324172591538805,142.59614896103236,9,XX033123366
 28.611823502104176,-115.09932428999643,9,OI860616105
-46.315519731164905,-108.77102067774223,9,RX114077466
+46.315519731164876,-108.77102067774221,9,RX114077466
 66.51330668794105,-76.28918355941674,9,SV355072242
 70.84427362032683,98.29903978052126,9,YG413103084
 75.49677307800924,121.5028196921201,9,ZA486483578
 77.54216784091535,16.87547629934462,9,aX426174078
 78.49020322752219,27.28344256464972,9,aX747576237
-81.51821910339622,173.32012396484274,9,aA184816376
-83.82976960028402,-175.91932124168062,9,TO310523631
-84.40576083787137,176.34608545445306,9,aE423806423
+81.51821910339622,173.32012396484274,9,TK184816376
+83.829769600284,-175.91932124168065,9,TO310523631
+84.40576083787137,176.34608545445306,9,TO423806423
 84.89703001315176,87.40029467052783,9,bb303856635
-85.0496809490896,176.89071787837224,9,aE815178640
+85.0496809490896,176.89071787837224,9,TO815178640
 65.94654074919876,-84.37501058442986,10,SV1700305142
 -85.05111506114845,-87.02264221239982,10,BV5482764471
 -85.05017028096445,-74.02597842469812,10,BV7560068257
@@ -356,26 +356,26 @@
 -85.1114082947234,123.39853342139577,10,CI7265571616
 -85.08135383503867,124.10167826720179,10,CI7505181555
 -85.05111506114845,116.71865738623856,10,CI5736546251
--85.11142495914162,176.48427577096982,10,KE0273028158
--85.05113193058828,178.94528273129094,10,KE0536546500
+-85.11142495914162,176.48427577096982,10,DO0273028158
+-85.05113193058828,178.94528273129094,10,DO0536546500
 -85.05113193058828,-177.89056546258197,10,DO0716764500
--78.20657677972486,179.64842757709698,10,LK4016113514
--76.95200706545712,178.87855848532573,10,LK4827777232
--76.67125372443621,-173.73875933546714,10,EU7445272188
+-78.20657677972486,179.64842757709698,10,EU4016113514
+-76.95200706545712,178.87855848532573,10,EU4827777232
+-76.67125372443621,-173.73875933546717,10,EU7445272188
 -51.1793357370083,56.6014665786042,10,OK1777354303
 -78.4202281335297,-14.765703060170377,10,CZ3420476772
--50.95852020163508,-97.03127910718223,10,Fb4334484641
--15.961399068408907,-166.99215905434468,10,GH5856584625
--14.569012270261892,176.24176531355312,10,Mc1730824803
--8.059072046057983,-177.18742061677594,10,GI7234521114
-10.487900363316657,-174.37484123355176,10,QU3851424320
-17.97881945245889,176.48427577096982,10,XK8152020110
+-50.95852020163508,-97.03127910718219,10,Fb4334484641
+-15.961399068408907,-166.9921590543447,10,GH5856584625
+-14.569012270261892,176.24176531355312,10,GI1730824803
+-8.059072046057983,-177.18742061677588,10,GI7234521114
+10.487900363316632,-174.3748412335518,10,QU3851424320
+17.97881945245889,176.48427577096982,10,QU8152020110
 3.8640599125684467,-61.17190807634337,10,PA0426257051
 0,-4.218869074836153,10,OY4244664644
 2.848178749868688,8.194888990499416,10,OY7353226324
 -3.864255017562445,6.679876035157243,10,OY3444432334
-17.308706606781136,178.94528273129094,10,XK8136543688
-20.749483042625016,-179.58339683991264,10,QU8831183154
+17.308706606781136,178.94528273129094,10,QU8136543688
+20.749483042625016,-179.58339683991258,10,QU8831183154
 21.77982496043273,129.37492590899083,10,PS6206841033
 27.326562730623966,139.10785957425188,10,XM0565771230
 34.69969443229734,141.56886653457298,10,XM4863207510
@@ -390,27 +390,27 @@
 76.63925321468737,17.402496231942973,10,aX1617612856
 78.48040532816346,21.158698707852803,10,aX7255422107
 75.40885284001867,127.61706379447577,10,ZA7323011017
-80.13997185555716,178.4829548341208,10,aA0130411728
+80.13997185555716,178.4829548341208,10,TK0130411728
 82.4189123646549,-179.4076106284611,10,TK8071386820
-84.38379583319873,-179.40794933021726,10,TO4434206021
+84.38379583319873,-179.40794933021724,10,TO4434206021
 85.05113193058828,89.06467510034044,10,bb3372146218
 -85.02070782407576,-85.42972785313896,11,BV57264048634
 -85.02070782407576,114.25776332650283,11,CI57246068382
--85.02070782407576,177.89056546258192,11,KE05443747884
--85.08135942391766,-178.94528273129094,11,DO04773823048
--85.08135942391766,-178.94528273129094,11,DO04773823048
+-85.02070782407576,177.89056546258192,11,DO05443747884
+-85.08135942391766,-178.94528273129097,11,DO04773823048
+-85.08135942391766,-178.94528273129097,11,DO04773823048
 -85.05113193058828,-179.29685515419396,11,DO07200264504
 -78.20655013493614,-13.007840945655294,11,CZ34837816828
--77.69287316941559,174.0233817112342,11,LK18781747622
+-77.69287316941559,174.0233817112342,11,EU18781747622
 -77.28205417737901,-177.18990442965446,11,EU47467037811
--53.33088399648072,-102.6562120724596,11,Fb05827021141
+-53.33088399648074,-102.65621207245964,11,Fb05827021141
 -47.75412569895254,62.57808486737005,11,OK72311284586
--20.30343065964378,-168.04687632305365,11,GH51383310718
--10.351477994498591,-177.8930492754605,11,GI47416263465
--3.3751218876783606,-177.8930492754605,11,GI87045185255
-4.002573029443388,-177.8930492754605,11,QU07002763476
-20.055949967827992,179.91216334456695,11,XK85663663436
-18.562938073608677,178.41792409693645,11,XK84201138888
+-20.30343065964378,-168.04687632305374,11,GH51383310718
+-10.351477994498591,-177.89304927546053,11,GI47416263465
+-3.375121887678373,-177.89304927546053,11,GI87045185255
+4.002573029443376,-177.89304927546053,11,QU07002763476
+20.055949967827992,179.91216334456695,11,QU85663663436
+18.562938073608677,178.41792409693645,11,QU84201138888
 22.106011968040356,128.23248488543416,11,PS62147032100
 26.947715856243768,146.15974303826766,11,XM30178015132
 29.884656543260686,153.10312903972408,11,XM60054311737
@@ -419,30 +419,30 @@
 43.3251683966725,141.67973490942552,11,XX03131786872
 38.822566699114795,38.67183751347751,11,PZ16386410216
 28.11665750014962,-113.82072516045996,11,OI78178446320
-46.412184656537676,-106.08635765776444,11,RX13217487787
+46.412184656537676,-106.08635765776445,11,RX13217487787
 66.23147555689933,-80.15625441017913,11,SV40163034106
 77.15715356553575,18.281201488029684,11,aX41314430862
 75.14076576175513,120.93752646107471,11,ZA47238521110
-81.06017353309196,170.9449214494177,11,aA11857485652
-81.48680964730961,-179.91453425686012,11,TK43222807032
-83.54984670370604,-178.24213788548494,11,TO03574622544
-84.73838771967266,172.35358205332295,11,aE54114446763
+81.06017353309196,170.9449214494177,11,TK11857485652
+81.48680964730961,-179.91453425686015,11,TK43222807032
+83.54984670370604,-178.242137885485,11,TO03574622544
+84.73838771967266,172.35358205332295,11,TO54114446763
 85.05041774078212,88.15977690844329,11,bb33540877533
 -85.0506539409143,-79.82665996789856,12,BV803254745602
 -85.05112818182883,120.70679529806696,12,CI803456424553
--85.05207465365511,178.8683974326407,12,KE053652024200
--85.05113005620892,178.93433137450816,12,KE053654462750
--85.05113005620892,-178.25316450932462,12,DO071704644727
+-85.05207465365511,178.8683974326407,12,DO053652024200
+-85.05113005620892,178.93433137450816,12,DO053654462750
+-85.05113005620892,-178.25316450932468,12,DO071704644727
 -79.4452281268277,-13.70233007991481,12,CY281612610161
--77.91566682955617,172.96873970958208,12,LK181655132036
--76.18499280856993,-179.29689278772244,12,EU832016181016
--57.36436071706729,-102.999204050873,12,FY636801583240
+-77.91566682955617,172.96873970958208,12,EU181655132036
+-76.18499280856993,-179.29689278772247,12,EU832016181016
+-57.364360717067285,-102.999204050873,12,FY636801583240
 -49.8379914216003,61.87501528862095,12,OK446658243285
--27.745624883854536,-162.06171522332676,12,GH058068815001
--13.30821393540185,177.54768638475392,12,Mc410587505268
+-27.745624883854536,-162.06171522332681,12,GH058068815001
+-13.30821393540185,177.54768638475392,12,GI410587505268
 -2.881445728338333,-178.2335950745238,12,GI871735246286
-10.418820497790831,-175.42109095835661,12,QU460311054340
-13.855307445928876,176.14139669314187,12,XK533828300764
+10.418820497790831,-175.42109095835664,12,QU460311054340
+13.855307445928876,176.14139669314187,12,QU533828300764
 -5.615990333705467,4.921863386528326,12,OY313181386161
 4.845926929147412,0.3601528673926176,12,OY803527038734
 3.513407610346112,-59.765618384731326,12,PA043284261600
@@ -452,35 +452,35 @@
 29.47417206661665,153.99297382023593,12,XL822458403751
 42.50140031192322,143.09452977847025,12,XP251226173262
 26.368400819214855,-113.89764809263869,12,OI745463230145
-43.52956234887475,-107.92106743740132,12,RU681285781273
+43.52956234887473,-107.92106743740135,12,RU681285781273
 66.37275241126041,-76.99217787110894,12,SV352321156833
 74.49641524173614,116.71873265329549,12,ZA412658306821
 77.15715839512343,18.632811544461198,12,aX413323833627
 82.11838119136951,-43.59373853353431,12,bD023073480358
-82.26169903937593,175.07813661347168,12,aA570232153327
-82.29949945404425,-179.99141955551048,12,TK800808780528
-84.11778702185453,-177.5304502287178,12,TO328348003525
-84.76413166644133,178.95390080930906,12,aE563763855337
+82.26169903937593,175.07813661347168,12,TK570232153327
+82.29949945404425,-179.9914195555104,12,TK800808780528
+84.11778702185453,-177.53045022871783,12,TO328348003525
+84.76413166644133,178.95390080930906,12,TO563763855337
 85.05089012980277,88.98101576656671,12,bb337212207184
 -85.02070782407576,-79.45312210888258,13,BV8046354823266
 -84.99010031598158,113.55468120324429,13,CI5803560714155
--85.05397142670375,179.60449670487097,13,KE0482706175341
--85.05302344313857,179.60449670487097,13,KE0482731186381
--85.05207652767761,179.7692813815018,13,KE0485035421662
--85.05207652767761,179.81323734274676,13,KE0485060618642
--85.05018090449299,179.81323734274676,13,KE0485068654767
--85.05207652767761,-179.04967813924776,13,DO0712537663424
--85.05112880662227,-179.0441961886016,13,DO0712564265481
--77.50412004123892,177.36328209528438,13,LK4501241604860
--75.97257900135345,-179.8485752259736,13,EU8407181150325
+-85.05397142670375,179.60449670487097,13,DO0482706175341
+-85.05302344313857,179.60449670487097,13,DO0482731186381
+-85.05207652767761,179.7692813815018,13,DO0485035421662
+-85.05207652767761,179.81323734274676,13,DO0485060618642
+-85.05018090449299,179.81323734274676,13,DO0485068654767
+-85.05207652767761,-179.04967813924787,13,DO0712537663424
+-85.05112880662227,-179.0441961886017,13,DO0712564265481
+-77.50412004123892,177.36328209528438,13,EU4501241604860
+-75.97257900135345,-179.8485752259737,13,EU8407181150325
 -78.90392851824576,-12.304683555339782,13,CZ3061211527483
--49.83798675049283,-97.38281389655668,13,Fb4625116215430
+-49.83798675049283,-97.38281389655673,13,Fb4625116215430
 -47.27922833623412,61.52344286571794,13,OK7250326542858
--22.593728295005608,-166.28906438657657,13,GH4221515066426
--11.523081594188353,178.2421880635229,13,Mc4421818162227
--2.460176832420581,-179.29688024321294,13,GI8724851414563
-9.44905955464004,-179.29688024321294,13,QU4074815410453
-20.63278322541268,179.296880243213,13,XK8810462030471
+-22.593728295005597,-166.28906438657665,13,GH4221515066426
+-11.523081594188353,178.2421880635229,13,GI4421818162227
+-2.460176832420581,-179.296880243213,13,GI8724851414563
+9.449059554640053,-179.296880243213,13,QU4074815410453
+20.63278322541268,179.296880243213,13,QU8810462030471
 3.513422068272812,-60.820310564421405,13,PA0414822216031
 -0.35155967220222734,-3.1640639945607014,13,OY4236836048713
 0.3555792253075448,6.303766551696238,13,OY7001555744550
@@ -490,37 +490,37 @@
 42.81446731196279,142.0068957168654,13,XX0066438378463
 42.55307759789627,38.67187514700597,13,PZ4537105130820
 27.997949854465656,-116.74310663523015,13,OI8337351073052
-46.3193563989732,-108.30560683123804,13,RX1135780670728
+46.3193563989732,-108.3056068312381,13,RX1135780670728
 66.93005958856028,-80.50781428857267,13,SV4163853373183
 76.92061301619422,20.742183359331843,13,aX4034808877353
 75.14077876301411,121.28906125044925,13,ZA4726354081160
 82.5861070130518,-40.429687083483095,13,bD0853382488383
-81.92318725325978,168.74999607984083,13,aA2756770452053
-82.16644549708819,-172.61719237569795,13,TK7434850466772
-83.90548470121078,-179.32122913612866,13,TO0846631354832
-84.60821834245287,179.6240786841813,13,aE4805277813220
+81.92318725325978,168.74999607984083,13,TK2756770452053
+82.16644549708819,-172.61719237569804,13,TK7434850466772
+83.90548470121078,-179.3212291361287,13,TO0846631354832
+84.60821834245287,179.6240786841813,13,TO4805277813220
 85.05109881644849,88.67683650050841,13,bb3356324634667
 -84.99010031598158,-79.45312629038575,14,BV80717180121576
 -85.14128384950676,118.1250014373917,14,CI56436210413512
 -85.08136459879998,118.82812537568195,14,CI56773820550701
 -85.03594145592328,121.11328340200407,14,CI80611150250021
--85.05112880662227,177.5390641252327,14,KE05167224507116
--85.03594145592328,177.71484615518105,14,KE05405867244763
+-85.05112880662227,177.5390641252327,14,DO05167224507116
+-85.03594145592328,177.71484615518105,14,DO05405867244763
 -85.05136559766956,-178.33969235426784,14,DO07170215584802
 -85.05124730768841,-178.33969235426784,14,DO07170226100057
 -85.05101030272562,-178.33969235426784,14,DO07170227640163
--78.34941078146068,178.15429704854873,14,LK16473602511456
--78.09010038610904,-178.18243020182652,14,EU40673078217161
+-78.34941078146068,178.15429704854873,14,EU16473602511456
+-78.09010038610904,-178.18243020182655,14,EU40673078217161
 -78.49055150369068,-15.468751731403659,14,CZ31831222362536
--53.330873904311716,-97.03124983666004,14,Fb31200035818717
+-53.33087390431171,-97.03124983666004,14,Fb31200035818717
 -49.92565546027554,58.594914581298774,14,OK44243402806508
 -8.407170118467867,-2.8124999346640127,14,OY01571576207503
 4.079240169372639,-1.1707079849357165,14,OY56733420402656
--15.961327113736004,-159.60937651906167,14,GH84065825033010
--10.621567107054151,173.9074160840265,14,Mc50342481388451
+-15.961327113736004,-159.60937651906173,14,GH84065825033010
+-10.621567107054151,173.9074160840265,14,GI50342481388451
 -5.751378038946543,-173.43633630073705,14,GI78081171860100
 5.480563953528032,-174.13946023902727,14,QU30541311610415
-12.421722939346756,179.5324159533545,14,XK44828780263624
+12.421722939346756,179.5324159533545,14,QU44828780263624
 5.615985528497132,-58.35937468965406,14,PA07571045254517
 21.162545692441366,127.50116507131868,14,PS38383877824230
 28.184519988899293,145.07928861759297,14,XM31385143063872
@@ -528,35 +528,35 @@
 41.93183305535667,141.56366474463874,14,XP22503400845082
 38.27268968795205,34.45312315425837,14,PZ13526267300787
 28.184519988899318,-112.9675856147092,14,OI78437338044154
-44.49349196120463,-106.63946180709095,14,RU68880348017456
+44.49349196120463,-106.63946180709097,14,RU68880348017456
 65.3100644125332,-84.84258626806907,14,SV13411223332736
 77.28260266195558,24.844915365330607,14,aX38226176387034
 74.01954369731402,123.04687318692636,14,ZA35122807551718
 82.85338216634169,-37.96875120871575,14,bD32858648748733
-81.51827215930582,175.07812406896218,14,aA18678460283758
-81.30832083644431,-177.18750006533594,14,TK35253726505866
-84.11102995385924,-175.5457122971108,14,TO35083224064751
-84.52840268072897,177.42303995698072,14,aE45177603556405
+81.51827215930582,175.07812406896218,14,TK18678460283758
+81.30832083644431,-177.18750006533597,14,TK35253726505866
+84.11102995385924,-175.5457122971109,14,TO35083224064751
+84.52840268072897,177.42303995698072,14,TO45177603556405
 85.0501290364617,88.7193205726401,14,bb33563401287846
 85.0511285983578,88.70249838541709,14,bb33563422636071
 -85.05491832726936,-80.24414124365012,15,BV801644720107680
 -85.05112880662227,-80.24414124365016,15,BV801672224571144
 -85.0435409337982,-76.8164069918357,15,BV752066087034602
 -84.92832089229395,113.2031255063539,15,CI584051202811030
--85.05112880662227,178.70361275600987,15,KE053702425073344
--85.05101030272562,178.62121623619137,15,KE053474671871414
+-85.05112880662227,178.70361275600987,15,DO053702425073344
+-85.05101030272562,178.62121623619137,15,DO053474671871414
 -85.05112873720078,-179.47265669782374,15,DO048672464801367
--85.04923289070342,-179.49462910310865,15,DO048680771383421
+-85.04923289070342,-179.49462910310868,15,DO048680771383421
 -78.63000548385058,-16.87499960798409,15,CZ312460160330640
--76.99993502220802,178.59374933575083,15,LK482446631807432
--77.69287042493717,-179.64843733393772,15,EU443120677000135
+-76.99993502220802,178.59374933575083,15,EU482446631807432
+-77.69287042493717,-179.64843733393766,15,EU443120677000135
 -48.224673018823516,61.171874624318086,15,OK486263022716030
--47.75409810634945,-101.60156310163558,15,Fb563137601173436
--24.52713509115225,-160.31250045735192,15,GH405610617770460
--10.627811533740404,175.5841166159903,15,Mc428447007470857
--8.895519993960713,-174.9236955818307,15,GI714676472576137
-9.655313810029215,-177.73619551649472,15,QU430846555413857
-13.453736454342776,177.18750006533597,15,XK455868523435074
+-47.75409810634945,-101.60156310163555,15,Fb563137601173436
+-24.527135091152235,-160.3125004573519,15,GH405610617770460
+-10.627811533740404,175.5841166159903,15,GI428447007470857
+-8.895519993960725,-174.92369558183077,15,GI714676472576137
+9.655313810029215,-177.73619551649475,15,QU430846555413857
+13.453736454342776,177.18750006533597,15,QU455868523435074
 28.613458944989343,144.49218745372033,15,XM314886135481601
 22.268763871961657,129.02343711615106,15,PS624076167125758
 30.401660908330708,155.41321858173586,15,XL828827023882162
@@ -565,15 +565,15 @@
 0.6485910111569012,-2.438343213179931,15,OY450583438341310
 1.4061087624421291,-59.41406268784096,15,PA007023204648554
 27.01056357503122,-115.28990605347154,15,OI754343508378851
-47.98992137736064,-108.63281224137836,15,RX153284780083552
+47.98992137736064,-108.63281224137839,15,RX153284780083552
 44.33956527784659,32.695312611615634,15,PZ541437131806627
 65.07213005846185,-80.85937416696618,15,SV081012647253500
 73.82482041043065,116.71874937930812,15,ZA162768706170274
 78.27820151012904,16.171874275859466,15,aX538661552510561
 83.40004212473188,-38.67187514700599,15,bD475537206875044
-82.30889241261167,176.13281206714908,15,aA573170435224014
+82.30889241261167,176.13281206714908,15,TK573170435224014
 82.07002829250126,-177.89062539746055,15,TK720137660817775
 83.89926648794052,-177.8680313420388,15,TO078855632751174
-84.50259507567017,-179.97740594457824,15,TO448407012467243
-84.86090063565264,178.96790605723493,15,aE801157747467437
+84.50259507567017,-179.9774059445782,15,TO448407012467243
+84.86090063565264,178.96790605723493,15,TO801157747467437
 85.05112505786047,89.37952974397285,15,bb337184418811744

data/spec/geohex/v3/zone_spec.rb

@@ -33,7 +33,7 @@ describe Geohex::V3::Zone do
 
   describe :decode do
 
-    let(:precision) { 11 }
+    let(:precision) { 10 }
 
     CSV.read(File.expand_path("../../../spec/fixtures/files/code2location.csv", File.dirname(__FILE__))).each do |data|
 

data/spec/support/custum_matchers.rb

@@ -2,13 +2,13 @@ require 'bigdecimal'
 
 RSpec::Matchers.define :be_near_eql do |expected, precision|
   match do |actual|
-    bigdecimal_actual = BigDecimal.new(actual.to_s).round(precision).ceil(precision)
-    bigdecimal_expected = BigDecimal.new(expected.to_s).round(precision).ceil(precision)
+    actual_f = BigDecimal.new(actual.to_s).round(precision).ceil(precision).to_f
+    expected_f = BigDecimal.new(expected.to_s).round(precision).ceil(precision).to_f
 
     if expected == 180.0
-      bigdecimal_actual.abs == bigdecimal_expected.abs
+      actual_f.abs == expected_f.abs
     else
-      bigdecimal_actual == bigdecimal_expected
+      actual_f == expected_f
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geohex-v3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - toshiwo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake