fix: simplify the implementation, remove BBox implementation

Author: furqaankhan

common/src/main/java/org/apache/sedona/common/Functions.java

@@ -106,22 +106,38 @@ public static Geometry expand(Geometry geometry, double deltaX, double deltaY, d
       return geometry;
     }
 
-    BBox bBox = new BBox(geometry);
-    double minX = bBox.getStartLon() - deltaX;
-    double maxX = bBox.getEndLon() + deltaX;
-    double minY = bBox.getStartLat() - deltaY;
-    double maxY = bBox.getEndLat() + deltaY;
-    double minZ, maxZ;
+    Coordinate[] coordinates = geometry.getCoordinates();
+    double minX = Double.MAX_VALUE;
+    double maxX = -Double.MAX_VALUE;
+    double minY = Double.MAX_VALUE;
+    double maxY = -Double.MAX_VALUE;
+    double minZ = Double.MAX_VALUE;
+    double maxZ = -Double.MAX_VALUE;
+
+    for (int i = 0; i < coordinates.length; i++) {
+      minX = Math.min(minX, coordinates[i].x);
+      maxX = Math.max(maxX, coordinates[i].x);
+      minY = Math.min(minY, coordinates[i].y);
+      maxY = Math.max(maxY, coordinates[i].y);
+      minZ = Math.min(minZ, coordinates[i].z);
+      maxZ = Math.max(maxZ, coordinates[i].z);
+    }
+
+    minX = minX - deltaX;
+    maxX = maxX + deltaX;
+    minY = minY - deltaY;
+    maxY = maxY + deltaY;
+
     if (Functions.hasZ(geometry)) {
-      minZ = bBox.getMinZ() - deltaZ;
-      maxZ = bBox.getMaxZ() + deltaZ;
-      Coordinate[] coordinates = new Coordinate[5];
-      coordinates[0] = new Coordinate(minX, minY, minZ);
-      coordinates[1] = new Coordinate(minX, maxY, minZ);
-      coordinates[2] = new Coordinate(maxX, maxY, maxZ);
-      coordinates[3] = new Coordinate(maxX, minY, maxZ);
-      coordinates[4] = coordinates[0];
-      return geometry.getFactory().createPolygon(coordinates);
+      minZ = minZ - deltaZ;
+      maxZ = maxZ + deltaZ;
+      Coordinate[] newCoords = new Coordinate[5];
+      newCoords[0] = new Coordinate(minX, minY, minZ);
+      newCoords[1] = new Coordinate(minX, maxY, minZ);
+      newCoords[2] = new Coordinate(maxX, maxY, maxZ);
+      newCoords[3] = new Coordinate(maxX, minY, maxZ);
+      newCoords[4] = newCoords[0];
+      return geometry.getFactory().createPolygon(newCoords);
     }
     Geometry result = Constructors.polygonFromEnvelope(minX, minY, maxX, maxY);
     result.setSRID(geometry.getSRID());

common/src/main/java/org/apache/sedona/common/utils/BBox.java

@@ -25,8 +25,6 @@ public class BBox {
   double endLon;
   double startLat;
   double endLat;
-  double minZ;
-  double maxZ;
 
   static GeometryFactory geometryFactory = new GeometryFactory();
 
@@ -37,64 +35,6 @@ public BBox(double startLon, double endLon, double startLat, double endLat) {
     this.endLat = endLat;
   }
 
-  public BBox(Geometry geom) {
-    startLon = Double.MAX_VALUE;
-    endLon = -Double.MAX_VALUE;
-    startLat = Double.MAX_VALUE;
-    endLat = -Double.MAX_VALUE;
-    minZ = Double.MAX_VALUE;
-    maxZ = -Double.MAX_VALUE;
-    processEnvelope(geom);
-  }
-
-  private void processEnvelope(Geometry geom) {
-    if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_POINT)) {
-      processEnvelopePoint((Point) geom);
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_LINESTRING)) {
-      processEnvelopeCoordinate(geom.getCoordinates());
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_POLYGON)) {
-      processEnvelopeCoordinate(((Polygon) geom).getExteriorRing().getCoordinates());
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_MULTIPOINT)) {
-      for (int i = 0; i < geom.getNumGeometries(); i++) {
-        processEnvelope(geom.getGeometryN(i));
-      }
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_MULTILINESTRING)) {
-      for (int i = 0; i < geom.getNumGeometries(); i++) {
-        processEnvelope(geom.getGeometryN(i));
-      }
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_MULTIPOLYGON)) {
-      for (int i = 0; i < geom.getNumGeometries(); i++) {
-        processEnvelope(geom.getGeometryN(i));
-      }
-    } else if (geom.getClass().getSimpleName().equals(Geometry.TYPENAME_GEOMETRYCOLLECTION)) {
-      for (int i = 0; i < geom.getNumGeometries(); i++) {
-        processEnvelope(geom.getGeometryN(i));
-      }
-    } else {
-      throw new RuntimeException("Unknown geometry type: " + geom.getGeometryType());
-    }
-  }
-
-  private void processEnvelopeCoordinate(Coordinate[] coords) {
-    for (Coordinate coord : coords) {
-      startLon = Math.min(startLon, coord.x);
-      endLon = Math.max(endLon, coord.x);
-      startLat = Math.min(startLat, coord.y);
-      endLat = Math.max(endLat, coord.y);
-      minZ = Math.min(minZ, coord.z);
-      maxZ = Math.max(maxZ, coord.z);
-    }
-  }
-
-  private void processEnvelopePoint(Point geom) {
-    startLon = Math.min(startLon, geom.getCoordinates()[0].getX());
-    endLon = Math.max(endLon, geom.getCoordinates()[0].getX());
-    startLat = Math.min(startLat, geom.getCoordinates()[0].getY());
-    endLat = Math.max(endLat, geom.getCoordinates()[0].getY());
-    minZ = Math.min(minZ, geom.getCoordinates()[0].getZ());
-    maxZ = Math.max(maxZ, geom.getCoordinates()[0].getZ());
-  }
-
   public BBox(BBox other) {
     this(other.startLon, other.endLon, other.startLat, other.endLat);
   }
@@ -115,28 +55,4 @@ public Polygon toPolygon() {
           new Coordinate(this.startLon, this.startLat)
         });
   }
-
-  public double getStartLon() {
-    return startLon;
-  }
-
-  public double getEndLon() {
-    return endLon;
-  }
-
-  public double getStartLat() {
-    return startLat;
-  }
-
-  public double getEndLat() {
-    return endLat;
-  }
-
-  public double getMinZ() {
-    return minZ;
-  }
-
-  public double getMaxZ() {
-    return maxZ;
-  }
 }