Updated for Neo4j 5.11

Modified the functions com.neo4jh3.pointash3String and com.neo4jh3.pointash3 to accept a lat/lon or lon/lat parameter
Updated for Neo4j 5.11
Fixed a documentation bug
Fixed some tests so they would work on Windows

Author: davidfauth

CHANGELOG.md

@@ -1,11 +1,16 @@
 # CHANGELOG - Neo4jH3
 
-## 5.10 2023-0809
+## 5.11 2023-08-18
+* [Added] Tested through Neo4j 5.11
+* [Updated] Updated the com.neo4jh3.pointash3String and com.neo4jh3.pointash3 functions to take a 3rd parameter to indicate if the point is in lat/lon format or lon/lat format.
+* [Updated] Updated tests to address issues between Linux and Windows
+
+## 5.10 2023-08-09
 
 * [Added] Tested through Neo4j 5.10
 * [Updated] Bumped org.apache.commons.commons-lang3 to 3.13.0
 
-## 5.8 2023-0519
+## 5.8 2023-05-19
 
 * [Added] Tested through Neo4j 5.8
 * [Added] Added support for converting a LINESTRING geospatial object to H3 number - com.neo4jh3.lineash3

Documentation.md

@@ -943,7 +943,7 @@ If resolutionExpr is smaller than 0 or larger than 15, the function returns -2
     RETURN com.neo4jh3.multilineash3String('MULTILINESTRING((37.2713558667319 -121.91508032705622), (37.353926450852256 -121.86222328902491))',16) AS value
     -2
 
-## com.neo4jh3.pointash3( geographyExpr, resolutionExpr )
+## com.neo4jh3.pointash3( geographyExpr, resolutionExpr, LatLonOrder )
 Returns the H3 cell ID (as a LONG) corresponding to the provided point at the specified resolution.
 
 ### Syntax
@@ -952,6 +952,7 @@ RETURN com.neo4jh3.pointash3( geographyExpr, resolutionExpr )
 ### Arguments
 * geographyExpr: A LONG expression representing a point geography in WKT format
 * resolutionExpr: An INT expression, whose value is expected to be between 0 and 15 inclusive, specifying the resolution of the child H3 cell ID.
+* LatLonOrder A STRING that indicates the order of the geometry (latlon or lonlat)
 
 ### Returns
 Returns the H3 cell ID (as a LONG) corresponding to the provided point at the specified resolution.
@@ -962,16 +963,16 @@ If geographyExpr is of type STRING and the value is either an invalid WKT or doe
 If resolutionExpr is smaller than 0 or larger than 15, the function returns -2
 
 ### Example
-    RETURN com.neo4jh3.pointash3('POINT(37.8199 -122.4783)',13) AS value
+    RETURN com.neo4jh3.pointash3('POINT(37.8199 -122.4783)',13, 'latlon') AS value
     635714569676958015
 
-    RETURN com.neo4jh3.pointash3('zzz(37.8199 -122.4783)',13) AS value
+    RETURN com.neo4jh3.pointash3('zzz(37.8199 -122.4783)',13, 'latlon') AS value
     -1
 
-    RETURN com.neo4jh3.maxChildString('POINT(37.8199 -122.4783)',16) AS value
+    RETURN com.neo4jh3.pointash3('POINT(37.8199 -122.4783)',16, 'latlon') AS value
     -2
 
-## com.neo4jh3.pointash3String( geographyExpr, resolutionExpr )
+## com.neo4jh3.pointash3String( geographyExpr, resolutionExpr, LatLonOrder )
 Returns the H3 cell ID (as a STRING) corresponding to the provided point at the specified resolution.
 
 ### Syntax
@@ -980,6 +981,7 @@ RETURN com.neo4jh3.pointash3String( geographyExpr, resolutionExpr )
 ### Arguments
 * geographyExpr: A STRING expression representing a point geography in WKT format
 * resolutionExpr: An INT expression, whose value is expected to be between 0 and 15 inclusive, specifying the resolution of the child H3 cell ID.
+* LatLonOrder A STRING that indicates the order of the geometry (latlon or lonlat)
 
 ### Returns
 Returns the H3 cell ID (as a STRING) corresponding to the provided point at the specified resolution.
@@ -990,13 +992,13 @@ If geographyExpr is of type STRING and the value is either an invalid WKT or doe
 If resolutionExpr is smaller than 0 or larger than 15, the function returns -2
 
 ### Example
-    RETURN com.neo4jh3.pointash3String('POINT(37.8199 -122.4783)',13) AS value
+    RETURN com.neo4jh3.pointash3String('POINT(37.8199 -122.4783)',13, 'latlon') AS value
     8d283087022a93f
 
-    RETURN com.neo4jh3.pointash3String('zzz(37.8199 -122.4783)',13) AS value
+    RETURN com.neo4jh3.pointash3String('zzz(37.8199 -122.4783)',13, 'latlon') AS value
     -1
 
-    RETURN com.neo4jh3. pointash3String('POINT(37.8199 -122.4783)',16) AS value
+    RETURN com.neo4jh3.pointash3String('POINT(37.8199 -122.4783)',16, 'latlon') AS value
     -2
 
 ## com.neo4jh3.stringToH3( h3CellIdExpr )

pom.xml

@@ -6,10 +6,10 @@
 
     <groupId>com.neo4jh3</groupId>
     <artifactId>neo4jh3</artifactId>
-    <version>5.10.0</version>
+    <version>5.11.0</version>
 
     <properties>
-        <neo4j.version>5.10.0</neo4j.version>
+        <neo4j.version>5.11.0</neo4j.version>
         <csv.version>1.2</csv.version>
 		<lang3.version>3.13.0</lang3.version>
 		<uber.version>4.1.1</uber.version>

src/main/java/com/neo4jh3/uber/Uberh3.java

@@ -679,10 +679,11 @@ public String maxChild(@Name("fromHexAddress") String fromHexAddress, @Name("h3R
 
     // Geography Functions
     @UserFunction(name = "com.neo4jh3.pointash3")
-    @Description("com.neo4jh3.pointash3(wktString, resolution) - Provides the distance in grid cells between the two indexes.")
+    @Description("com.neo4jh3.pointash3(wktString, resolution, latlon order) - Provides the distance in grid cells between the two indexes.")
     public Long pointash3(
             @Name("wktString") String wktString, 
-            @Name("h3Res") Long h3Res) throws InterruptedException 
+            @Name("h3Res") Long h3Res,
+            @Name("latlonorder") String latlonorder) throws InterruptedException 
             {
             Long h3Address = 0L;
             if (h3 == null) {
@@ -694,8 +695,17 @@ public Long pointash3(
             try {
                 if (h3Resolution > 0 && h3Resolution <= 15) { 
                     Geometry geometry = GeometryReader.readGeometry(wktString);
-                   if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
-                        h3Address=h3.latLngToCell(geometry.getEnvelope().getMinX(), geometry.getEnvelope().getMinY(), h3Resolution);
+                    System.out.println(geometry.getEnvelope().getMinX());
+                    System.out.println(geometry.getEnvelope().getMinY());
+                    
+                   if (latlonorder.equalsIgnoreCase("latlon")){
+                        if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
+                            h3Address=h3.latLngToCell(geometry.getEnvelope().getMinX(), geometry.getEnvelope().getMinY(), h3Resolution);
+                        }
+                    } else {
+                        if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
+                            h3Address=h3.latLngToCell(geometry.getEnvelope().getMinY(), geometry.getEnvelope().getMinX(), h3Resolution);
+                        }
                     }
                 } else {
                     h3Address = -2L;
@@ -709,10 +719,11 @@ public Long pointash3(
         return h3Address;
     }
     @UserFunction(name = "com.neo4jh3.pointash3String")
-    @Description("com.neo4jh3.pointash3String(wktString, resolution) - Provides the distance in grid cells between the two indexes.")
+    @Description("com.neo4jh3.pointash3String(wktString, resolution, latlon order) - Provides the distance in grid cells between the two indexes.")
     public String pointash3String(
             @Name("wktString") String wktString, 
-            @Name("h3Res") Long h3Res) throws InterruptedException 
+            @Name("h3Res") Long h3Res,
+            @Name("latlonorder") String latlonorder) throws InterruptedException 
             {
             String h3Address = "";
             if (h3 == null) {
@@ -724,8 +735,14 @@ public String pointash3String(
             try {
                 if (h3Resolution > 0 && h3Resolution <= 15) { 
                     Geometry geometry = GeometryReader.readGeometry(wktString);
-                   if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
-                        h3Address=h3.latLngToCellAddress(geometry.getEnvelope().getMinX(), geometry.getEnvelope().getMinY(), h3Resolution);
+                    if (latlonorder.equalsIgnoreCase("latlon")){
+                        if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
+                            h3Address=h3.latLngToCellAddress(geometry.getEnvelope().getMinX(), geometry.getEnvelope().getMinY(), h3Resolution);
+                        }
+                    } else {
+                        if (geometry.getGeometryType().toString().equalsIgnoreCase("Point")){
+                            h3Address=h3.latLngToCellAddress(geometry.getEnvelope().getMinY(), geometry.getEnvelope().getMinX(), h3Resolution);
+                        }
                     }
                 } else {
                     h3Address = "-2";