diff --git a/README.md b/README.md
index c18c8d3..b55c80b 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ The algorithms are designed to be used in two ways:
* or as a set of procedures directly in a running Neo4j server
The built-in procedures can be used as examples if you wish to build your own.
-Otherwise simply copy the file named something like `dist/target/spatial-algorithms-dist-0.2.3-neo4j-4.0.8.jar`
+Otherwise simply copy the file named something like `dist/target/spatial-algorithms-dist-0.2.3-neo4j-4.1.3.jar`
into the plugins folder of your Neo4j installation.
## Using the library in your Java project with Maven ##
@@ -104,14 +104,14 @@ Add the following repositories and dependency to your project's pom.xml:
org.neo4j
spatial-algorithms-core
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
org.neo4j
spatial-algorithms-algo
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
~~~
The version specified on the version line can be changed to match the version you wish to work with (based on the version of Neo4j itself you are using).
-Too see which versions are available see the list at [Spatial Algorithms Releases](https://github.com/neo4j-contrib/m2/tree/master/releases/org/neo4j/spatial-algorithms-algo).
+To see which versions are available see the list at [Spatial Algorithms Releases](https://github.com/neo4j-contrib/m2/tree/master/releases/org/neo4j/spatial-algorithms-algo).
diff --git a/algo/pom.xml b/algo/pom.xml
index e8294f7..2c644f1 100644
--- a/algo/pom.xml
+++ b/algo/pom.xml
@@ -6,7 +6,7 @@
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
spatial-algorithms-algo
@@ -25,13 +25,6 @@
hamcrest-library
-
- org.neo4j
- neo4j-slf4j
- ${neo4j.version}
- provided
-
-
org.neo4j
neo4j-collections
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 7885f2d..d403780 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -36,7 +36,7 @@ THE POSSIBILITY OF SUCH DAMAGE.
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
spatial-algorithms-benchmarks
@@ -76,13 +76,13 @@ THE POSSIBILITY OF SUCH DAMAGE.
org.neo4j
spatial-algorithms-neo4j
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
compile
org.neo4j
spatial-algorithms-viewer
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
compile
diff --git a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/AreaMacroBenchmarks.java b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/AreaMacroBenchmarks.java
index 520edfc..a46c64f 100644
--- a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/AreaMacroBenchmarks.java
+++ b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/AreaMacroBenchmarks.java
@@ -22,6 +22,8 @@
import java.nio.file.Path;
+import static org.neo4j.configuration.GraphDatabaseInternalSettings.databases_root_path;
+
@State(Scope.Benchmark)
@Fork(1)
@BenchmarkMode(Mode.AverageTime)
@@ -45,7 +47,7 @@ public static void main(String[] args) throws RunnerException {
@Setup
public void setup() {
- databases = new TestDatabaseManagementServiceBuilder().setConfig(GraphDatabaseSettings.databases_root_path, Path.of("benchmarks/data")).build();
+ databases = new TestDatabaseManagementServiceBuilder().setConfig(databases_root_path, Path.of("benchmarks/data")).build();
db = databases.database("sweden");
long[] ids = new long[]{
diff --git a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/ConvexHullMacroBenchmarks.java b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/ConvexHullMacroBenchmarks.java
index ae97eee..71fb58d 100644
--- a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/ConvexHullMacroBenchmarks.java
+++ b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/ConvexHullMacroBenchmarks.java
@@ -21,6 +21,8 @@
import java.nio.file.Path;
+import static org.neo4j.configuration.GraphDatabaseInternalSettings.databases_root_path;
+
@State(Scope.Benchmark)
@Fork(1)
@BenchmarkMode(Mode.AverageTime)
@@ -42,7 +44,7 @@ public static void main(String[] args) throws RunnerException {
@Setup
public void setup() {
- databases = new TestDatabaseManagementServiceBuilder().setConfig(GraphDatabaseSettings.databases_root_path, Path.of("benchmarks/data")).build();
+ databases = new TestDatabaseManagementServiceBuilder().setConfig(databases_root_path, Path.of("benchmarks/data")).build();
db = databases.database("sweden");
long[] ids = new long[]{
diff --git a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/IntersectMacroBenchmarks.java b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/IntersectMacroBenchmarks.java
index 414a757..a092d04 100644
--- a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/IntersectMacroBenchmarks.java
+++ b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/IntersectMacroBenchmarks.java
@@ -23,6 +23,8 @@
import java.nio.file.Path;
+import static org.neo4j.configuration.GraphDatabaseInternalSettings.databases_root_path;
+
@State(Scope.Benchmark)
@Fork(1)
@BenchmarkMode(Mode.AverageTime)
@@ -50,7 +52,7 @@ public static void main(String[] args) throws RunnerException {
@Setup
public void setup() {
- databases = new TestDatabaseManagementServiceBuilder().setConfig(GraphDatabaseSettings.databases_root_path, Path.of("benchmarks/data")).build();
+ databases = new TestDatabaseManagementServiceBuilder().setConfig(databases_root_path, Path.of("benchmarks/data")).build();
db = databases.database("sweden");
long[] ids = new long[]{
diff --git a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/LinearReferenceMacroBenchmarks.java b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/LinearReferenceMacroBenchmarks.java
index e52e530..0d87abf 100644
--- a/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/LinearReferenceMacroBenchmarks.java
+++ b/benchmarks/src/main/java/org/neo4j/spatial/benchmarks/macro/LinearReferenceMacroBenchmarks.java
@@ -25,6 +25,8 @@
import java.nio.file.Path;
import java.util.Random;
+import static org.neo4j.configuration.GraphDatabaseInternalSettings.databases_root_path;
+
@State(Scope.Benchmark)
@Fork(1)
@BenchmarkMode(Mode.AverageTime)
@@ -52,7 +54,7 @@ public static void main(String[] args) throws RunnerException {
@Setup
public void setup() {
- databases = new TestDatabaseManagementServiceBuilder().setConfig(GraphDatabaseSettings.databases_root_path, Path.of("benchmarks/data")).build();
+ databases = new TestDatabaseManagementServiceBuilder().setConfig(databases_root_path, Path.of("benchmarks/data")).build();
db = databases.database("sweden");
long[] ids = new long[]{
diff --git a/core/pom.xml b/core/pom.xml
index 2457287..805b234 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
4.0.0
diff --git a/dist/pom.xml b/dist/pom.xml
index d58ee35..5a995f5 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -5,7 +5,7 @@
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
spatial-algorithms-dist
diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index f54dbd4..24c30ef 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -6,7 +6,7 @@
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
spatial-algorithms-neo4j
@@ -64,13 +64,6 @@
org.hamcrest
hamcrest-library
-
-
- org.neo4j
- neo4j-slf4j
- ${neo4j.version}
- provided
-
diff --git a/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jIDPoint.java b/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jIDPoint.java
index 5a94002..ce91e42 100644
--- a/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jIDPoint.java
+++ b/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jIDPoint.java
@@ -3,8 +3,10 @@
import org.neo4j.internal.helpers.collection.Iterators;
import org.neo4j.internal.kernel.api.NodeCursor;
import org.neo4j.internal.kernel.api.PropertyCursor;
+import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.impl.api.TokenAccess;
+import org.neo4j.memory.EmptyMemoryTracker;
import org.neo4j.spatial.core.CRS;
import org.neo4j.spatial.core.Point;
@@ -39,8 +41,8 @@ public boolean equals(Object other) {
@Override
public double[] getCoordinate() {
double[] coordinates = new double[2];
- try ( NodeCursor nodeCursor = ktx.cursors().allocateNodeCursor();
- PropertyCursor propertyCursor = ktx.cursors().allocatePropertyCursor() ) {
+ try (NodeCursor nodeCursor = ktx.cursors().allocateNodeCursor(PageCursorTracer.NULL);
+ PropertyCursor propertyCursor = ktx.cursors().allocatePropertyCursor(PageCursorTracer.NULL, EmptyMemoryTracker.INSTANCE)) {
ktx.dataRead().singleNode(nodeId, nodeCursor);
outer:
while (nodeCursor.next()) {
@@ -60,8 +62,8 @@ public double[] getCoordinate() {
@Override
public CRS getCRS() {
CRS crs = CRS.Cartesian;
- try ( NodeCursor nodeCursor = ktx.cursors().allocateNodeCursor();
- PropertyCursor propertyCursor = ktx.cursors().allocatePropertyCursor() ) {
+ try ( NodeCursor nodeCursor = ktx.cursors().allocateNodeCursor(PageCursorTracer.NULL);
+ PropertyCursor propertyCursor = ktx.cursors().allocatePropertyCursor(PageCursorTracer.NULL, EmptyMemoryTracker.INSTANCE) ) {
ktx.dataRead().singleNode(nodeId, nodeCursor);
outer:
while (nodeCursor.next()) {
diff --git a/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jSimpleGraphPolygon.java b/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jSimpleGraphPolygon.java
index d77085e..1b17024 100644
--- a/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jSimpleGraphPolygon.java
+++ b/neo4j/src/main/java/org/neo4j/spatial/neo4j/Neo4jSimpleGraphPolygon.java
@@ -25,8 +25,8 @@
import static java.lang.String.format;
public abstract class Neo4jSimpleGraphPolygon implements Polygon.SimplePolygon {
- private long osmRelationId;
- private CRS crs;
+ final private long osmRelationId;
+ final private CRS crs;
private Iterator nodeIterator;
boolean traversing;
Node start;
diff --git a/pom.xml b/pom.xml
index 8c9f029..aa00f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
pom
Spatial Algorithms
Utilities and Algorithms for Spatial Analysis
@@ -20,7 +20,7 @@
UTF-8
- 4.0.8
+ 4.1.3
1.19
11
3.1
diff --git a/viewer/pom.xml b/viewer/pom.xml
index 42235d6..40b0e1d 100644
--- a/viewer/pom.xml
+++ b/viewer/pom.xml
@@ -5,7 +5,7 @@
org.neo4j
spatial-algorithms-parent
- 0.2.3-neo4j-4.0.8
+ 0.2.3-neo4j-4.1.3
4.0.0