Improved support for native Neo4j point types for storing locations

This commit includes support for procedures, as well as a critical bugfix.

Author: craigtaverner

README.md

@@ -229,7 +229,7 @@ The Neo4j Spatial Plugin is available for inclusion in the server version of Neo
   * [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)
   * [v0.25.6 for Neo4j 3.4.5](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.6-neo4j-3.4.5/neo4j-spatial-0.25.6-neo4j-3.4.5-server-plugin.jar?raw=true)
   * [v0.25.7 for Neo4j 3.4.9](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.25.7-neo4j-3.4.9/neo4j-spatial-0.25.7-neo4j-3.4.9-server-plugin.jar?raw=true)
-  * [v0.26.0 for Neo4j 3.4.9](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.26.0-neo4j-3.4.9/neo4j-spatial-0.26.0-neo4j-3.4.9-server-plugin.jar?raw=true)
+  * [v0.26.1 for Neo4j 3.4.9](https://github.com/neo4j-contrib/m2/blob/master/releases/org/neo4j/neo4j-spatial/0.26.1-neo4j-3.4.9/neo4j-spatial-0.26.1-neo4j-3.4.9-server-plugin.jar?raw=true)
 
 For versions up to 0.15-neo4j-2.3.4:
 
@@ -345,7 +345,7 @@ Add the following repositories and dependency to your project's pom.xml:
     <dependency>
         <groupId>org.neo4j</groupId>
         <artifactId>neo4j-spatial</artifactId>
-        <version>0.26.0-neo4j-3.4.9</version>
+        <version>0.26.1-neo4j-3.4.9</version>
     </dependency>
 ~~~
 

pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>neo4j-spatial</artifactId>
     <groupId>org.neo4j</groupId>
-    <version>0.26.0-neo4j-3.4.9</version>
+    <version>0.26.1-neo4j-3.4.9</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/encoders/NativePointEncoder.java

@@ -84,7 +84,7 @@ public void setConfiguration(String configuration) {
             String[] fields = configuration.split(":");
             if (fields.length > 0) locationProperty = fields[0];
             if (fields.length > 1) bboxProperty = fields[1];
-            if (fields.length > 2) crs = Neo4jCRS.findCRS(fields[1]);
+            if (fields.length > 2) crs = Neo4jCRS.findCRS(fields[2]);
         }
     }
 

src/main/java/org/neo4j/gis/spatial/procedures/SpatialProcedures.java

@@ -294,6 +294,104 @@ public Stream<NodeResult> addSimplePointLayerWithConfig(
         }
     }
 
+    @Procedure(value="spatial.addNativePointLayer", mode=WRITE)
+    @Description("Adds a new native point layer, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayer(
+            @Name("name") String name,
+            @Name(value = "indexType", defaultValue = RTREE_INDEX_NAME) String indexType,
+            @Name(value = "crsName", defaultValue = UNSET_CRS_NAME) String crsName) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class, sdb.resolveIndexClass(indexType), null, selectCRS(crsName)).getLayerNode());
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
+    @Procedure(value="spatial.addNativePointLayerGeohash", mode=WRITE)
+    @Description("Adds a new native point layer with geohash based index, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayerGeohash(
+            @Name("name") String name,
+            @Name(value = "crsName", defaultValue = WGS84_CRS_NAME) String crsName) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class, LayerGeohashPointIndex.class, null, selectCRS(crsName)).getLayerNode());
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
+    @Procedure(value="spatial.addNativePointLayerZOrder", mode=WRITE)
+    @Description("Adds a new native point layer with z-order curve based index, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayerZOrder(@Name("name") String name) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class, LayerZOrderPointIndex.class, null, DefaultGeographicCRS.WGS84).getLayerNode());
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
+    @Procedure(value="spatial.addNativePointLayerHilbert", mode=WRITE)
+    @Description("Adds a new native point layer with hilbert curve based index, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayerHilbert(@Name("name") String name) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class, LayerHilbertPointIndex.class, null, DefaultGeographicCRS.WGS84).getLayerNode());
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
+    @Procedure(value="spatial.addNativePointLayerXY", mode=WRITE)
+    @Description("Adds a new native point layer with the given properties for x and y coordinates, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayer(
+            @Name("name") String name,
+            @Name("xProperty") String xProperty,
+            @Name("yProperty") String yProperty,
+            @Name(value = "indexType", defaultValue = RTREE_INDEX_NAME) String indexType,
+            @Name(value = "crsName", defaultValue = UNSET_CRS_NAME) String crsName) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            if (xProperty != null && yProperty != null) {
+                return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class,
+                        sdb.resolveIndexClass(indexType), sdb.makeEncoderConfig(xProperty, yProperty),
+                        selectCRS(hintCRSName(crsName, yProperty))).getLayerNode());
+            } else {
+                throw new IllegalArgumentException("Cannot create layer '" + name + "': Missing encoder config values: xProperty[" + xProperty + "], yProperty[" + yProperty + "]");
+            }
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
+    @Procedure(value="spatial.addNativePointLayerWithConfig", mode=WRITE)
+    @Description("Adds a new native point layer with the given configuration, returns the layer root node")
+    public Stream<NodeResult> addNativePointLayerWithConfig(
+            @Name("name") String name,
+            @Name("encoderConfig") String encoderConfig,
+            @Name(value = "indexType", defaultValue = RTREE_INDEX_NAME) String indexType,
+            @Name(value = "crsName", defaultValue = UNSET_CRS_NAME) String crsName) {
+        SpatialDatabaseService sdb = wrap(db);
+        Layer layer = sdb.getLayer(name);
+        if (layer == null) {
+            if (encoderConfig.indexOf(':') > 0) {
+                return streamNode(sdb.createLayer(name, NativePointEncoder.class, SimplePointLayer.class,
+                        sdb.resolveIndexClass(indexType), encoderConfig,
+                        selectCRS(hintCRSName(crsName, encoderConfig))).getLayerNode());
+            } else {
+                throw new IllegalArgumentException("Cannot create layer '" + name + "': invalid encoder config '" + encoderConfig + "'");
+            }
+        } else {
+            throw new IllegalArgumentException("Cannot create existing layer: " + name);
+        }
+    }
+
     public static final String UNSET_CRS_NAME = "";
     public static final String WGS84_CRS_NAME = "wgs84";