Fixed point type conversion for BaseToObjectValueWriter

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java

@@ -31,6 +31,7 @@
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.utils.PrettyPrinter;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
 import org.neo4j.values.virtual.MapValue;
 
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.FAILURE;
@@ -157,13 +158,7 @@ protected Relationship newRelationshipProxyById( long id )
         }
 
         @Override
-        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
-        {
-            throw exception;
-        }
-
-        @Override
-        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+        protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
         {
             throw exception;
         }

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java

@@ -655,13 +655,7 @@ protected Relationship newRelationshipProxyById( long id )
         }
 
         @Override
-        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
-        {
-            throw new UnsupportedOperationException( "Cannot unpack points" );
-        }
-
-        @Override
-        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+        protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
         {
             throw new UnsupportedOperationException( "Cannot unpack points" );
         }

community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java

@@ -59,6 +59,7 @@
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.util.HexPrinter;
 import org.neo4j.values.AnyValue;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
 import org.neo4j.values.virtual.MapValue;
 
 import static org.hamcrest.CoreMatchers.containsString;
@@ -103,13 +104,7 @@ protected Relationship newRelationshipProxyById( long id )
         }
 
         @Override
-        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
-        {
-            return null;
-        }
-
-        @Override
-        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+        protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
         {
             return null;
         }

community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/QueryStateHelper.scala

@@ -25,6 +25,7 @@ import org.mockito.{ArgumentMatchers, Mockito}
 import org.neo4j.cypher.internal.runtime.QueryContext
 import org.neo4j.cypher.internal.runtime.interpreted.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.runtime.interpreted.pipes.{ExternalCSVResource, NullPipeDecorator, PipeDecorator, QueryState}
+import org.neo4j.graphdb.spatial.Point
 import org.neo4j.graphdb.{Node, Relationship}
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
@@ -33,8 +34,8 @@ import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo
 import org.neo4j.kernel.impl.util.BaseToObjectValueWriter
 import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors}
 import org.neo4j.values.AnyValue
-import org.neo4j.values.virtual.MapValue
 import org.neo4j.values.virtual.VirtualValues.EMPTY_MAP
+import org.neo4j.values.virtual.{CoordinateReferenceSystem, MapValue}
 
 import scala.collection.mutable
 
@@ -87,6 +88,7 @@ object QueryStateHelper {
     val writer = new BaseToObjectValueWriter[RuntimeException] {
       override protected def newNodeProxyById(id: Long): Node = ???
       override protected def newRelationshipProxyById(id: Long): Relationship = ???
+      override protected def newPoint(crs: CoordinateReferenceSystem, coordinate: Array[Double]): Point = ???
     }
     any.writeTo(writer)
     writer.value()

community/cypher/runtime-util/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java

@@ -19,13 +19,13 @@
  */
 package org.neo4j.cypher.internal.javacompat;
 
-import org.neo4j.cypher.internal.runtime.CartesianPoint;
-import org.neo4j.cypher.internal.runtime.GeographicPoint;
+import org.neo4j.cypher.internal.runtime.Points;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.impl.core.NodeManager;
 import org.neo4j.kernel.impl.util.BaseToObjectValueWriter;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
 
 public class ValueToObjectSerializer extends BaseToObjectValueWriter<RuntimeException>
 {
@@ -49,16 +49,9 @@ protected Relationship newRelationshipProxyById( long id )
     }
 
     @Override
-    protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
+    protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
     {
-        return new GeographicPoint( longitude, latitude,
-                new org.neo4j.cypher.internal.runtime.CRS( name, code, href ) );
-    }
-
-    @Override
-    protected Point newCartesianPoint( double x, double y, String name, int code, String href )
-    {
-        return new CartesianPoint( x, y,
-                new org.neo4j.cypher.internal.runtime.CRS( name, code, href ) );
+        // TODO: Is this necessary, perhaps PointValue is sufficient for use in Cypher-land
+        return Points.fromValue( crs, coordinate );
     }
 }

community/cypher/runtime-util/src/main/scala/org/neo4j/cypher/internal/runtime/Geometry.scala

@@ -24,6 +24,7 @@ import java.util.Collections
 import org.neo4j.cypher.internal.util.v3_4.{CypherTypeException, InvalidArgumentException}
 import org.neo4j.graphdb.spatial
 import org.neo4j.graphdb.spatial.{Coordinate, Point}
+import org.neo4j.values.virtual.CoordinateReferenceSystem
 
 import scala.beans.BeanProperty
 
@@ -82,6 +83,15 @@ object CRS {
 }
 
 object Points {
+  // TODO: Is this necessary, perhaps PointValue is sufficient for use in Cypher-land
+  def fromValue(crsValue: CoordinateReferenceSystem, coordinate: Array[Double]) = {
+    val crs = CRS.fromName(crsValue.name)
+    if (crs == CRS.WGS84) {
+      new GeographicPoint(coordinate(0), coordinate(1), crs)
+    } else {
+      new CartesianPoint(coordinate(0), coordinate(1), crs)
+    }
+  }
   private def safeToDouble(value: Any) = value match {
     case n: Number => n.doubleValue()
     case other => throw new CypherTypeException(other.getClass.getSimpleName + " is not a valid coordinate type.")

community/kernel/src/main/java/org/neo4j/kernel/impl/util/BaseToObjectValueWriter.java

@@ -69,6 +69,8 @@ public BaseToObjectValueWriter()
 
     protected abstract Relationship newRelationshipProxyById( long id );
 
+    protected abstract Point newPoint( CoordinateReferenceSystem crs, double[] coordinate );
+
     public Object value()
     {
         assert stack.size() == 1;
@@ -313,12 +315,11 @@ public String toString()
         } );
     }
 
-    // TODO undefault and implement in subclasses?
     @Override
-    public void writePoint( CoordinateReferenceSystem crs, double[] coordinate ) throws E
+    public final void writePoint( CoordinateReferenceSystem crs, double[] coordinate ) throws E
     {
-        throw new UnsupportedOperationException();
-    };
+        writeValue( newPoint( crs, coordinate ) );
+    }
 
     @Override
     public void writeNull() throws RuntimeException

enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java

@@ -33,6 +33,7 @@
 import org.neo4j.kernel.api.query.QuerySnapshot;
 import org.neo4j.kernel.impl.core.NodeManager;
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
 import org.neo4j.kernel.impl.util.BaseToObjectValueWriter;
 import org.neo4j.values.virtual.MapValue;
 
@@ -153,19 +154,9 @@ protected Relationship newRelationshipProxyById( long id )
         }
 
         @Override
-        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
-        {
-            return point( longitude, latitude, name, code, href );
-        }
-
-        @Override
-        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
-        {
-            return point( x, y, name, code, href );
-        }
-
-        private Point point( double x, double y, String name, int code, String href )
+        protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
         {
+            //TODO: Is this required perhaps PointValue is sufficient without mapping to public?
             return new Point()
             {
                 @Override
@@ -177,7 +168,7 @@ public String getGeometryType()
                 @Override
                 public List<Coordinate> getCoordinates()
                 {
-                    return singletonList( new Coordinate( x, y ) );
+                    return singletonList( new Coordinate( coordinate ) );
                 }
 
                 @Override
@@ -188,19 +179,19 @@ public CRS getCRS()
                         @Override
                         public int getCode()
                         {
-                            return code;
+                            return crs.code;
                         }
 
                         @Override
                         public String getType()
                         {
-                            return name;
+                            return crs.name;
                         }
 
                         @Override
                         public String getHref()
                         {
-                            return href;
+                            return crs.href;
                         }
                     };
                 }

enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java

@@ -74,6 +74,7 @@
 import org.neo4j.test.rule.concurrent.ThreadingRule;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.storable.TextValue;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
 import org.neo4j.values.virtual.ListValue;
 import org.neo4j.values.virtual.MapValue;
 
@@ -938,13 +939,7 @@ protected Relationship newRelationshipProxyById( long id )
             }
 
             @Override
-            protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
-            {
-                return null;
-            }
-
-            @Override
-            protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+            protected Point newPoint( CoordinateReferenceSystem crs, double[] coordinate )
             {
                 return null;
             }