This is an automated email from the ASF dual-hosted git repository.
imbruced pushed a commit to branch feature/geopackage-reader
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/feature/geopackage-reader by
this push:
new 0e2de793e Add other missing data types.
0e2de793e is described below
commit 0e2de793e143ecfb5b17f91fd7e2d2827e1cd296
Author: pawelkocinski <[email protected]>
AuthorDate: Tue Sep 24 18:33:52 2024 +0200
Add other missing data types.
---
.../geopackage/model}/GeoPackageLoadOptions.scala | 3 +--
.../geopackage/model/PartitionOptions.scala | 2 --
.../datasources/geopackage/model/TileMatrix.scala | 14 +++++------
.../geopackage/model/TileMetadata.scala | 4 +--
.../geopackage/GeoPackageDataSource.scala | 2 +-
.../geopackage/GeoPackageMetadataReader.scala | 21 ----------------
.../GeoPackagePartitionReaderFactory.scala | 2 +-
.../datasources/geopackage/GeoPackageScan.scala | 1 +
.../geopackage/GeoPackageScanBuilder.scala | 1 +
.../datasources/geopackage/GeoPackageTable.scala | 1 +
.../geopackage/GeoPackageDataSource.scala | 2 +-
.../geopackage/GeoPackageLoadOptions.scala | 29 ----------------------
.../geopackage/GeoPackageMetadataReader.scala | 21 ----------------
.../GeoPackagePartitionReaderFactory.scala | 2 +-
.../datasources/geopackage/GeoPackageScan.scala | 1 +
.../geopackage/GeoPackageScanBuilder.scala | 1 +
.../datasources/geopackage/GeoPackageTable.scala | 1 +
.../geopackage/GeoPackageDataSource.scala | 2 +-
.../geopackage/GeoPackageLoadOptions.scala | 29 ----------------------
.../geopackage/GeoPackageMetadataReader.scala | 21 ----------------
.../GeoPackagePartitionReaderFactory.scala | 2 +-
.../datasources/geopackage/GeoPackageScan.scala | 1 +
.../geopackage/GeoPackageScanBuilder.scala | 1 +
.../datasources/geopackage/GeoPackageTable.scala | 1 +
24 files changed, 25 insertions(+), 140 deletions(-)
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageLoadOptions.scala
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/GeoPackageLoadOptions.scala
similarity index 89%
rename from
spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageLoadOptions.scala
rename to
spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/GeoPackageLoadOptions.scala
index 6e661bebf..71bc7a7bc 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageLoadOptions.scala
+++
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/GeoPackageLoadOptions.scala
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sedona.sql.datasources.geopackage
+package org.apache.sedona.sql.datasources.geopackage.model
-import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageField
import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
case class GeoPackageLoadOptions(
diff --git
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/PartitionOptions.scala
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/PartitionOptions.scala
index 2a9d18082..be4d42319 100644
---
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/PartitionOptions.scala
+++
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/PartitionOptions.scala
@@ -18,8 +18,6 @@
*/
package org.apache.sedona.sql.datasources.geopackage.model
-import org.apache.sedona.sql.datasources.geopackage.GeoPackageLoadOptions
-
case class PartitionOptions(
loadOptions: GeoPackageLoadOptions,
columns: Seq[GeoPackageField],
diff --git
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMatrix.scala
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMatrix.scala
index a947b1a78..fc13c4536 100644
---
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMatrix.scala
+++
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMatrix.scala
@@ -19,10 +19,10 @@
package org.apache.sedona.sql.datasources.geopackage.model
case class TileMatrix(
- zoom_level: Int,
- matrix_width: Int,
- matrix_height: Int,
- tile_width: Int,
- tile_height: Int,
- pixel_x_size: Double,
- pixel_y_size: Double)
+ zoomLevel: Int,
+ matrixWidth: Int,
+ matrixHeight: Int,
+ tileWidth: Int,
+ tileHeight: Int,
+ pixelXSize: Double,
+ pixelYSize: Double)
diff --git
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMetadata.scala
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMetadata.scala
index eb0856989..278f513cd 100644
---
a/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMetadata.scala
+++
b/spark/common/src/main/scala/org/apache/sedona/sql/datasources/geopackage/model/TileMetadata.scala
@@ -50,8 +50,8 @@ case class TileMetadata(
def getEnvelope(tileRowMetadata: TileRowMetadata): Envelope = {
val tileMatrix = zoomLevelMetadata(tileRowMetadata.zoomLevel)
- val numberOfRows = tileMatrix.matrix_height
- val numberOfColumns = tileMatrix.matrix_width
+ val numberOfRows = tileMatrix.matrixHeight
+ val numberOfColumns = tileMatrix.matrixWidth
val columnNumber = tileRowMetadata.tileColumn
val rowNumber = tileRowMetadata.tileRow
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageDataSource.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageDataSource.scala
index 1e0aedaaa..6a87f4df0 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageDataSource.scala
+++
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageDataSource.scala
@@ -19,7 +19,7 @@
package org.apache.sedona.sql.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.TableType
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
TableType}
import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
import org.apache.spark.sql.connector.catalog.Table
import org.apache.spark.sql.execution.datasources.FileFormat
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageMetadataReader.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageMetadataReader.scala
deleted file mode 100644
index 84eb447a2..000000000
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageMetadataReader.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sedona.sql.datasources.geopackage
-
-class GeoPackageMetadataReader {}
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
index d549ad17f..af61740eb 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
+++
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
@@ -19,7 +19,7 @@
package org.apache.sedona.sql.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.{PartitionOptions,
TableType}
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
PartitionOptions, TableType}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.connector.read.{InputPartition, PartitionReader,
PartitionReaderFactory}
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
index 1f63813ce..6a6da90ec 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
+++
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
@@ -18,6 +18,7 @@
*/
package org.apache.sedona.sql.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.expressions.Expression
import org.apache.spark.sql.connector.read.PartitionReaderFactory
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScanBuilder.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScanBuilder.scala
index 529e5cd22..88f50535b 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScanBuilder.scala
+++
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScanBuilder.scala
@@ -18,6 +18,7 @@
*/
package org.apache.sedona.sql.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.Scan
import org.apache.spark.sql.execution.datasources.PartitioningAwareFileIndex
diff --git
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageTable.scala
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageTable.scala
index 43136fd9f..b7e101e4a 100644
---
a/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageTable.scala
+++
b/spark/spark-3.3/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageTable.scala
@@ -19,6 +19,7 @@
package org.apache.sedona.sql.datasources.geopackage
import org.apache.hadoop.fs.FileStatus
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.ScanBuilder
import org.apache.spark.sql.connector.write.{LogicalWriteInfo, WriteBuilder}
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
index 08c52ecdb..590ad6ea5 100644
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
+++
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
@@ -19,7 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.TableType
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
TableType}
import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
import org.apache.spark.sql.connector.catalog.Table
import org.apache.spark.sql.execution.datasources.FileFormat
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
deleted file mode 100644
index 1c0090ae3..000000000
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.spark.sql.execution.datasources.geopackage
-
-import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageField
-import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
-
-case class GeoPackageLoadOptions(
- path: String,
- showMetadata: Boolean,
- tableName: String,
- tableType: TableType,
- fields: Seq[GeoPackageField])
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
deleted file mode 100644
index 315fb58ae..000000000
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.spark.sql.execution.datasources.geopackage
-
-class GeoPackageMetadataReader {}
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
index 62ebea5eb..23e355ad1 100644
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
+++
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
@@ -19,7 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.{PartitionOptions,
TableType}
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
PartitionOptions, TableType}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.connector.read.{InputPartition, PartitionReader,
PartitionReaderFactory}
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
index 625c979ca..892385ba1 100644
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
+++
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
@@ -18,6 +18,7 @@
*/
package org.apache.spark.sql.execution.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.expressions.Expression
import org.apache.spark.sql.connector.read.PartitionReaderFactory
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
index 9d878c47e..2d1b4b1ad 100644
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
+++
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
@@ -18,6 +18,7 @@
*/
package org.apache.spark.sql.execution.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.Scan
import org.apache.spark.sql.execution.datasources.PartitioningAwareFileIndex
diff --git
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
index 808e8d2f6..e926fd2e2 100644
---
a/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
+++
b/spark/spark-3.4/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
@@ -19,6 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import org.apache.hadoop.fs.FileStatus
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.ScanBuilder
import org.apache.spark.sql.connector.write.{LogicalWriteInfo, WriteBuilder}
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
index 08c52ecdb..590ad6ea5 100644
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
+++
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageDataSource.scala
@@ -19,7 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.TableType
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
TableType}
import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
import org.apache.spark.sql.connector.catalog.Table
import org.apache.spark.sql.execution.datasources.FileFormat
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
deleted file mode 100644
index 1c0090ae3..000000000
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageLoadOptions.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.spark.sql.execution.datasources.geopackage
-
-import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageField
-import org.apache.sedona.sql.datasources.geopackage.model.TableType.TableType
-
-case class GeoPackageLoadOptions(
- path: String,
- showMetadata: Boolean,
- tableName: String,
- tableType: TableType,
- fields: Seq[GeoPackageField])
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
deleted file mode 100644
index 315fb58ae..000000000
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageMetadataReader.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.spark.sql.execution.datasources.geopackage
-
-class GeoPackageMetadataReader {}
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
index 62ebea5eb..23e355ad1 100644
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
+++
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackagePartitionReaderFactory.scala
@@ -19,7 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import
org.apache.sedona.sql.datasources.geopackage.connection.GeoPackageConnectionManager
-import org.apache.sedona.sql.datasources.geopackage.model.{PartitionOptions,
TableType}
+import
org.apache.sedona.sql.datasources.geopackage.model.{GeoPackageLoadOptions,
PartitionOptions, TableType}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.connector.read.{InputPartition, PartitionReader,
PartitionReaderFactory}
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
index 625c979ca..892385ba1 100644
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
+++
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScan.scala
@@ -18,6 +18,7 @@
*/
package org.apache.spark.sql.execution.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.expressions.Expression
import org.apache.spark.sql.connector.read.PartitionReaderFactory
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
index 9d878c47e..2d1b4b1ad 100644
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
+++
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageScanBuilder.scala
@@ -18,6 +18,7 @@
*/
package org.apache.spark.sql.execution.datasources.geopackage
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.Scan
import org.apache.spark.sql.execution.datasources.PartitioningAwareFileIndex
diff --git
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
index 808e8d2f6..e926fd2e2 100644
---
a/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
+++
b/spark/spark-3.5/src/main/scala/org/apache/spark/sql/execution/datasources/geopackage/GeoPackageTable.scala
@@ -19,6 +19,7 @@
package org.apache.spark.sql.execution.datasources.geopackage
import org.apache.hadoop.fs.FileStatus
+import org.apache.sedona.sql.datasources.geopackage.model.GeoPackageLoadOptions
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connector.read.ScanBuilder
import org.apache.spark.sql.connector.write.{LogicalWriteInfo, WriteBuilder}
