Bump to v4.0.0-rc5 (#104)

* Bump to v4.0.0-rc5

* Add PR number

Author: Isaac Brodsky

CHANGELOG.md

@@ -6,6 +6,11 @@ The public API of this library consists of the public functions declared in
 file [H3Core.java](./src/main/java/com/uber/h3core/H3Core.java), and support
 for the Linux x64 and Darwin x64 platforms.
 
+## [4.0.0-rc4] - 2022-08-17
+### Breaking Changes
+- Upgraded the core library to v4.0.0-rc5. (#104)
+- `exactEdgeLength` function renamed to `edgeLength`. (#104)
+
 ## [4.0.0-rc3] - 2022-07-26
 ### Breaking Changes
 - Upgraded the core library to v4.0.0-rc4. (#102)

h3version.properties

@@ -1 +1 @@
-h3.git.reference=v4.0.0-rc4
+h3.git.reference=v4.0.0-rc5

src/main/c/h3-java/src/jniapi.c

@@ -947,14 +947,14 @@ Java_com_uber_h3core_NativeMethods_greatCircleDistanceM(
 
 /*
  * Class:     com_uber_h3core_NativeMethods
- * Method:    exactEdgeLengthRads
+ * Method:    edgeLengthRads
  * Signature: (J)D
  */
 JNIEXPORT jdouble JNICALL
-Java_com_uber_h3core_NativeMethods_exactEdgeLengthRads(JNIEnv *env,
+Java_com_uber_h3core_NativeMethods_edgeLengthRads(JNIEnv *env,
                                                        jobject thiz, jlong h3) {
     jdouble out;
-    H3Error err = exactEdgeLengthRads(h3, &out);
+    H3Error err = edgeLengthRads(h3, &out);
     if (err) {
         ThrowH3Exception(env, err);
     }
@@ -963,13 +963,13 @@ Java_com_uber_h3core_NativeMethods_exactEdgeLengthRads(JNIEnv *env,
 
 /*
  * Class:     com_uber_h3core_NativeMethods
- * Method:    exactEdgeLengthKm
+ * Method:    edgeLengthKm
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_com_uber_h3core_NativeMethods_exactEdgeLengthKm(
+JNIEXPORT jdouble JNICALL Java_com_uber_h3core_NativeMethods_edgeLengthKm(
     JNIEnv *env, jobject thiz, jlong h3) {
     jdouble out;
-    H3Error err = exactEdgeLengthKm(h3, &out);
+    H3Error err = edgeLengthKm(h3, &out);
     if (err) {
         ThrowH3Exception(env, err);
     }
@@ -978,13 +978,13 @@ JNIEXPORT jdouble JNICALL Java_com_uber_h3core_NativeMethods_exactEdgeLengthKm(
 
 /*
  * Class:     com_uber_h3core_NativeMethods
- * Method:    exactEdgeLengthM
+ * Method:    edgeLengthM
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_com_uber_h3core_NativeMethods_exactEdgeLengthM(
+JNIEXPORT jdouble JNICALL Java_com_uber_h3core_NativeMethods_edgeLengthM(
     JNIEnv *env, jobject thiz, jlong h3) {
     jdouble out;
-    H3Error err = exactEdgeLengthM(h3, &out);
+    H3Error err = edgeLengthM(h3, &out);
     if (err) {
         ThrowH3Exception(env, err);
     }

src/main/java/com/uber/h3core/H3Core.java

@@ -863,8 +863,8 @@ public double greatCircleDistance(LatLng a, LatLng b, LengthUnit unit) {
    * @param unit Unit of measure to use.
    * @return Length of the given edge.
    */
-  public double exactEdgeLength(String edgeAddress, LengthUnit unit) {
-    return exactEdgeLength(stringToH3(edgeAddress), unit);
+  public double edgeLength(String edgeAddress, LengthUnit unit) {
+    return edgeLength(stringToH3(edgeAddress), unit);
   }
 
   /**
@@ -874,10 +874,10 @@ public double exactEdgeLength(String edgeAddress, LengthUnit unit) {
    * @param unit Unit of measure to use.
    * @return Length of the given edge.
    */
-  public double exactEdgeLength(long edge, LengthUnit unit) {
-    if (unit == LengthUnit.rads) return h3Api.exactEdgeLengthRads(edge);
-    else if (unit == LengthUnit.km) return h3Api.exactEdgeLengthKm(edge);
-    else if (unit == LengthUnit.m) return h3Api.exactEdgeLengthM(edge);
+  public double edgeLength(long edge, LengthUnit unit) {
+    if (unit == LengthUnit.rads) return h3Api.edgeLengthRads(edge);
+    else if (unit == LengthUnit.km) return h3Api.edgeLengthKm(edge);
+    else if (unit == LengthUnit.m) return h3Api.edgeLengthM(edge);
     else throw new IllegalArgumentException(String.format("Invalid unit: %s", unit));
   }
 

src/main/java/com/uber/h3core/H3CoreV3.java

@@ -623,7 +623,7 @@ public double pointDist(LatLng a, LatLng b, LengthUnit unit) {
    * @return Length of the given edge.
    */
   public double exactEdgeLength(String edgeAddress, LengthUnit unit) {
-    return h3Api.exactEdgeLength(edgeAddress, unit);
+    return h3Api.edgeLength(edgeAddress, unit);
   }
 
   /**
@@ -634,7 +634,7 @@ public double exactEdgeLength(String edgeAddress, LengthUnit unit) {
    * @return Length of the given edge.
    */
   public double exactEdgeLength(long edge, LengthUnit unit) {
-    return h3Api.exactEdgeLength(edge, unit);
+    return h3Api.edgeLength(edge, unit);
   }
 
   /**

src/main/java/com/uber/h3core/NativeMethods.java

@@ -92,11 +92,11 @@ native void polygonToCells(
 
   native double greatCircleDistanceM(double lat1, double lon1, double lat2, double lon2);
 
-  native double exactEdgeLengthRads(long h3);
+  native double edgeLengthRads(long h3);
 
-  native double exactEdgeLengthKm(long h3);
+  native double edgeLengthKm(long h3);
 
-  native double exactEdgeLengthM(long h3);
+  native double edgeLengthM(long h3);
 
   native double getHexagonAreaAvgKm2(int res);
 

src/test/java/com/uber/h3core/TestMiscellaneous.java

@@ -152,19 +152,19 @@ public void testCellAreaInvalidUnit() {
   }
 
   @Test
-  public void testExactEdgeLength() {
+  public void testEdgeLength() {
     for (int res = 0; res <= 15; res++) {
       long cell = h3.latLngToCell(0, 0, res);
 
       for (long edge : h3.originToDirectedEdges(cell)) {
         String edgeAddress = h3.h3ToString(edge);
 
-        double areaAddressM = h3.exactEdgeLength(edgeAddress, LengthUnit.m);
-        double areaAddressKm = h3.exactEdgeLength(edgeAddress, LengthUnit.km);
-        double areaAddressRads = h3.exactEdgeLength(edgeAddress, LengthUnit.rads);
-        double areaM = h3.exactEdgeLength(edge, LengthUnit.m);
-        double areaKm = h3.exactEdgeLength(edge, LengthUnit.km);
-        double areaRads = h3.exactEdgeLength(edge, LengthUnit.rads);
+        double areaAddressM = h3.edgeLength(edgeAddress, LengthUnit.m);
+        double areaAddressKm = h3.edgeLength(edgeAddress, LengthUnit.km);
+        double areaAddressRads = h3.edgeLength(edgeAddress, LengthUnit.rads);
+        double areaM = h3.edgeLength(edge, LengthUnit.m);
+        double areaKm = h3.edgeLength(edge, LengthUnit.km);
+        double areaRads = h3.edgeLength(edge, LengthUnit.rads);
 
         // Only asserts some properties of the functions that the edge lengths
         // should have certain relationships to each other, test isn't specific
@@ -180,21 +180,21 @@ public void testExactEdgeLength() {
   }
 
   @Test(expected = H3Exception.class)
-  public void testExactEdgeLengthInvalid() {
+  public void testEdgeLengthInvalid() {
     // Passing in a non-edge should not cause a crash
-    h3.exactEdgeLength(h3.latLngToCell(0, 0, 0), LengthUnit.km);
+    h3.edgeLength(h3.latLngToCell(0, 0, 0), LengthUnit.km);
   }
 
   @Test(expected = H3Exception.class)
-  public void testExactEdgeLengthInvalidEdge() {
-    h3.exactEdgeLength(0, LengthUnit.rads);
+  public void testEdgeLengthInvalidEdge() {
+    h3.edgeLength(0, LengthUnit.rads);
   }
 
   @Test(expected = IllegalArgumentException.class)
-  public void testExactEdgeLengthInvalidUnit() {
+  public void testEdgeLengthInvalidUnit() {
     long cell = h3.latLngToCell(0, 0, 0);
     long edge = h3.originToDirectedEdges(cell).get(0);
-    h3.exactEdgeLength(edge, null);
+    h3.edgeLength(edge, null);
   }
 
   @Test