Merge remote-tracking branch 'origin/0.25-neo4j-3.2' into 0.25-neo4j-3.3

Author: craigtaverner

README.md

@@ -225,8 +225,8 @@ The Neo4j Spatial Plugin is available for inclusion in the server version of Neo
   * [v0.24.1 for Neo4j 3.2.5](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.24.1-neo4j-3.2.5/neo4j-spatial-0.24.1-neo4j-3.2.5-server-plugin.jar?raw=true)
   * [v0.25.1 for Neo4j 3.0.8](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.1-neo4j-3.0.8/neo4j-spatial-0.25.1-neo4j-3.0.8-server-plugin.jar?raw=true)
   * [v0.25.3 for Neo4j 3.1.4](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.3-neo4j-3.1.4/neo4j-spatial-0.25.3-neo4j-3.1.4-server-plugin.jar?raw=true)
-  * [v0.25.3 for Neo4j 3.2.8](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.3-neo4j-3.2.8/neo4j-spatial-0.25.3-neo4j-3.2.8-server-plugin.jar?raw=true)
-  * [v0.25.4 for Neo4j 3.3.5](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.4-neo4j-3.3.5/neo4j-spatial-0.25.4-neo4j-3.3.5-server-plugin.jar?raw=true)
+  * [v0.25.4 for Neo4j 3.2.8](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.4-neo4j-3.2.8/neo4j-spatial-0.25.4-neo4j-3.2.8-server-plugin.jar?raw=true)
+  * [v0.25.5 for Neo4j 3.3.5](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.5-neo4j-3.3.5/neo4j-spatial-0.25.5-neo4j-3.3.5-server-plugin.jar?raw=true)
 
 For versions up to 0.15-neo4j-2.3.4:
 
@@ -342,7 +342,7 @@ Add the following repositories and dependency to your project's pom.xml:
     <dependency>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-spatial</artifactId>
-        <version>0.25.4-neo4j-3.3.5</version>
+        <version>0.25.5-neo4j-3.3.5</version>
     </dependency>
 ~~~
 

pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>neo4j-spatial</artifactId>
     <groupId>org.neo4j</groupId>
-    <version>0.25.4-neo4j-3.3.5</version>
+    <version>0.25.5-neo4j-3.3.5</version>
     <name>Neo4j - Spatial Components</name>
     <description>Spatial utilities and components for Neo4j</description>
     <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>

src/main/java/org/neo4j/gis/spatial/index/ExplicitIndexBackedPointIndex.java

@@ -27,13 +27,9 @@
 import org.neo4j.gis.spatial.rtree.TreeMonitor;
 import org.neo4j.gis.spatial.rtree.filter.SearchFilter;
 import org.neo4j.gis.spatial.rtree.filter.SearchResults;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Transaction;
+import org.neo4j.graphdb.*;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexHits;
-import org.neo4j.helpers.collection.Iterables;
 
 import java.util.Iterator;
 import java.util.List;
@@ -92,6 +88,9 @@ public void remove(long geomNodeId, boolean deleteGeomNode, boolean throwExcepti
                 if (geomNode != null) {
                     index.remove(geomNode);
                     if (deleteGeomNode) {
+                        for (Relationship rel : geomNode.getRelationships()) {
+                            rel.delete();
+                        }
                         geomNode.delete();
                     }
                 }

src/test/java/org/neo4j/gis/spatial/procedures/SpatialProceduresTest.java

@@ -536,6 +536,33 @@ public void add_a_node_to_the_spatial_hilbert_index() throws Exception {
         testCall(db, "MATCH (n:Node) WITH n CALL spatial.addNode('geom',n) YIELD node RETURN node", r -> Assert.assertEquals(node, r.get("node")));
     }
 
+    @Test
+    public void add_a_node_to_multiple_different_indexes() throws Exception {
+        String[] indexes = new String[]{"Geohash", "ZOrder", "Hilbert", "RTree"};
+        for (String name : indexes) {
+            String layerName = name.toLowerCase();
+            execute("CALL spatial.addPointLayer" + (name.equals("RTree") ? "" : name) + "('" + layerName + "')");
+        }
+        testCallCount(db, "CALL spatial.layers()", null, indexes.length);
+        ResourceIterator<Object> nodes = db.execute("CREATE (n:Node {latitude:60.1,longitude:15.2}) RETURN n").columnAs("n");
+        Node node = (Node) nodes.next();
+        nodes.close();
+        for (String name : indexes) {
+            String layerName = name.toLowerCase();
+            testCall(db, "MATCH (n:Node) WITH n CALL spatial.addNode('" + layerName + "',n) YIELD node RETURN node", r -> Assert.assertEquals(node, r.get("node")));
+        }
+        for (String name : indexes) {
+            String layerName = name.toLowerCase();
+            testCall(db, "CALL spatial.withinDistance('" + layerName + "',{lon:15.0,lat:60.0},100)", r -> assertEquals(node, r.get("node")));
+        }
+        for (String name : indexes) {
+            String layerName = name.toLowerCase();
+            execute("CALL spatial.removeLayer('" + layerName + "')");
+        }
+        testCallCount(db, "CALL spatial.layers()", null, 0);
+    }
+
+
     @Test
     public void testDistanceNode() throws Exception {
         execute("CALL spatial.addPointLayer('geom')");