pokeplot 0.2.0beta → 0.2.1beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f267bb552fa0249e0c8c72f00e0477b0f73a369
-  data.tar.gz: 1d629d046753400c80398d81d96a1726d16f3be0
+  metadata.gz: 783b6d871e194ddb79a1ba44f86893574df1a9a8
+  data.tar.gz: 6a9adc4e25c11dbe450d0fddad949f5212855c29
 SHA512:
-  metadata.gz: d099ee6b32fb7466ae3114e029cfd7e295f709a431077bd2a0836549ffdf15fdc69b83739b1fb76ef2df7d5d9e54c76430a6de8aba6b4d0b8ca14d92fbd5b99b
-  data.tar.gz: 07b86dd8ff21294c85e826ba0be85573f44284fe200997aefe3e4d2824d9e61bf453009129a700ca4ac4672a328efb7040259b6d9a9f2e4e712ff4435f0f6280
+  metadata.gz: b9f4120d207703418fe37d903d1a7c9fac46ab8269a5588bea11a47ff1c946bb93855da6d6aafc4e20063bed661310b79bcc5b20455f2ffef65bcd7e27c75f08
+  data.tar.gz: a0feefd98681c52595c4b8d918dca06b9c661bbeb34e7e12d6e987bc6cc864cffa8cead62d9ab739e38175b1f5d57014e9550206c9e66bed28a08003aee538c3

data/README.md

@@ -91,7 +91,7 @@ Pokeplot will be updated frequently, I have lots of spare time.
 If you have any problems using this, I will do whatever I can to help you get up and running. Your options are
 
  * Create an issue [HERE](https://github.com/xssc/pokeplot/issues)
- * Email me @ xssc820@gmail.com
+ * Email me @ xssc@protonmail.com
  * Or PM me on reddit at [/u/xssc](https://www.reddit.com/message/compose?to=xssc)
 
 ## Contributing

data/lib/pokeplot/helpers/cell_ids.rb

@@ -1,11 +1,130 @@
-require 'poke-api/helpers'
+require 'poke-api'
+
+
+module Poke
+  module API
+    module Geometry
+      module S2Base
+	      POS_TO_ORIENTATION = [SWAP_MASK, 0, 0, INVERT_MASK | SWAP_MASK]
+      end
+    end
+  end
+end
+
+module Poke
+  module API
+    module Geometry
+      class S2CellId
+        include S2Base
+        def to_face_ij_orientation
+          i, j = 0, 0
+          face = self.face
+          bits = (face & SWAP_MASK)
+
+          7.downto(0).each do |k|
+            if k == 7
+              nbits = (MAX_LEVEL - 7 * LOOKUP_BITS)
+            else
+              nbits = LOOKUP_BITS
+            end
+
+            bits += (
+              self.id >> (k * 2 * LOOKUP_BITS + 1) &
+              ((1 << (2 * nbits)) - 1)
+            ) << 2
+            bits = LOOKUP_IJ[bits]
+            i += (bits >> (LOOKUP_BITS + 2)) << (k * LOOKUP_BITS)
+            j += ((bits >> 2) & ((1 << LOOKUP_BITS) - 1)) << (k * LOOKUP_BITS)
+            bits &= (SWAP_MASK | INVERT_MASK)
+          end
+
+          fail unless 0 == POS_TO_ORIENTATION[2]
+          fail unless SWAP_MASK == POS_TO_ORIENTATION[0]
+          if (lsb & 0x1111111111111110) != 0
+            bits ^= SWAP_MASK
+          end
+          orientation = bits
+
+          return face, i, j, orientation
+        end
+
+        def face
+          return self.id >> POS_BITS
+        end
+
+        def from_face_ij(face, i, j)
+          n = face << (POS_BITS - 1)
+          bits = face & SWAP_MASK
+
+          7.downto(0).each do |k|
+            mask = (1 << LOOKUP_BITS) - 1
+            bits += (((i >> (k * LOOKUP_BITS)) & mask) << (LOOKUP_BITS + 2))
+            bits += (((j >> (k * LOOKUP_BITS)) & mask) << 2)
+            bits = LOOKUP_POS[bits]
+            n |= (bits >> 2) << (k * 2 * LOOKUP_BITS)
+            bits &= (SWAP_MASK | INVERT_MASK)
+          end
+
+          @id = (n * 2 + 1)
+          self
+        end
+
+        def from_face_ij_wrap(face, i, j)
+          i = [-1, [MAX_SIZE, i].min].max
+          j = [-1, [MAX_SIZE, j].min].max
+
+          scale = 1.0 / MAX_SIZE
+          u = scale * ((i << 1) + 1 - MAX_SIZE)
+          v = scale * ((j << 1) + 1 - MAX_SIZE)
+
+          face, u, v = xyz_to_face_uv(face_uv_to_xyz(face, u, v))
+          return from_face_ij(
+                  face,
+                  st_to_ij(0.5 * (u + 1)),
+                  st_to_ij(0.5 * (v + 1)),
+                )
+        end
+
+        def from_face_ij_same(face, i, j, same_face)
+          if same_face
+            return from_face_ij(face, i, j)
+          else
+            return from_face_ij_wrap(face, i, j)
+          end
+        end
+
+      end
+    end
+  end
+end
+
 module Pokeplot
   module Helpers
     class CellIds
       class << self
 
         def get(lat, long)
-          return ::Poke::API::Helpers.get_cells(lat, long)
+          s2_point = ::Poke::API::Geometry::S2LatLon.new(lat, long).to_point
+          origin  = ::Poke::API::Geometry::S2CellId.from_point(s2_point).parent(15)
+          level = 15
+          max_level = 30
+          max_size = 1 << 30
+          size  = 1 << max_level - level
+          face, i, j = origin.to_face_ij_orientation[0..2]
+
+          walk =  [
+            origin.id,
+            origin.from_face_ij_same(face, i, j - size, j - size >= 0).parent(level).id,
+            origin.from_face_ij_same(face, i, j + size, j + size < max_size).parent(level).id,
+            origin.from_face_ij_same(face, i - size, j, i - size >= 0).parent(level).id,
+            origin.from_face_ij_same(face, i + size, j, i + size < max_size).parent(level).id,
+            origin.from_face_ij_same(face, i - size, j - size, j - size >= 0 && i - size >= 0).parent(level).id,
+            origin.from_face_ij_same(face, i + size, j - size, j - size >= 0 && i + size < max_size).parent(level).id,
+            origin.from_face_ij_same(face, i - size, j + size, j + size < max_size && i - size >= 0).parent(level).id,
+            origin.from_face_ij_same(face, i + size, j + size, j + size < max_size && i + size < max_size).parent(level).id
+          ]
+          
+          return walk.sort
         end
 
       end

data/lib/pokeplot/version.rb

@@ -1,3 +1,3 @@
 module Pokeplot
-  VERSION = "0.2.0beta"
+  VERSION = "0.2.1beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokeplot
 version: !ruby/object:Gem::Version
-  version: 0.2.0beta
+  version: 0.2.1beta
 platform: ruby
 authors:
 - Sawyer Charles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib