Create a geoparquet module and add dependencies

baremaps-core/pom.xml

@@ -82,6 +82,10 @@ limitations under the License.
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-data</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-geoparquet</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-maplibre</artifactId>

baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufDataSchema.java

@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
+import java.util.List;
 import org.apache.baremaps.data.schema.DataSchema;
 import org.apache.baremaps.data.schema.DataTable;
 import org.apache.baremaps.data.schema.DataTableException;
@@ -40,7 +40,7 @@ public FlatGeoBufDataSchema(Path directory) {
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> list() throws DataTableException {
+  public List<String> list() throws DataTableException {
     try (var files = Files.list(directory)) {
       return files
           .filter(file -> file.toString().toLowerCase().endsWith(".fgb"))
@@ -67,7 +67,12 @@ public DataTable get(String name) throws DataTableException {
   public void add(DataTable table) throws DataTableException {
     var filename = table.rowType().name();
     filename = filename.endsWith(".fgb") ? filename : filename + ".fgb";
-    var path = directory.resolve(filename);
+    add(filename, table);
+  }
+
+  @Override
+  public void add(String name, DataTable table) throws DataTableException {
+    var path = directory.resolve(name);
     try {
       Files.deleteIfExists(path);
       Files.createFile(path);

baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageDataSchema.java

@@ -19,7 +19,7 @@
 
 
 import java.nio.file.Path;
-import java.util.Collection;
+import java.util.List;
 import mil.nga.geopackage.GeoPackage;
 import mil.nga.geopackage.GeoPackageManager;
 import org.apache.baremaps.data.schema.DataSchema;
@@ -54,7 +54,7 @@ public void close() throws Exception {
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> list() throws DataTableException {
+  public List<String> list() throws DataTableException {
     return geoPackage.getFeatureTables();
   }
 
@@ -70,7 +70,12 @@ public DataTable get(String name) throws DataTableException {
    * {@inheritDoc}
    */
   @Override
-  public void add(DataTable value) throws DataTableException {
+  public void add(DataTable table) throws DataTableException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void add(String name, DataTable table) throws DataTableException {
     throw new UnsupportedOperationException();
   }
 

baremaps-core/src/main/java/org/apache/baremaps/storage/geoparquet/GeoParquetDataSchema.java

@@ -0,0 +1,65 @@
+/*
+ * 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.baremaps.storage.geoparquet;
+
+
+import java.net.URI;
+import java.util.List;
+import org.apache.baremaps.data.schema.DataSchema;
+import org.apache.baremaps.data.schema.DataTable;
+import org.apache.baremaps.data.schema.DataTableException;
+
+/**
+ * A schema corresponding to a GeoParquet database.
+ */
+public class GeoParquetDataSchema implements DataSchema {
+
+  private final URI uri;
+
+  public GeoParquetDataSchema(URI uri) {
+    this.uri = uri;
+  }
+
+  @Override
+  public List<String> list() throws DataTableException {
+    return List.of(uri.toString());
+  }
+
+  @Override
+  public DataTable get(String name) throws DataTableException {
+    if (!uri.toString().equals(name)) {
+      throw new DataTableException("Table not found");
+    }
+    return new GeoParquetDataTable(uri);
+  }
+
+  @Override
+  public void add(DataTable table) throws DataTableException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void add(String name, DataTable table) throws DataTableException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void remove(String name) throws DataTableException {
+    throw new UnsupportedOperationException();
+  }
+}

baremaps-core/src/main/java/org/apache/baremaps/storage/geoparquet/GeoParquetDataTable.java

@@ -0,0 +1,109 @@
+/*
+ * 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.baremaps.storage.geoparquet;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import org.apache.baremaps.data.schema.*;
+import org.apache.baremaps.geoparquet.GeoParquetException;
+import org.apache.baremaps.geoparquet.GeoParquetReader;
+import org.apache.baremaps.geoparquet.data.GeoParquetGroup.Schema;
+
+public class GeoParquetDataTable implements DataTable {
+
+  private final URI path;
+
+  private DataRowType rowType;
+
+  private GeoParquetReader reader;
+
+  public GeoParquetDataTable(URI path) {
+    this.path = path;
+  }
+
+  private GeoParquetReader reader() {
+    if (reader == null) {
+      reader = new GeoParquetReader(path);
+    }
+    return reader;
+  }
+
+  @Override
+  public long size() {
+    try {
+      return reader().size();
+    } catch (URISyntaxException e) {
+      throw new GeoParquetException("Fail to access size from reader", e);
+    }
+  }
+
+  @Override
+  public Iterator<DataRow> iterator() {
+    return parallelStream().iterator();
+  }
+
+  @Override
+  public Spliterator<DataRow> spliterator() {
+    return parallelStream().spliterator();
+  }
+
+  @Override
+  public Stream<DataRow> stream() {
+    return parallelStream().sequential();
+  }
+
+  @Override
+  public Stream<DataRow> parallelStream() {
+    try {
+      return reader().read().map(group -> new DataRowImpl(
+          GeoParquetTypeConversion.asDataRowType(path.toString(), group.getSchema()),
+          GeoParquetTypeConversion.asDataRow(group)));
+    } catch (IOException | URISyntaxException e) {
+      throw new GeoParquetException("Fail to read() the reader", e);
+    }
+  }
+
+  @Override
+  public void clear() {
+    if (reader != null) {
+      reader = null;
+    }
+
+    if (rowType != null) {
+      rowType = null;
+    }
+  }
+
+  @Override
+  public DataRowType rowType() {
+    if (rowType == null) {
+      try {
+        Schema schema = reader().getGeoParquetSchema();
+        rowType = GeoParquetTypeConversion.asDataRowType(path.toString(), schema);
+        return rowType;
+      } catch (URISyntaxException e) {
+        throw new GeoParquetException("Fail toe get the schema.", e);
+      }
+    }
+    return rowType;
+  }
+}

baremaps-core/src/main/java/org/apache/baremaps/storage/geoparquet/GeoParquetTypeConversion.java

@@ -0,0 +1,77 @@
+/*
+ * 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.baremaps.storage.geoparquet;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.baremaps.data.schema.DataColumn;
+import org.apache.baremaps.data.schema.DataColumn.Type;
+import org.apache.baremaps.data.schema.DataColumnImpl;
+import org.apache.baremaps.data.schema.DataRowType;
+import org.apache.baremaps.data.schema.DataRowTypeImpl;
+import org.apache.baremaps.geoparquet.data.GeoParquetGroup;
+import org.apache.baremaps.geoparquet.data.GeoParquetGroup.Field;
+import org.apache.baremaps.geoparquet.data.GeoParquetGroup.Schema;
+
+public class GeoParquetTypeConversion {
+
+  private GeoParquetTypeConversion() {}
+
+  public static DataRowType asDataRowType(String table, Schema schema) {
+    List<DataColumn> fields = schema.fields().stream()
+        .map(field -> (DataColumn) new DataColumnImpl(field.name(), asDataRowType(field.type())))
+        .toList();
+    return new DataRowTypeImpl(table, fields);
+  }
+
+  public static Type asDataRowType(GeoParquetGroup.Type type) {
+    return switch (type) {
+      case BINARY -> Type.BYTE_ARRAY;
+      case BOOLEAN -> Type.BOOLEAN;
+      case INTEGER -> Type.INTEGER;
+      case INT96, LONG -> Type.LONG;
+      case FLOAT -> Type.FLOAT;
+      case DOUBLE -> Type.DOUBLE;
+      case STRING -> Type.STRING;
+      case GEOMETRY -> Type.GEOMETRY;
+      case GROUP -> null;
+    };
+  }
+
+  public static List<Object> asDataRow(GeoParquetGroup group) {
+    List<Object> values = new ArrayList<>();
+    Schema schema = group.getSchema();
+    List<Field> fields = schema.fields();
+    for (int i = 0; i < fields.size(); i++) {
+      Field field = fields.get(i);
+      field.type();
+      switch (field.type()) {
+        case BINARY -> values.add(group.getBinaryValue(i).getBytes());
+        case BOOLEAN -> values.add(group.getBooleanValue(i));
+        case INTEGER -> values.add(group.getIntegerValue(i));
+        case INT96, LONG -> values.add(group.getLongValue(i));
+        case FLOAT -> values.add(group.getFloatValue(i));
+        case DOUBLE -> values.add(group.getDoubleValue(i));
+        case STRING -> values.add(group.getStringValue(i));
+        case GEOMETRY -> values.add(group.getGeometryValue(i));
+        case GROUP -> values.add(null); // TODO: values.add(asDataRow(group.getGroupValue(i)));
+      }
+    }
+    return values;
+  }
+}

baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataSchema.java

@@ -21,7 +21,6 @@
 import de.bytefish.pgbulkinsert.pgsql.handlers.*;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -42,6 +41,7 @@
  */
 public class PostgresDataSchema implements DataSchema {
 
+  public static final String REGEX = "[^a-zA-Z0-9]";
   private static final Logger logger = LoggerFactory.getLogger(PostgresDataSchema.class);
 
   private static final String[] TYPES = new String[] {"TABLE", "VIEW"};
@@ -61,7 +61,7 @@ public PostgresDataSchema(DataSource dataSource) {
    * {@inheritDoc}
    */
   @Override
-  public Collection<String> list() throws DataTableException {
+  public List<String> list() throws DataTableException {
     DatabaseMetadata metadata = new DatabaseMetadata(dataSource);
     return metadata.getTableMetaData(null, "public", null, TYPES).stream()
         .map(table -> table.table().tableName())
@@ -74,7 +74,8 @@ public Collection<String> list() throws DataTableException {
   @Override
   public DataTable get(String name) throws DataTableException {
     var databaseMetadata = new DatabaseMetadata(dataSource);
-    var tableMetadata = databaseMetadata.getTableMetaData(null, null, name, TYPES)
+    var postgresName = name.replaceAll(REGEX, "_").toLowerCase();
+    var tableMetadata = databaseMetadata.getTableMetaData(null, null, postgresName, TYPES)
         .stream().findFirst();
     if (tableMetadata.isEmpty()) {
       throw new DataTableException("Table " + name + " does not exist.");
@@ -88,14 +89,21 @@ public DataTable get(String name) throws DataTableException {
    */
   @Override
   public void add(DataTable table) {
+    var name = table.rowType().name().replaceAll(REGEX, "_").toLowerCase();
+    add(name, table);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void add(String name, DataTable table) {
     try (var connection = dataSource.getConnection()) {
-      var regex = "[^a-zA-Z0-9]";
-      var name = table.rowType().name().replaceAll(regex, "_").toLowerCase();
       var mapping = new HashMap<String, String>();
       var properties = new ArrayList<DataColumn>();
       for (DataColumn column : table.rowType().columns()) {
         if (PostgresTypeConversion.typeToName.containsKey(column.type())) {
-          var columnName = column.name().replaceAll(regex, "_").toLowerCase();
+          var columnName = column.name().replaceAll(REGEX, "_").toLowerCase();
           mapping.put(columnName, column.name());
           properties.add(new DataColumnImpl(columnName, column.type()));
         }