GIS #462: defined Geometry in Mongo

polypheny · Dec 12, 2023 · c45b7be · c45b7be
1 parent e981474
commit c45b7be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/core/src/main/java/org/polypheny/db/functions/MqlFunctions.java b/core/src/main/java/org/polypheny/db/functions/MqlFunctions.java
@@ -754,7 +754,6 @@ public static PolyBoolean docGeoWithin( PolyValue input, PolyValue geometry ) {
         if ( inputGeom == null || geom == null ) {
             return PolyBoolean.FALSE;
         }
-        boolean res = inputGeom.within( geom );
         return PolyBoolean.of( inputGeom.within( geom ) );
     }
 

diff --git a/core/src/main/java/org/polypheny/db/util/BsonUtil.java b/core/src/main/java/org/polypheny/db/util/BsonUtil.java
@@ -470,6 +470,7 @@ public static Comparable<?> getMongoComparable( PolyType finalType, RexLiteral e
             case VARCHAR:
                 return el.getValue();
             case GEOMETRY:
+                return el.getValue().toString();
             case FILE:
             case IMAGE:
             case VIDEO:
@@ -538,6 +539,7 @@ public static Class<?> getClassFromType( PolyType type ) {
             case VARCHAR:
             case BINARY:
             case VARBINARY:
+            case GEOMETRY:
                 return String.class;
             case FILE:
             case IMAGE:
@@ -593,8 +595,8 @@ public static Document asDocument( BsonDocument bson ) {
 
 
     /**
-     * Method to retrieve the type numbers according to the MongoDB specifications
-     * https://docs.mongodb.com/manual/reference/operator/query/type/
+     * Method to retrieve the type numbers according to the
+     * <a href="https://docs.mongodb.com/manual/reference/operator/query/type/">MongoDB specifications</a>
      *
      * @param type PolyType which is matched
      * @return the corresponding type number for MongoDB
@@ -624,6 +626,7 @@ public static int getTypeNumber( PolyType type ) {
             case VARCHAR:
             case BINARY:
             case VARBINARY:
+            case GEOMETRY:
                 return 2;
             default:
                 throw new IllegalStateException( "Unexpected value: " + type );

diff --git a/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java b/dbms/src/main/java/org/polypheny/db/PolyphenyDb.java
@@ -127,7 +127,7 @@ public class PolyphenyDb {
     public boolean daemonMode = false;
 
     @Option(name = { "-defaultStore" }, description = "Type of default storeId")
-    public String defaultStoreName = "hsqldb";
+    public String defaultStoreName = "mongodb";
 
     @Option(name = { "-defaultSource" }, description = "Type of default source")
     public String defaultSourceName = "csv";

diff --git a/dbms/src/test/java/org/polypheny/db/sql/fun/GeoFunctionsTest.java b/dbms/src/test/java/org/polypheny/db/sql/fun/GeoFunctionsTest.java
@@ -89,7 +89,7 @@ public void readGeo() throws SQLException {
     // --------------- Test spatial functions without the actual persisted data ----------------------
 
     @Test
-    public void GeomFromText() throws SQLException {
+    public void geomFromText() throws SQLException {
         try ( TestHelper.JdbcConnection polyphenyDbConnection = new TestHelper.JdbcConnection( true ) ) {
             Connection connection = polyphenyDbConnection.getConnection();
             try ( Statement statement = connection.createStatement() ) {