h3 3.5.1 → 3.6.0

data/ext/h3/src/src/h3lib/lib/localij.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Uber Technologies, Inc.
+ * Copyright 2018-2019 Uber Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,8 +139,8 @@ int h3ToLocalIjk(H3Index origin, H3Index h3, CoordIJK* out) {
     int baseCell = H3_GET_BASE_CELL(h3);
 
     // Direction from origin base cell to index base cell
-    Direction dir = 0;
-    Direction revDir = 0;
+    Direction dir = CENTER_DIGIT;
+    Direction revDir = CENTER_DIGIT;
     if (originBaseCell != baseCell) {
         dir = _getBaseCellDirection(originBaseCell, baseCell);
         if (dir == INVALID_DIGIT) {
@@ -290,7 +290,7 @@ int localIjkToH3(H3Index origin, const CoordIJK* ijk, H3Index* out) {
 
     // check for res 0/base cell
     if (res == 0) {
-        if (ijk->i > 1 || ijk->i > 1 || ijk->i > 1) {
+        if (ijk->i > 1 || ijk->j > 1 || ijk->k > 1) {
             // out of range input
             return 1;
         }

data/ext/h3/src/src/h3lib/lib/polygon.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Uber Technologies, Inc.
+ * Copyright 2018-2019 Uber Technologies, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
  */
 
 #include "polygon.h"
-#include <assert.h>
 #include <float.h>
 #include <math.h>
 #include <stdbool.h>

data/h3.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "ffi", "~> 1.9"
   spec.add_runtime_dependency "rgeo-geojson", "~> 2.1"
-  spec.add_runtime_dependency "zeitwerk", "~> 2.1.9"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.1"
 
   spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "rake", "~> 12.3"

data/lib/h3/bindings/private.rb

@@ -10,6 +10,7 @@ module H3
       attach_function :compact, [H3IndexesIn, H3IndexesOut, :size], :bool
       attach_function :destroy_linked_polygon, :destroyLinkedPolygon, [LinkedGeoPolygon], :void
       attach_function :geo_to_h3, :geoToH3, [GeoCoord, Resolution], :h3_index
+      attach_function :get_pentagon_indexes, :getPentagonIndexes, [:int, H3IndexesOut], :void
       attach_function :h3_faces, :h3GetFaces, %i[h3_index output_buffer], :void
       attach_function :h3_indexes_from_unidirectional_edge,
                       :getH3IndexesFromUnidirectionalEdge,

data/lib/h3/hierarchy.rb

@@ -39,6 +39,21 @@ module H3
     # @return [Integer] Maximum number of child hexagons possible at given resolution.
     attach_function :max_children, :maxH3ToChildrenSize, [:h3_index, Resolution], :int
 
+    # @!method center_child(h3_index, child_resolution)
+    #
+    # Returns the center child (finer) index contained by the given index
+    # at the given resolution.
+    #
+    # @param [Integer] h3_index A valid H3 index.
+    # @param [Integer] child_resoluton The desired resolution of the center child hexagon.
+    #
+    # @example Find center child hexagon.
+    #    H3.center_child(613196570357137407, 10)
+    #    622203769609814015
+    #
+    # @return [Integer] H3 index of center child hexagon.
+    attach_function :center_child, :h3ToCenterChild, [:h3_index, Resolution], :h3_index
+
     # @deprecated Please use {#max_children} instead.
     def max_h3_to_children_size(h3_index, resolution)
       max_children(h3_index, resolution)

data/lib/h3/miscellaneous.rb

@@ -113,6 +113,18 @@ module H3
     # @return [Integer] The number of resolution 0 hexagons (base cells).
     attach_function :base_cell_count, :res0IndexCount, [], :int
 
+    # @!method pentagon_count
+    #
+    # Number of pentagon H3 indexes per resolution.
+    # This is always 12, but provided as a convenience.
+    #
+    # @example Return the number of pentagons
+    #    H3.pentagon_count
+    #    12
+    #
+    # @return [Integer] The number of pentagons per resolution.
+    attach_function :pentagon_count, :pentagonIndexCount, [], :int
+
     # @deprecated Please use {#base_cell_count} instead.
     def res_0_index_count
       base_cell_count
@@ -132,6 +144,19 @@ module H3
       out.read
     end
 
+    # Returns all pentagon indexes at the given resolution.
+    #
+    # @example Return all pentagons at resolution 4.
+    #   H3.pentagons(4)
+    #   [594615896891195391, 594967740612083711, ..., 598591730937233407]
+    #
+    # @return [Array<Integer>] All pentagon indexes at the given resolution.
+    def pentagons(resolution)
+      out = H3Indexes.of_size(pentagon_count)
+      Bindings::Private.get_pentagon_indexes(resolution, out)
+      out.read
+    end
+
     # @deprecated Please use {#base_cells} instead.
     def res_0_indexes
       base_cells

data/lib/h3/version.rb

@@ -1,3 +1,3 @@
 module H3
-  VERSION = "3.5.1".freeze
+  VERSION = "3.6.0".freeze
 end

data/spec/hierarchy_spec.rb

@@ -172,4 +172,14 @@ RSpec.describe H3 do
       end
     end
   end
+
+  describe ".center_child" do
+    let(:h3_index) { "8828308299fffff".to_i(16) }
+    let(:resolution) { 10 }
+    let(:result) { "8a2830829807fff".to_i(16) }
+
+    subject(:center_child) { H3.center_child(h3_index, resolution) }
+
+    it { is_expected.to eq result }
+  end
 end

data/spec/miscellaneous_spec.rb

@@ -81,4 +81,32 @@ RSpec.describe H3 do
       expect(base_cells.count).to eq(count)
     end
   end
+
+  describe ".pentagon_count" do
+    let(:count) { 12 }
+    subject(:pentagon_count) { H3.pentagon_count }
+
+    it "has 12 pentagons per resolution" do
+      expect(pentagon_count).to eq(count)
+    end
+  end
+
+  describe ".pentagons" do
+    let(:resolution) { 4 }
+    let(:expected) do
+      [
+        594615896891195391, 594967740612083711,
+        595319584332972031, 595812165542215679,
+        596199193635192831, 596515852983992319,
+        596691774844436479, 597008434193235967,
+        597395462286213119, 597888043495456767,
+        598239887216345087, 598591730937233407
+      ]
+    end
+    subject(:pentagons) { H3.pentagons(resolution) }
+
+    it "returns pentagons at the given resolution" do
+      expect(pentagons).to eq(expected)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: h3
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Lachlan Laycock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -225,16 +225,20 @@ files:
 - ext/h3/src/src/apps/testapps/testGeoToH3.c
 - ext/h3/src/src/apps/testapps/testH3Api.c
 - ext/h3/src/src/apps/testapps/testH3Distance.c
+- ext/h3/src/src/apps/testapps/testH3DistanceExhaustive.c
 - ext/h3/src/src/apps/testapps/testH3GetFaces.c
 - ext/h3/src/src/apps/testapps/testH3Index.c
 - ext/h3/src/src/apps/testapps/testH3Line.c
+- ext/h3/src/src/apps/testapps/testH3LineExhaustive.c
 - ext/h3/src/src/apps/testapps/testH3NeighborRotations.c
 - ext/h3/src/src/apps/testapps/testH3SetToLinkedGeo.c
 - ext/h3/src/src/apps/testapps/testH3SetToVertexGraph.c
+- ext/h3/src/src/apps/testapps/testH3ToCenterChild.c
 - ext/h3/src/src/apps/testapps/testH3ToChildren.c
 - ext/h3/src/src/apps/testapps/testH3ToGeo.c
 - ext/h3/src/src/apps/testapps/testH3ToGeoBoundary.c
 - ext/h3/src/src/apps/testapps/testH3ToLocalIj.c
+- ext/h3/src/src/apps/testapps/testH3ToLocalIjExhaustive.c
 - ext/h3/src/src/apps/testapps/testH3ToParent.c
 - ext/h3/src/src/apps/testapps/testH3UniEdge.c
 - ext/h3/src/src/apps/testapps/testHexRanges.c
@@ -242,6 +246,7 @@ files:
 - ext/h3/src/src/apps/testapps/testKRing.c
 - ext/h3/src/src/apps/testapps/testLinkedGeo.c
 - ext/h3/src/src/apps/testapps/testMaxH3ToChildrenSize.c
+- ext/h3/src/src/apps/testapps/testPentagonIndexes.c
 - ext/h3/src/src/apps/testapps/testPolyfill.c
 - ext/h3/src/src/apps/testapps/testPolygon.c
 - ext/h3/src/src/apps/testapps/testVec2d.c