Add ValueGeometry.getEnvelopeNoCopy()

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

@@ -24,7 +24,6 @@ import org.h2.value.Value;
 import org.h2.value.ValueGeometry;
 import org.h2.value.ValueNull;
 import org.locationtech.jts.geom.Envelope;
-import org.locationtech.jts.geom.Geometry;
 
 /**
  * This is an index based on a MVR-TreeMap.
@@ -134,8 +133,7 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
         if (v == ValueNull.INSTANCE) {
             return new SpatialKey(row.getKey());
         }
-        Geometry g = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getGeometryNoCopy();
-        Envelope env = g.getEnvelopeInternal();
+        Envelope env = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getEnvelopeNoCopy();
         return new SpatialKey(row.getKey(),
                 (float) env.getMinX(), (float) env.getMaxX(),
                 (float) env.getMinY(), (float) env.getMaxY());

h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java

@@ -33,7 +33,6 @@ import org.h2.value.ValueGeometry;
 import org.h2.value.ValueLong;
 import org.h2.value.ValueNull;
 import org.locationtech.jts.geom.Envelope;
-import org.locationtech.jts.geom.Geometry;
 
 /**
  * This is an index based on a MVRTreeMap.
@@ -223,8 +222,7 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
         if (v == ValueNull.INSTANCE) {
             return new SpatialKey(row.getKey());
         }
-        Geometry g = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getGeometryNoCopy();
-        Envelope env = g.getEnvelopeInternal();
+        Envelope env = ((ValueGeometry) v.convertTo(Value.GEOMETRY)).getEnvelopeNoCopy();
         return new SpatialKey(row.getKey(),
                 (float) env.getMinX(), (float) env.getMaxX(),
                 (float) env.getMinY(), (float) env.getMaxY());

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

@@ -52,6 +52,11 @@ public class ValueGeometry extends Value {
      */
     private Geometry geometry;
 
+    /**
+     * The envelope of the value. Calculated only on request.
+     */
+    private Envelope envelope;
+
     /**
      * Create a new geometry objects.
      *
@@ -205,6 +210,18 @@ public class ValueGeometry extends Value {
         return 0;
     }
 
+    /**
+     * Return an envelope of this geometry. Do not modify the returned value.
+     *
+     * @return envelope of this geometry
+     */
+    public Envelope getEnvelopeNoCopy() {
+        if (envelope == null) {
+            envelope = getGeometryNoCopy().getEnvelopeInternal();
+        }
+        return envelope;
+    }
+
     /**
      * Test if this geometry envelope intersects with the other geometry
      * envelope.
@@ -213,9 +230,7 @@ public class ValueGeometry extends Value {
      * @return true if the two overlap
      */
     public boolean intersectsBoundingBox(ValueGeometry r) {
-        // the Geometry object caches the envelope
-        return getGeometryNoCopy().getEnvelopeInternal().intersects(
-                r.getGeometryNoCopy().getEnvelopeInternal());
+        return getEnvelopeNoCopy().intersects(r.getEnvelopeNoCopy());
     }
 
     /**
@@ -226,8 +241,8 @@ public class ValueGeometry extends Value {
      */
     public Value getEnvelopeUnion(ValueGeometry r) {
         GeometryFactory gf = new GeometryFactory();
-        Envelope mergedEnvelope = new Envelope(getGeometryNoCopy().getEnvelopeInternal());
-        mergedEnvelope.expandToInclude(r.getGeometryNoCopy().getEnvelopeInternal());
+        Envelope mergedEnvelope = new Envelope(getEnvelopeNoCopy());
+        mergedEnvelope.expandToInclude(r.getEnvelopeNoCopy());
         return get(gf.toGeometry(mergedEnvelope));
     }