Spatial index (work in progress)

h2/src/main/org/h2/index/IndexCursor.java

@@ -182,9 +182,9 @@ public class IndexCursor implements Cursor {
         if (row == null) {
             row = table.getTemplateRow();
         } else if (row.getValue(columnId) != null) {
-            // the intersection of the two envelopes
+            // the union of the two envelopes
             ValueGeometry vg = (ValueGeometry) row.getValue(columnId).convertTo(Value.GEOMETRY);
-            v = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getEnvelopeIntersection(vg);
+            v = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getEnvelopeUnion(vg);
         }
         if (columnId < 0) {
             row.setKey(v.getLong());

h2/src/main/org/h2/value/ValueGeometry.java

@@ -87,6 +87,19 @@ public class ValueGeometry extends Value {
         // it is useless to cache the envelope as the Geometry object do this already
         return geometry.getEnvelopeInternal().intersects(r.getGeometry().getEnvelopeInternal());
     }
+    
+    /**
+     * Get the union.
+     * 
+     * @param r the other geometry
+     * @return the union of this geometry envelope and another geometry envelope
+     */
+    public Value getEnvelopeUnion(ValueGeometry r) {
+        GeometryFactory gf = new GeometryFactory();
+        Envelope mergedEnvelope = new Envelope(geometry.getEnvelopeInternal());
+        mergedEnvelope.expandToInclude(r.getGeometry().getEnvelopeInternal());
+        return get(gf.toGeometry(mergedEnvelope));
+    }    
 
     /**
      * Get the intersection.

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -56,15 +56,14 @@ public class TestSpatial extends TestBase {
     public void test() throws SQLException {
         if (DataType.GEOMETRY_CLASS != null) {
             deleteDb("spatial");
-//            testSpatialValues();
-//            testOverlap();
-//            testNotOverlap();
-//            testPersistentSpatialIndex();
-//            testSpatialIndexQueryMultipleTable();
-//            testIndexTransaction();
-//            testJavaAlias();
-//            testJavaAliasTableFunction();
-            // testPersistentSpatialIndex2();
+            testSpatialValues();
+            testOverlap();
+            testNotOverlap();
+            testPersistentSpatialIndex();
+            testSpatialIndexQueryMultipleTable();
+            testIndexTransaction();
+            testJavaAlias();
+            testJavaAliasTableFunction();
             testMemorySpatialIndex();
             testRandom();
             deleteDb("spatial");
@@ -494,40 +493,5 @@ public class TestSpatial extends TestBase {
             throw new SQLException(ex);
         }
     }
-    /**
-     * Not really a test case but show that something go crazy (in mvstore) after some seconds.
-     * @throws SQLException
-     */
-    private void testPersistentSpatialIndex2() throws SQLException {
-        deleteDb("spatial_pers");
-        final long count = 150000;
-        Connection conn = getConnection("spatial_pers");
-        try {
-            Statement stat = conn.createStatement();
-            stat.execute("create table test(id int primary key auto_increment, the_geom geometry)");
-            PreparedStatement ps = conn.prepareStatement("insert into test(the_geom) values(?)");
-            Random rnd = new Random(44);
-            for(int i=0;i<count;i++) {
-                ps.setObject(1,getRandomGeometry(rnd,0,100,-50,50,3));
-                ps.execute();
-            }
-            stat.execute("create spatial index on test(the_geom)");
-            Database db = ((Session)((JdbcConnection) conn).getSession()).getDatabase();
-            MVStore store = db.getMvStore().getStore();
-            int cpt=0;
-            while(cpt<46) {
-                try {
-                    // First it shows 610, then 5 until cpt==44, finally at cpt==45 it shows an unsaved 688 with a trace in spatial_pers.trace.db
-                    System.out.println((cpt++)+" store.getUnsavedPageCount()=="+store.getUnsavedPageCount());
-                    Thread.sleep(1000);
-                } catch (InterruptedException ex) {
-                    throw new SQLException(ex);
-                }
-            }
-        } finally {
-            // Close the database
-            conn.close();
-        }
-    }
     
 }