This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch calcite
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/calcite by this push:
new 25505cd8 Revert some changes made during the refactoring by mistake
25505cd8 is described below
commit 25505cd827b69eead87b19e3901892fe6b17befa
Author: Bertil Chapuis <[email protected]>
AuthorDate: Fri Jun 23 11:42:42 2023 +0200
Revert some changes made during the refactoring by mistake
---
.../main/java/org/apache/baremaps/cli/Options.java | 5 +-
.../baremaps/collection/store/DataColumnType.java | 29 ++++--
.../baremaps/collection/store/DataRowImpl.java | 10 +--
.../baremaps/collection/store/DataSchemaImpl.java | 18 ++--
.../store/DataTableGeometryTransformer.java | 12 +--
.../baremaps/collection/store/DataTableImpl.java | 24 ++---
.../baremaps/collection/type/RowDataType.java | 22 ++---
.../org/apache/baremaps/iploc/IpLocRepository.java | 8 +-
.../baremaps/openstreetmap/model/Change.java | 4 +-
.../baremaps/openstreetmap/model/Member.java | 4 +-
.../postgres/PostgresHeaderRepository.java | 2 +-
.../storage/flatgeobuf/FlatGeoBufDataTable.java | 28 +++---
.../flatgeobuf/internal/TableConversions.java | 10 +--
.../storage/geopackage/GeoPackageDataTable.java | 22 ++---
.../storage/postgres/PostgresDataStore.java | 46 +++++-----
.../storage/postgres/PostgresDataTable.java | 52 +++++------
.../shapefile/internal/DbaseByteReader.java | 6 +-
.../shapefile/internal/ShapefileByteReader.java | 34 +++----
.../shapefile/internal/ShapefileGeometryType.java | 19 +++-
.../shapefile/internal/ShapefileInputStream.java | 14 +--
.../shapefile/internal/ShapefileReader.java | 6 +-
.../vectortile/expression/Expressions.java | 100 ++++++++++-----------
.../baremaps/workflow/tasks/ImportGeoPackage.java | 4 +-
.../org/apache/baremaps/storage/MockDataTable.java | 24 ++---
.../src/test/resources/queries/schema.sql | 2 +-
.../main/resources/initialize_ogcapi_tables.sql | 6 +-
.../main/resources/initialize_studio_tables.sql | 4 +-
baremaps-renderer/assets/report-template.html | 4 +-
.../src/main/resources/assets/viewer.html | 10 +--
.../src/main/resources/geocoder/index.html | 32 +++----
.../src/main/resources/iploc/index.html | 32 +++----
codestyle.xml | 2 +-
32 files changed, 313 insertions(+), 282 deletions(-)
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Options.java
b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Options.java
index eff067f2..4b33584f 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Options.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Options.java
@@ -19,7 +19,10 @@ import picocli.CommandLine.Option;
public class Options {
public enum LogLevel {
- DEBUG, INFO, TRACE, ERROR
+ DEBUG,
+ INFO,
+ TRACE,
+ ERROR
}
@Option(names = {"--log-level"}, paramLabel = "LOG_LEVEL", description =
{"The log level."})
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataColumnType.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataColumnType.java
index 301457cc..92d05ece 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataColumnType.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataColumnType.java
@@ -15,12 +15,23 @@ package org.apache.baremaps.collection.store;
import org.locationtech.jts.geom.*;
public enum DataColumnType {
- BOOLEAN(Boolean.class), BYTE(Byte.class), SHORT(Short.class),
INTEGER(Integer.class), LONG(
- Long.class), FLOAT(Float.class), DOUBLE(Double.class), STRING(
- String.class), BYTES(byte[].class), GEOMETRY(Geometry.class), POINT(
- Point.class), LINESTRING(LineString.class),
POLYGON(Polygon.class), MULTIPOINT(
- MultiPoint.class), MULTILINESTRING(MultiLineString.class),
MULTIPOLYGON(
- MultiPolygon.class),
GEOMETRYCOLLECTION(GeometryCollection.class);
+ BOOLEAN(Boolean.class),
+ BYTE(Byte.class),
+ SHORT(Short.class),
+ INTEGER(Integer.class),
+ LONG(Long.class),
+ FLOAT(Float.class),
+ DOUBLE(Double.class),
+ STRING(String.class),
+ BYTES(byte[].class),
+ GEOMETRY(Geometry.class),
+ POINT(Point.class),
+ LINESTRING(LineString.class),
+ POLYGON(Polygon.class),
+ MULTIPOINT(MultiPoint.class),
+ MULTILINESTRING(MultiLineString.class),
+ MULTIPOLYGON(MultiPolygon.class),
+ GEOMETRYCOLLECTION(GeometryCollection.class);
private Class<?> type;
@@ -33,9 +44,9 @@ public enum DataColumnType {
}
public DataColumnType valueOf(Class<?> type) {
- for (DataColumnType dataColumnType : DataColumnType.values()) {
- if (dataColumnType.getType().equals(type)) {
- return dataColumnType;
+ for (DataColumnType columnType : DataColumnType.values()) {
+ if (columnType.getType().equals(type)) {
+ return columnType;
}
}
throw new IllegalArgumentException("Unsupported type " + type);
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataRowImpl.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataRowImpl.java
index f8a3afaf..307dddf6 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataRowImpl.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataRowImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
/**
* A row in a table.
*/
-public record DataRowImpl(DataSchema dataSchema, List values) implements
DataRow {
+public record DataRowImpl(DataSchema schema, List values) implements DataRow {
/**
* {@inheritDoc}
@@ -32,8 +32,8 @@ public record DataRowImpl(DataSchema dataSchema, List values)
implements DataRow
*/
@Override
public Object get(String column) {
- for (int i = 0; i < dataSchema().columns().size(); i++) {
- if (dataSchema().columns().get(i).name().equals(column)) {
+ for (int i = 0; i < schema().columns().size(); i++) {
+ if (schema.columns().get(i).name().equals(column)) {
return values.get(i);
}
}
@@ -53,8 +53,8 @@ public record DataRowImpl(DataSchema dataSchema, List values)
implements DataRow
*/
@Override
public void set(String column, Object value) {
- for (int i = 0; i < dataSchema().columns().size(); i++) {
- if (dataSchema().columns().get(i).name().equals(column)) {
+ for (int i = 0; i < schema.columns().size(); i++) {
+ if (schema.columns().get(i).name().equals(column)) {
values.set(i, value);
return;
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataSchemaImpl.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataSchemaImpl.java
index e0cb259a..0026062e 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataSchemaImpl.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataSchemaImpl.java
@@ -24,7 +24,7 @@ public class DataSchemaImpl implements DataSchema {
private final String name;
- private final List<DataColumn> dataColumns;
+ private final List<DataColumn> columns;
private final Map<String, Integer> index;
@@ -32,14 +32,14 @@ public class DataSchemaImpl implements DataSchema {
* Constructs a schema.
*
* @param name the name of the schema
- * @param dataColumns the columns of the schema
+ * @param columns the columns of the schema
*/
- public DataSchemaImpl(String name, List<DataColumn> dataColumns) {
+ public DataSchemaImpl(String name, List<DataColumn> columns) {
this.name = name;
- this.dataColumns = dataColumns;
+ this.columns = columns;
this.index = new HashMap<>();
- for (int i = 0; i < dataColumns.size(); i++) {
- index.put(dataColumns.get(i).name(), i);
+ for (int i = 0; i < columns.size(); i++) {
+ index.put(columns.get(i).name(), i);
}
}
@@ -56,7 +56,7 @@ public class DataSchemaImpl implements DataSchema {
*/
@Override
public List<DataColumn> columns() {
- return dataColumns;
+ return columns;
}
/**
@@ -64,8 +64,8 @@ public class DataSchemaImpl implements DataSchema {
*/
@Override
public DataRow createRow() {
- var values = new ArrayList<>(dataColumns.size());
- for (int i = 0; i < dataColumns.size(); i++) {
+ var values = new ArrayList<>(columns.size());
+ for (int i = 0; i < columns.size(); i++) {
values.add(null);
}
return new DataRowImpl(this, values);
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableGeometryTransformer.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableGeometryTransformer.java
index ca607794..523dd7bc 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableGeometryTransformer.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableGeometryTransformer.java
@@ -42,18 +42,18 @@ public class DataTableGeometryTransformer implements
Function<DataRow, DataRow>
* {@inheritDoc}
*/
@Override
- public DataRow apply(DataRow dataRow) {
+ public DataRow apply(DataRow row) {
var columns = dataTable.schema()
.columns().stream()
.filter(column -> column.type().isAssignableFrom(Geometry.class))
.toList();
- for (DataColumn dataColumn : columns) {
- var name = dataColumn.name();
- var geometry = (Geometry) dataRow.get(name);
+ for (DataColumn column : columns) {
+ var name = column.name();
+ var geometry = (Geometry) row.get(name);
if (geometry != null) {
- dataRow.set(name, geometryTransformer.transform(geometry));
+ row.set(name, geometryTransformer.transform(geometry));
}
}
- return dataRow;
+ return row;
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableImpl.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableImpl.java
index 7ef51c24..3953f5e5 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableImpl.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/DataTableImpl.java
@@ -22,19 +22,19 @@ import org.apache.baremaps.collection.DataCollection;
*/
public class DataTableImpl extends AbstractDataCollection<DataRow> implements
DataTable {
- private final DataSchema dataSchema;
+ private final DataSchema schema;
- private final Collection<DataRow> dataRows;
+ private final Collection<DataRow> rows;
/**
* Constructs a table with the specified schema.
*
- * @param dataSchema the schema of the table
- * @param dataRows the collection of rows
+ * @param schema the schema of the table
+ * @param rows the collection of rows
*/
- public DataTableImpl(DataSchema dataSchema, Collection<DataRow> dataRows) {
- this.dataSchema = dataSchema;
- this.dataRows = dataRows;
+ public DataTableImpl(DataSchema schema, Collection<DataRow> rows) {
+ this.schema = schema;
+ this.rows = rows;
}
/**
@@ -42,7 +42,7 @@ public class DataTableImpl extends
AbstractDataCollection<DataRow> implements Da
*/
@Override
public DataSchema schema() {
- return dataSchema;
+ return schema;
}
/**
@@ -50,7 +50,7 @@ public class DataTableImpl extends
AbstractDataCollection<DataRow> implements Da
*/
@Override
public boolean add(DataRow e) {
- return dataRows.add(e);
+ return rows.add(e);
}
/**
@@ -58,7 +58,7 @@ public class DataTableImpl extends
AbstractDataCollection<DataRow> implements Da
*/
@Override
public Iterator<DataRow> iterator() {
- return dataRows.iterator();
+ return rows.iterator();
}
/**
@@ -66,10 +66,10 @@ public class DataTableImpl extends
AbstractDataCollection<DataRow> implements Da
*/
@Override
public long sizeAsLong() {
- if (dataRows instanceof DataCollection dataCollection) {
+ if (rows instanceof DataCollection dataCollection) {
return dataCollection.sizeAsLong();
} else {
- return dataRows.size();
+ return rows.size();
}
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/collection/type/RowDataType.java
b/baremaps-core/src/main/java/org/apache/baremaps/collection/type/RowDataType.java
index b7f90492..821d68e0 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/collection/type/RowDataType.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/collection/type/RowDataType.java
@@ -48,20 +48,20 @@ public class RowDataType implements DataType<DataRow> {
types.put(Coordinate.class, new CoordinateDataType());
}
- private final DataSchema dataSchema;
+ private final DataSchema schema;
- public RowDataType(DataSchema dataSchema) {
- this.dataSchema = dataSchema;
+ public RowDataType(DataSchema schema) {
+ this.schema = schema;
}
@Override
- public int size(final DataRow dataRow) {
+ public int size(final DataRow row) {
int size = Integer.BYTES;
- var columns = dataSchema.columns();
+ var columns = schema.columns();
for (int i = 0; i < columns.size(); i++) {
var columnType = columns.get(i).type();
var dataType = types.get(columnType);
- var value = dataRow.get(i);
+ var value = row.get(i);
size += dataType.size(value);
}
return size;
@@ -73,14 +73,14 @@ public class RowDataType implements DataType<DataRow> {
}
@Override
- public void write(final ByteBuffer buffer, final int position, final DataRow
dataRow) {
+ public void write(final ByteBuffer buffer, final int position, final DataRow
row) {
int p = position + Integer.BYTES;
- var columns = dataSchema.columns();
+ var columns = schema.columns();
for (int i = 0; i < columns.size(); i++) {
var column = columns.get(i);
var columnType = column.type();
var dataType = types.get(columnType);
- var value = dataRow.get(i);
+ var value = row.get(i);
dataType.write(buffer, p, value);
p += dataType.size(buffer, p);
}
@@ -90,7 +90,7 @@ public class RowDataType implements DataType<DataRow> {
@Override
public DataRow read(final ByteBuffer buffer, final int position) {
int p = position + Integer.BYTES;
- var columns = dataSchema.columns();
+ var columns = schema.columns();
var values = new ArrayList();
for (DataColumn column : columns) {
var columnType = column.type();
@@ -98,6 +98,6 @@ public class RowDataType implements DataType<DataRow> {
values.add(dataType.read(buffer, p));
p += dataType.size(buffer, p);
}
- return new DataRowImpl(dataSchema, values);
+ return new DataRowImpl(schema, values);
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocRepository.java
b/baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocRepository.java
index e3a433db..9f554c90 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/iploc/IpLocRepository.java
@@ -80,26 +80,26 @@ public final class IpLocRepository {
}
/**
- * Drops the dataTable.
+ * Drops the table.
*/
public void dropTable() {
try (var connection = dataSource.getConnection();
var statement = connection.prepareStatement(DROP_TABLE)) {
statement.execute();
} catch (SQLException e) {
- logger.error("Unable to drop inetnum locations dataTable", e);
+ logger.error("Unable to drop inetnum locations table", e);
}
}
/**
- * Creates the dataTable.
+ * Creates the table.
*/
public void createTable() {
try (var connection = dataSource.getConnection();
var statement = connection.prepareStatement(CREATE_TABLE)) {
statement.execute();
} catch (SQLException e) {
- logger.error("Unable to create inetnum locations dataTable", e);
+ logger.error("Unable to create inetnum locations table", e);
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java
index c8c8d354..25298a88 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Change.java
@@ -21,7 +21,9 @@ import java.util.StringJoiner;
public final class Change {
public enum ChangeType {
- DELETE, CREATE, MODIFY
+ DELETE,
+ CREATE,
+ MODIFY
}
private final ChangeType type;
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
index aab6d912..cd41c327 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/model/Member.java
@@ -21,7 +21,9 @@ import java.util.StringJoiner;
public final class Member {
public enum MemberType {
- NODE, WAY, RELATION;
+ NODE,
+ WAY,
+ RELATION;
public static MemberType forNumber(int value) {
switch (value) {
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
index 2d478c3e..b7e5a651 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
@@ -32,7 +32,7 @@ import org.apache.baremaps.postgres.copy.CopyWriter;
import org.postgresql.PGConnection;
import org.postgresql.copy.PGCopyOutputStream;
-/** Provides an implementation of the {@code HeaderRepository} baked by a
PostgreSQL dataTable. */
+/** Provides an implementation of the {@code HeaderRepository} baked by a
PostgreSQL table. */
public class PostgresHeaderRepository implements HeaderRepository {
private final DataSource dataSource;
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufDataTable.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufDataTable.java
index 0b900a67..0bcc0eef 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufDataTable.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufDataTable.java
@@ -42,7 +42,7 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
private final Path file;
- private DataSchema dataSchema;
+ private DataSchema schema;
/**
* Constructs a table from a flatgeobuf file (used for reading).
@@ -51,18 +51,18 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
*/
public FlatGeoBufDataTable(Path file) {
this.file = file;
- this.dataSchema = readSchema(file);
+ this.schema = readSchema(file);
}
/**
* Constructs a table from a flatgeobuf file and a schema (used for writing).
*
* @param file the path to the flatgeobuf file
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
*/
- public FlatGeoBufDataTable(Path file, DataSchema dataSchema) {
+ public FlatGeoBufDataTable(Path file, DataSchema schema) {
this.file = file;
- this.dataSchema = dataSchema;
+ this.schema = schema;
}
/**
@@ -70,7 +70,7 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
*/
@Override
public DataSchema schema() {
- return dataSchema;
+ return schema;
}
/**
@@ -108,7 +108,7 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
buffer.clear();
// create the feature stream
- return new RowIterator(channel, headerMeta, dataSchema, buffer);
+ return new RowIterator(channel, headerMeta, schema, buffer);
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -163,8 +163,8 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
headerMeta.srid = 3857;
headerMeta.featuresCount =
features instanceof AbstractDataCollection<DataRow>c ?
c.sizeAsLong() : features.size();
- headerMeta.name = dataSchema.name();
- headerMeta.columns = TableConversions.asColumns(dataSchema.columns());
+ headerMeta.name = schema.name();
+ headerMeta.columns = TableConversions.asColumns(schema.columns());
HeaderMeta.write(headerMeta, outputStream, bufferBuilder);
var indexSize =
@@ -225,7 +225,7 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
private final HeaderMeta headerMeta;
- private final DataSchema dataSchema;
+ private final DataSchema schema;
private final SeekableByteChannel channel;
@@ -238,14 +238,14 @@ public class FlatGeoBufDataTable extends
AbstractDataTable {
*
* @param channel the channel to read from
* @param headerMeta the header meta
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
* @param buffer the buffer to use
*/
public RowIterator(SeekableByteChannel channel, HeaderMeta headerMeta,
- DataSchema dataSchema, ByteBuffer buffer) {
+ DataSchema schema, ByteBuffer buffer) {
this.channel = channel;
this.headerMeta = headerMeta;
- this.dataSchema = dataSchema;
+ this.schema = schema;
this.buffer = buffer;
}
@@ -268,7 +268,7 @@ public class FlatGeoBufDataTable extends AbstractDataTable {
var featureSize = buffer.getInt();
var row =
- TableConversions.asRow(headerMeta, dataSchema,
Feature.getRootAsFeature(buffer));
+ TableConversions.asRow(headerMeta, schema,
Feature.getRootAsFeature(buffer));
buffer.position(Integer.BYTES + featureSize);
buffer.compact();
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java
index 6508ab1f..2d0b1165 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java
@@ -189,20 +189,20 @@ public class TableConversions {
Double.class, ColumnType.Double,
String.class, ColumnType.String);
- public static List<ColumnMeta> asColumns(List<DataColumn> dataColumns) {
- return dataColumns.stream()
+ public static List<ColumnMeta> asColumns(List<DataColumn> columns) {
+ return columns.stream()
.map(TableConversions::asColumn)
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
- public static ColumnMeta asColumn(DataColumn dataColumn) {
- var type = types.get(dataColumn.type());
+ public static ColumnMeta asColumn(DataColumn column) {
+ var type = types.get(column.type());
if (type == null) {
return null;
}
var columnMeta = new ColumnMeta();
- columnMeta.name = dataColumn.name();
+ columnMeta.name = column.name();
columnMeta.type = type.byteValue();
return columnMeta;
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageDataTable.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageDataTable.java
index 9078ada1..07dec86d 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageDataTable.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageDataTable.java
@@ -29,7 +29,7 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
private final FeatureDao featureDao;
- private final DataSchema dataSchema;
+ private final DataSchema schema;
private final GeometryFactory geometryFactory;
@@ -47,7 +47,7 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
var propertyType = classType(column);
columns.add(new DataColumnImpl(propertyName, propertyType));
}
- dataSchema = new DataSchemaImpl(name, columns);
+ schema = new DataSchemaImpl(name, columns);
geometryFactory = new GeometryFactory(new PrecisionModel(), (int)
featureDao.getSrs().getId());
}
@@ -64,7 +64,7 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
*/
@Override
public Iterator<DataRow> iterator() {
- return new GeopackageIterator(featureDao.queryForAll(), dataSchema);
+ return new GeopackageIterator(featureDao.queryForAll(), schema);
}
/**
@@ -80,7 +80,7 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
*/
@Override
public DataSchema schema() {
- return dataSchema;
+ return schema;
}
/**
@@ -217,7 +217,7 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
private final FeatureResultSet featureResultSet;
- private final DataSchema dataSchema;
+ private final DataSchema schema;
private boolean hasNext;
@@ -225,11 +225,11 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
* Constructs an iterator from a feature result set.
*
* @param featureResultSet the feature result set
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
*/
- public GeopackageIterator(FeatureResultSet featureResultSet, DataSchema
dataSchema) {
+ public GeopackageIterator(FeatureResultSet featureResultSet, DataSchema
schema) {
this.featureResultSet = featureResultSet;
- this.dataSchema = dataSchema;
+ this.schema = schema;
this.hasNext = featureResultSet.moveToFirst();
}
@@ -249,15 +249,15 @@ public class GeoPackageDataTable extends
AbstractDataCollection<DataRow> impleme
if (!hasNext) {
throw new NoSuchElementException();
}
- DataRow dataRow = dataSchema.createRow();
+ DataRow row = schema.createRow();
for (FeatureColumn featureColumn :
featureResultSet.getColumns().getColumns()) {
var value = featureResultSet.getValue(featureColumn);
if (value != null) {
- dataRow.set(featureColumn.getName(), asJavaValue(value));
+ row.set(featureColumn.getName(), asJavaValue(value));
}
}
hasNext = featureResultSet.moveToNext();
- return dataRow;
+ return row;
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataStore.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataStore.java
index 798c362a..925d58bf 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataStore.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataStore.java
@@ -148,12 +148,12 @@ public class PostgresDataStore implements DataStore {
writer.writeHeader();
var columns = getColumns(schema);
var handlers = getHandlers(schema);
- for (DataRow dataRow : dataTable) {
+ for (DataRow row : dataTable) {
writer.startRow(columns.size());
for (int i = 0; i < columns.size(); i++) {
var column = columns.get(i);
var handler = handlers.get(i);
- var value = dataRow.get(column.name());
+ var value = row.get(column.name());
if (value == null) {
writer.writeNull();
} else {
@@ -198,12 +198,12 @@ public class PostgresDataStore implements DataStore {
/**
* Adapt the data type to postgres (e.g. use compatible names).
*
- * @param dataSchema the schema to adapt
+ * @param schema the schema to adapt
* @return the adapted schema
*/
- protected DataSchema adaptDataType(DataSchema dataSchema) {
- var name = dataSchema.name().replaceAll("[^a-zA-Z0-9]", "_");
- var properties = dataSchema.columns().stream()
+ protected DataSchema adaptDataType(DataSchema schema) {
+ var name = schema.name().replaceAll("[^a-zA-Z0-9]", "_");
+ var properties = schema.columns().stream()
.filter(column -> typeToName.containsKey(column.type()))
.map(column -> (DataColumn) new DataColumnImpl(column.name(),
column.type()))
.toList();
@@ -223,15 +223,15 @@ public class PostgresDataStore implements DataStore {
/**
* Generate a create table query.
*
- * @param dataSchema the schema
+ * @param schema the schema
* @return the query
*/
- protected String createTable(DataSchema dataSchema) {
+ protected String createTable(DataSchema schema) {
StringBuilder builder = new StringBuilder();
builder.append("CREATE TABLE \"");
- builder.append(dataSchema.name());
+ builder.append(schema.name());
builder.append("\" (");
- builder.append(dataSchema.columns().stream()
+ builder.append(schema.columns().stream()
.map(column -> "\"" + column.name()
+ "\" " + typeToName.get(column.type()))
.collect(Collectors.joining(", ")));
@@ -242,15 +242,15 @@ public class PostgresDataStore implements DataStore {
/**
* Generate a copy query.
*
- * @param dataSchema the schema
+ * @param schema the schema
* @return the query
*/
- protected String copy(DataSchema dataSchema) {
+ protected String copy(DataSchema schema) {
var builder = new StringBuilder();
builder.append("COPY \"");
- builder.append(dataSchema.name());
+ builder.append(schema.name());
builder.append("\" (");
- builder.append(dataSchema.columns().stream()
+ builder.append(schema.columns().stream()
.map(column -> "\"" + column.name() + "\"")
.collect(Collectors.joining(", ")));
builder.append(") FROM STDIN BINARY");
@@ -260,11 +260,11 @@ public class PostgresDataStore implements DataStore {
/**
* Get the columns of the schema.
*
- * @param dataSchema the schema
+ * @param schema the schema
* @return the columns
*/
- protected List<DataColumn> getColumns(DataSchema dataSchema) {
- return dataSchema.columns().stream()
+ protected List<DataColumn> getColumns(DataSchema schema) {
+ return schema.columns().stream()
.filter(this::isSupported)
.collect(Collectors.toList());
}
@@ -272,11 +272,11 @@ public class PostgresDataStore implements DataStore {
/**
* Get the handlers for the columns of the schema.
*
- * @param dataSchema the schema
+ * @param schema the schema
* @return the handlers
*/
- protected List<BaseValueHandler> getHandlers(DataSchema dataSchema) {
- return getColumns(dataSchema).stream()
+ protected List<BaseValueHandler> getHandlers(DataSchema schema) {
+ return getColumns(schema).stream()
.map(column -> getHandler(column.type()))
.collect(Collectors.toList());
}
@@ -337,10 +337,10 @@ public class PostgresDataStore implements DataStore {
/**
* Check if the column type is supported by postgres.
*
- * @param dataColumn the column
+ * @param column the column
* @return true if the column type is supported
*/
- protected boolean isSupported(DataColumn dataColumn) {
- return typeToName.containsKey(dataColumn.type());
+ protected boolean isSupported(DataColumn column) {
+ return typeToName.containsKey(column.type());
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataTable.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataTable.java
index badd5df5..68e75ddd 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataTable.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresDataTable.java
@@ -35,17 +35,17 @@ public class PostgresDataTable extends AbstractDataTable {
private final DataSource dataSource;
- private final DataSchema dataSchema;
+ private final DataSchema schema;
/**
* Constructs a table with a given name and a given schema.
*
* @param dataSource the data source
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
*/
- public PostgresDataTable(DataSource dataSource, DataSchema dataSchema) {
+ public PostgresDataTable(DataSource dataSource, DataSchema schema) {
this.dataSource = dataSource;
- this.dataSchema = dataSchema;
+ this.schema = schema;
}
/**
@@ -72,7 +72,7 @@ public class PostgresDataTable extends AbstractDataTable {
*/
@Override
public long sizeAsLong() {
- var countQuery = count(dataSchema);
+ var countQuery = count(schema);
try (var connection = dataSource.getConnection();
var statement = connection.prepareStatement(countQuery);
var resultSet = statement.executeQuery()) {
@@ -88,19 +88,19 @@ public class PostgresDataTable extends AbstractDataTable {
*/
@Override
public DataSchema schema() {
- return dataSchema;
+ return schema;
}
/**
* {@inheritDoc}
*/
@Override
- public boolean add(DataRow dataRow) {
- var query = insert(dataSchema);
+ public boolean add(DataRow row) {
+ var query = insert(schema);
try (var connection = dataSource.getConnection();
var statement = connection.prepareStatement(query)) {
- for (int i = 1; i <= dataSchema.columns().size(); i++) {
- var value = dataRow.get(dataSchema.columns().get(i - 1).name());
+ for (int i = 1; i <= schema.columns().size(); i++) {
+ var value = row.get(schema.columns().get(i - 1).name());
if (value instanceof Geometry geometry) {
statement.setBytes(i, GeometryUtils.serialize(geometry));
} else {
@@ -119,10 +119,10 @@ public class PostgresDataTable extends AbstractDataTable {
@Override
public boolean addAll(Collection<? extends DataRow> rows) {
try (var connection = dataSource.getConnection();
- var statement = connection.prepareStatement(insert(dataSchema))) {
+ var statement = connection.prepareStatement(insert(schema))) {
for (var row : rows) {
- for (int i = 1; i <= dataSchema.columns().size(); i++) {
- var value = row.get(dataSchema.columns().get(i - 1).name());
+ for (int i = 1; i <= schema.columns().size(); i++) {
+ var value = row.get(schema.columns().get(i - 1).name());
if (value instanceof Geometry geometry) {
statement.setBytes(i, GeometryUtils.serialize(geometry));
} else {
@@ -141,11 +141,11 @@ public class PostgresDataTable extends AbstractDataTable {
/**
* Generates a query that selects all the rows of a table.
*
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
* @return the query
*/
- protected static String select(DataSchema dataSchema) {
- var columns = dataSchema.columns().stream()
+ protected static String select(DataSchema schema) {
+ var columns = schema.columns().stream()
.map(column -> {
if (column.type().isAssignableFrom(Geometry.class)) {
return String.format("st_asbinary(\"%s\") AS \"%s\"",
column.name(), column.name());
@@ -154,24 +154,24 @@ public class PostgresDataTable extends AbstractDataTable {
}
})
.toList();
- return "SELECT " + String.join(", ", columns) + " FROM \"" +
dataSchema.name() + "\"";
+ return "SELECT " + String.join(", ", columns) + " FROM \"" + schema.name()
+ "\"";
}
/**
* Generates a query that counts the number of rows of a table.
*
- * @param dataSchema the schema of the table
+ * @param schema the schema of the table
* @return the query
*/
- protected static String insert(DataSchema dataSchema) {
- var columns = dataSchema.columns().stream()
+ protected static String insert(DataSchema schema) {
+ var columns = schema.columns().stream()
.map(column -> String.format("\"%s\"", column.name()))
.toList();
- var values = dataSchema.columns().stream()
+ var values = schema.columns().stream()
.map(column -> "?")
.toList();
return "INSERT INTO \""
- + dataSchema.name() + "\" (" + String.join(", ", columns) + ") "
+ + schema.name() + "\" (" + String.join(", ", columns) + ") "
+ "VALUES (" + String.join(", ", values) + ")";
}
@@ -202,7 +202,7 @@ public class PostgresDataTable extends AbstractDataTable {
try {
connection = dataSource.getConnection();
statement = connection.createStatement();
- resultSet = statement.executeQuery(select(dataSchema));
+ resultSet = statement.executeQuery(select(schema));
hasNext = resultSet.next();
} catch (SQLException e) {
close();
@@ -231,8 +231,8 @@ public class PostgresDataTable extends AbstractDataTable {
}
try {
List<Object> values = new ArrayList<>();
- for (int i = 0; i < dataSchema.columns().size(); i++) {
- var column = dataSchema.columns().get(i);
+ for (int i = 0; i < schema.columns().size(); i++) {
+ var column = schema.columns().get(i);
if (column.type().isAssignableFrom(Geometry.class)) {
values.add(GeometryUtils.deserialize(resultSet.getBytes(i + 1)));
} else {
@@ -240,7 +240,7 @@ public class PostgresDataTable extends AbstractDataTable {
}
}
hasNext = resultSet.next();
- return new DataRowImpl(dataSchema, values);
+ return new DataRowImpl(schema, values);
} catch (SQLException e) {
close();
throw new RuntimeException("Error while fetching the next result", e);
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java
index 7af3ff30..214ae84b 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java
@@ -99,9 +99,9 @@ public class DbaseByteReader extends CommonByteReader
implements AutoCloseable {
/**
* Load a row into a feature.
*
- * @param dataRow Feature to fill.
+ * @param row Feature to fill.
*/
- public void loadRow(DataRow dataRow) {
+ public void loadRow(DataRow row) {
// TODO: ignore deleted records
getByteBuffer().get(); // denotes whether deleted or current
// read first part of record
@@ -138,7 +138,7 @@ public class DbaseByteReader extends CommonByteReader
implements AutoCloseable {
case DateTime -> value;
};
- dataRow.set(fieldDescriptor.getName(), object);
+ row.set(fieldDescriptor.getName(), object);
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java
index d982f3a3..4740666f 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java
@@ -45,7 +45,7 @@ public class ShapefileByteReader extends CommonByteReader {
private List<DBaseFieldDescriptor> databaseFieldsDescriptors;
/** Schema of the rows contained in this shapefile. */
- private DataSchema dataSchema;
+ private DataSchema schema;
/** Shapefile index. */
private File shapeFileIndex;
@@ -80,7 +80,7 @@ public class ShapefileByteReader extends CommonByteReader {
loadShapefileIndexes();
}
- this.dataSchema = getSchema(shapefile.getName());
+ this.schema = getSchema(shapefile.getName());
}
/**
@@ -107,7 +107,7 @@ public class ShapefileByteReader extends CommonByteReader {
* @return the schema
*/
public DataSchema getSchema() {
- return this.dataSchema;
+ return this.schema;
}
/**
@@ -254,9 +254,9 @@ public class ShapefileByteReader extends CommonByteReader {
/**
* Complete a row with shapefile content.
*
- * @param dataRow the row to complete
+ * @param row the row to complete
*/
- public void completeRow(DataRow dataRow) throws ShapefileException {
+ public void completeRow(DataRow row) throws ShapefileException {
// insert points into some type of list
int RecordNumber = getByteBuffer().getInt();
int ContentLength = getByteBuffer().getInt();
@@ -273,15 +273,15 @@ public class ShapefileByteReader extends CommonByteReader
{
switch (shapefileGeometryType) {
case Point:
- loadPointRow(dataRow);
+ loadPointRow(row);
break;
case Polygon:
- loadPolygonRow(dataRow);
+ loadPolygonRow(row);
break;
case PolyLine:
- loadPolylineRow(dataRow);
+ loadPolylineRow(row);
break;
default:
@@ -294,21 +294,21 @@ public class ShapefileByteReader extends CommonByteReader
{
/**
* Load point row.
*
- * @param dataRow the row to fill.
+ * @param row the row to fill.
*/
- private void loadPointRow(DataRow dataRow) {
+ private void loadPointRow(DataRow row) {
double x = getByteBuffer().getDouble();
double y = getByteBuffer().getDouble();
Point pnt = geometryFactory.createPoint(new Coordinate(x, y));
- dataRow.set(GEOMETRY_NAME, pnt);
+ row.set(GEOMETRY_NAME, pnt);
}
/**
* Load polygon row.
*
- * @param dataRow the row to fill.
+ * @param row the row to fill.
*/
- private void loadPolygonRow(DataRow dataRow) {
+ private void loadPolygonRow(DataRow row) {
double xmin = getByteBuffer().getDouble();
double ymin = getByteBuffer().getDouble();
double xmax = getByteBuffer().getDouble();
@@ -319,7 +319,7 @@ public class ShapefileByteReader extends CommonByteReader {
Geometry multiPolygon = readMultiplePolygon(numParts, numPoints);
- dataRow.set(GEOMETRY_NAME, multiPolygon);
+ row.set(GEOMETRY_NAME, multiPolygon);
}
/**
@@ -382,9 +382,9 @@ public class ShapefileByteReader extends CommonByteReader {
/**
* Load polyline row.
*
- * @param dataRow the row to fill.
+ * @param row the row to fill.
*/
- private void loadPolylineRow(DataRow dataRow) {
+ private void loadPolylineRow(DataRow row) {
/* double xmin = */ getByteBuffer().getDouble();
/* double ymin = */ getByteBuffer().getDouble();
/* double xmax = */ getByteBuffer().getDouble();
@@ -416,7 +416,7 @@ public class ShapefileByteReader extends CommonByteReader {
}
}
- dataRow.set(GEOMETRY_NAME,
+ row.set(GEOMETRY_NAME,
geometryFactory.createLineString(coordinates.toCoordinateArray()));
}
}
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileGeometryType.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileGeometryType.java
index 904da21f..05e7bc64 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileGeometryType.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileGeometryType.java
@@ -30,9 +30,22 @@ import java.util.Map;
* Specification</a>
*/
public enum ShapefileGeometryType {
- NullShape(0), Point(1), PolyLine(3), Polygon(5), MultiPoint(8), PointZ(11),
PolyLineZ(
- 13), PolygonZ(15), MultiPointZ(
- 18), PointM(21), PolyLineM(23), PolygonM(25), MultiPointM(28),
MultiPatch(31);
+ NullShape(0),
+ Point(1),
+ PolyLine(3),
+ Polygon(5),
+ MultiPoint(8),
+ PointZ(11),
+ PolyLineZ(
+ 13),
+ PolygonZ(15),
+ MultiPointZ(
+ 18),
+ PointM(21),
+ PolyLineM(23),
+ PolygonM(25),
+ MultiPointM(28),
+ MultiPatch(31);
// used for initializing the enumeration
private int value;
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java
index efc8f4d6..2137c096 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java
@@ -47,7 +47,7 @@ public class ShapefileInputStream extends InputStream {
private boolean hasShapefileIndex;
/** Schema of the features contained in this shapefile. */
- private DataSchema dataSchema;
+ private DataSchema schema;
/** Shapefile reader. */
private ShapefileByteReader shapefileReader;
@@ -74,7 +74,7 @@ public class ShapefileInputStream extends InputStream {
this.shapefileReader =
new ShapefileByteReader(this.shapefile, this.databaseFile,
this.shapefileIndex);
- this.dataSchema = this.shapefileReader.getSchema();
+ this.schema = this.shapefileReader.getSchema();
}
/**
@@ -117,11 +117,11 @@ public class ShapefileInputStream extends InputStream {
if (!this.dbaseReader.nextRowAvailable()) {
return null;
}
- DataRow dataRow = this.dataSchema.createRow();
- this.dbaseReader.loadRow(dataRow);
+ DataRow row = this.schema.createRow();
+ this.dbaseReader.loadRow(row);
this.shapefileReader.setRowNum(this.dbaseReader.getRowNum());
- this.shapefileReader.completeRow(dataRow);
- return dataRow;
+ this.shapefileReader.completeRow(row);
+ return row;
}
/**
@@ -130,7 +130,7 @@ public class ShapefileInputStream extends InputStream {
* @return the schema.
*/
public DataSchema getSchema() {
- return dataSchema;
+ return schema;
}
/**
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java
index b7872270..e0936db8 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java
@@ -44,7 +44,7 @@ public class ShapefileReader {
private File shapeFileIndex;
/** Type of the features contained in this shapefile. */
- private DataSchema dataSchema;
+ private DataSchema schema;
/** Shapefile descriptor. */
private ShapefileDescriptor shapefileDescriptor;
@@ -118,7 +118,7 @@ public class ShapefileReader {
* @return the schema.
*/
public DataSchema getSchema() {
- return this.dataSchema;
+ return this.schema;
}
/**
@@ -174,7 +174,7 @@ public class ShapefileReader {
public ShapefileInputStream read() throws IOException {
ShapefileInputStream is =
new ShapefileInputStream(this.shapefile, this.databaseFile,
this.shapeFileIndex);
- this.dataSchema = is.getSchema();
+ this.schema = is.getSchema();
this.shapefileDescriptor = is.getShapefileDescriptor();
this.databaseFieldsDescriptors = is.getDatabaseFieldsDescriptors();
return is;
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
index fac7ca0d..92ed5534 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
@@ -53,7 +53,7 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
+ public Object evaluate(DataRow row) {
return value;
}
}
@@ -66,8 +66,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- Object value = expression.evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ Object value = expression.evaluate(row);
if (value instanceof List list && index >= 0 && index < list.size()) {
return list.get(index);
}
@@ -83,8 +83,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return dataRow.get(property);
+ public Object evaluate(DataRow row) {
+ return row.get(property);
}
}
@@ -96,8 +96,8 @@ public interface Expressions {
}
@Override
- public Boolean evaluate(DataRow dataRow) {
- return dataRow.get(property) != null;
+ public Boolean evaluate(DataRow row) {
+ return row.get(property) != null;
}
}
@@ -109,8 +109,8 @@ public interface Expressions {
}
@Override
- public Boolean evaluate(DataRow dataRow) {
- var expressionValue = expression.evaluate(dataRow);
+ public Boolean evaluate(DataRow row) {
+ var expressionValue = expression.evaluate(row);
if (expressionValue instanceof List list) {
return list.contains(value);
} else if (expressionValue instanceof String string) {
@@ -129,8 +129,8 @@ public interface Expressions {
}
@Override
- public Integer evaluate(DataRow dataRow) {
- var expressionValue = expression.evaluate(dataRow);
+ public Integer evaluate(DataRow row) {
+ var expressionValue = expression.evaluate(row);
if (expressionValue instanceof List list) {
return list.indexOf(value);
} else if (expressionValue instanceof String string) {
@@ -149,8 +149,8 @@ public interface Expressions {
}
@Override
- public Integer evaluate(DataRow dataRow) {
- Object value = expression.evaluate(dataRow);
+ public Integer evaluate(DataRow row) {
+ Object value = expression.evaluate(row);
if (value instanceof String string) {
return string.length();
} else if (value instanceof List list) {
@@ -173,14 +173,14 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- Object value = expression.evaluate(dataRow);
- var startIndex = (Integer) start.evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ Object value = expression.evaluate(row);
+ var startIndex = (Integer) start.evaluate(row);
if (value instanceof String string) {
- var endIndex = end == null ? string.length() : (Integer)
end.evaluate(dataRow);
+ var endIndex = end == null ? string.length() : (Integer)
end.evaluate(row);
return string.substring(startIndex, endIndex);
} else if (value instanceof List list) {
- var endIndex = end == null ? list.size() : (Integer)
end.evaluate(dataRow);
+ var endIndex = end == null ? list.size() : (Integer) end.evaluate(row);
return list.subList(startIndex, endIndex);
} else {
return List.of();
@@ -196,8 +196,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return !(boolean) expression.evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ return !(boolean) expression.evaluate(row);
}
}
@@ -209,8 +209,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return new Not(new Equal(left, right)).evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ return new Not(new Equal(left, right)).evaluate(row);
}
}
@@ -222,8 +222,8 @@ public interface Expressions {
}
@Override
- public Boolean evaluate(DataRow dataRow) {
- return (double) left.evaluate(dataRow) < (double)
right.evaluate(dataRow);
+ public Boolean evaluate(DataRow row) {
+ return (double) left.evaluate(row) < (double) right.evaluate(row);
}
}
@@ -235,8 +235,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return (double) left.evaluate(dataRow) <= (double)
right.evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ return (double) left.evaluate(row) <= (double) right.evaluate(row);
}
}
@@ -248,8 +248,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return left.evaluate(dataRow).equals(right.evaluate(dataRow));
+ public Object evaluate(DataRow row) {
+ return left.evaluate(row).equals(right.evaluate(row));
}
}
@@ -261,8 +261,8 @@ public interface Expressions {
}
@Override
- public Boolean evaluate(DataRow dataRow) {
- return (double) left.evaluate(dataRow) > (double)
right.evaluate(dataRow);
+ public Boolean evaluate(DataRow row) {
+ return (double) left.evaluate(row) > (double) right.evaluate(row);
}
}
@@ -274,8 +274,8 @@ public interface Expressions {
}
@Override
- public Boolean evaluate(DataRow dataRow) {
- return (double) left.evaluate(dataRow) >= (double)
right.evaluate(dataRow);
+ public Boolean evaluate(DataRow row) {
+ return (double) left.evaluate(row) >= (double) right.evaluate(row);
}
}
@@ -287,8 +287,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return expressions.stream().allMatch(expression -> (boolean)
expression.evaluate(dataRow));
+ public Object evaluate(DataRow row) {
+ return expressions.stream().allMatch(expression -> (boolean)
expression.evaluate(row));
}
}
@@ -300,8 +300,8 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- return expressions.stream().anyMatch(expression -> (boolean)
expression.evaluate(dataRow));
+ public Object evaluate(DataRow row) {
+ return expressions.stream().anyMatch(expression -> (boolean)
expression.evaluate(row));
}
}
@@ -313,11 +313,11 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
- if ((boolean) condition.evaluate(dataRow)) {
- return then.evaluate(dataRow);
+ public Object evaluate(DataRow row) {
+ if ((boolean) condition.evaluate(row)) {
+ return then.evaluate(row);
} else {
- return otherwise.evaluate(dataRow);
+ return otherwise.evaluate(row);
}
}
}
@@ -330,9 +330,9 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
+ public Object evaluate(DataRow row) {
for (Expression expression : expressions) {
- Object value = expression.evaluate(dataRow);
+ Object value = expression.evaluate(row);
if (value != null) {
return value;
}
@@ -350,20 +350,20 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
+ public Object evaluate(DataRow row) {
if (cases.size() % 2 != 0) {
throw new IllegalArgumentException(
"match expression must have an even number of arguments");
}
- var inputValue = input.evaluate(dataRow);
+ var inputValue = input.evaluate(row);
for (int i = 0; i < cases.size(); i += 2) {
Expression condition = cases.get(i);
Expression then = cases.get(i + 1);
- if (inputValue.equals(condition.evaluate(dataRow))) {
- return then.evaluate(dataRow);
+ if (inputValue.equals(condition.evaluate(row))) {
+ return then.evaluate(row);
}
}
- return fallback.evaluate(dataRow);
+ return fallback.evaluate(row);
}
}
@@ -375,7 +375,7 @@ public interface Expressions {
}
@Override
- public Object evaluate(DataRow dataRow) {
+ public Object evaluate(DataRow row) {
throw new UnsupportedOperationException("within expression is not
supported");
}
}
@@ -388,8 +388,8 @@ public interface Expressions {
}
@Override
- public String evaluate(DataRow dataRow) {
- Object property = dataRow.get("geom");
+ public String evaluate(DataRow row) {
+ Object property = row.get("geom");
if (property instanceof Point) {
return "Point";
} else if (property instanceof LineString) {
diff --git
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java
index 38cc4e2f..7e9551bc 100644
---
a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java
+++
b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java
@@ -39,10 +39,10 @@ public record ImportGeoPackage(Path file, String database,
Integer sourceSRID, I
for (var name : geoPackageDataStore.list()) {
var geoPackageTable = geoPackageDataStore.get(name);
var projectionTransformer = new ProjectionTransformer(sourceSRID,
targetSRID);
- var dataRowTransformer =
+ var rowTransformer =
new DataTableGeometryTransformer(geoPackageTable,
projectionTransformer);
var transformedDataTable =
- new DataTableAdapter(geoPackageDataStore.get(name),
dataRowTransformer);
+ new DataTableAdapter(geoPackageDataStore.get(name),
rowTransformer);
postgresDataStore.add(transformedDataTable);
}
} catch (Exception e) {
diff --git
a/baremaps-core/src/test/java/org/apache/baremaps/storage/MockDataTable.java
b/baremaps-core/src/test/java/org/apache/baremaps/storage/MockDataTable.java
index 3071f571..b870932c 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/storage/MockDataTable.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/storage/MockDataTable.java
@@ -22,42 +22,42 @@ import org.locationtech.jts.geom.Geometry;
public class MockDataTable extends AbstractDataTable {
- private final DataSchema dataSchema;
+ private final DataSchema schema;
- private final List<DataRow> dataRows;
+ private final List<DataRow> rows;
public MockDataTable() {
- this.dataSchema = new DataSchemaImpl("mock", List.of(
+ this.schema = new DataSchemaImpl("mock", List.of(
new DataColumnImpl("string", String.class),
new DataColumnImpl("integer", Integer.class),
new DataColumnImpl("double", Double.class),
new DataColumnImpl("float", Float.class),
new DataColumnImpl("geometry", Geometry.class)));
- this.dataRows = List.of(
- new DataRowImpl(dataSchema,
+ this.rows = List.of(
+ new DataRowImpl(schema,
List.of("string", 1, 1.0, 1.0f, GEOMETRY_FACTORY.createPoint(new
Coordinate(1, 1)))),
- new DataRowImpl(dataSchema,
+ new DataRowImpl(schema,
List.of("string", 2, 2.0, 2.0f, GEOMETRY_FACTORY.createPoint(new
Coordinate(2, 2)))),
- new DataRowImpl(dataSchema,
+ new DataRowImpl(schema,
List.of("string", 3, 3.0, 3.0f, GEOMETRY_FACTORY.createPoint(new
Coordinate(3, 3)))),
- new DataRowImpl(dataSchema,
+ new DataRowImpl(schema,
List.of("string", 4, 4.0, 4.0f, GEOMETRY_FACTORY.createPoint(new
Coordinate(4, 4)))),
- new DataRowImpl(dataSchema,
+ new DataRowImpl(schema,
List.of("string", 5, 5.0, 5.0f, GEOMETRY_FACTORY.createPoint(new
Coordinate(5, 5)))));
}
@Override
public Iterator<DataRow> iterator() {
- return dataRows.iterator();
+ return rows.iterator();
}
@Override
public long sizeAsLong() {
- return dataRows.size();
+ return rows.size();
}
@Override
public DataSchema schema() {
- return dataSchema;
+ return schema;
}
}
diff --git a/baremaps-core/src/test/resources/queries/schema.sql
b/baremaps-core/src/test/resources/queries/schema.sql
index 489967db..18b3fee7 100644
--- a/baremaps-core/src/test/resources/queries/schema.sql
+++ b/baremaps-core/src/test/resources/queries/schema.sql
@@ -1,4 +1,4 @@
--- mbtiles dataSchema
+-- mbtiles schema
-- Licensed 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
diff --git a/baremaps-ogcapi/src/main/resources/initialize_ogcapi_tables.sql
b/baremaps-ogcapi/src/main/resources/initialize_ogcapi_tables.sql
index 36a3c5ea..e89c7dbd 100644
--- a/baremaps-ogcapi/src/main/resources/initialize_ogcapi_tables.sql
+++ b/baremaps-ogcapi/src/main/resources/initialize_ogcapi_tables.sql
@@ -1,14 +1,14 @@
-create dataTable if not exists collections (
+create table if not exists collections (
id uuid primary key,
collection jsonb
);
-create dataTable if not exists styles (
+create table if not exists styles (
id uuid primary key,
style jsonb
);
-create dataTable if not exists tilesets (
+create table if not exists tilesets (
id uuid primary key,
tileset jsonb
);
diff --git a/baremaps-ogcapi/src/main/resources/initialize_studio_tables.sql
b/baremaps-ogcapi/src/main/resources/initialize_studio_tables.sql
index f984601c..df5cc132 100644
--- a/baremaps-ogcapi/src/main/resources/initialize_studio_tables.sql
+++ b/baremaps-ogcapi/src/main/resources/initialize_studio_tables.sql
@@ -1,6 +1,6 @@
-create dataSchema studio;
+create schema studio;
-create dataTable if not exists studio.entities (
+create table if not exists studio.entities (
id uuid primary key,
entity jsonb,
kind text
diff --git a/baremaps-renderer/assets/report-template.html
b/baremaps-renderer/assets/report-template.html
index f05ea3a8..20209c4a 100644
--- a/baremaps-renderer/assets/report-template.html
+++ b/baremaps-renderer/assets/report-template.html
@@ -114,7 +114,7 @@
.results {
display: flex;
- flex-direction: dataColumn;
+ flex-direction: column;
gap: 2rem;
}
@@ -159,7 +159,7 @@
.images {
display: grid;
- grid-template-dataColumns: 1fr 1fr 1fr;
+ grid-template-columns: 1fr 1fr 1fr;
gap: 1rem;
}
diff --git a/baremaps-server/src/main/resources/assets/viewer.html
b/baremaps-server/src/main/resources/assets/viewer.html
index 2a1a85fd..c73ad203 100644
--- a/baremaps-server/src/main/resources/assets/viewer.html
+++ b/baremaps-server/src/main/resources/assets/viewer.html
@@ -35,11 +35,11 @@
height: 100%;
}
- .dataColumns {
+ .columns {
display: flex;
}
- .dataColumn {
+ .column {
flex: 1;
height: 100vh;
}
@@ -48,11 +48,11 @@
<title>Baremaps</title>
</head>
<body>
- <div class="dataColumns">
- <div class="dataColumn map-wrapper" id="mapWrapper">
+ <div class="columns">
+ <div class="column map-wrapper" id="mapWrapper">
<div class="map" id="map"></div>
</div>
- <div class="dataColumn map-wrapper" id="osmMapWrapper" data-state="hidden"
style="flex: 0">
+ <div class="column map-wrapper" id="osmMapWrapper" data-state="hidden"
style="flex: 0">
<div class="map" id="osmMap"></div>
</div>
</div>
diff --git a/baremaps-server/src/main/resources/geocoder/index.html
b/baremaps-server/src/main/resources/geocoder/index.html
index 0ada6fe3..d2a0bd33 100644
--- a/baremaps-server/src/main/resources/geocoder/index.html
+++ b/baremaps-server/src/main/resources/geocoder/index.html
@@ -25,7 +25,7 @@
border: 1px solid black;
}
- dataTable {
+ table {
border-collapse: collapse;
}
</style>
@@ -37,8 +37,8 @@
<input type="text" id="countryCode" name="countryCode"
placeholder="Country code" value=""/>
<input type="submit" value="Submit"/>
</form>
-<!-- The dataTable of retrieved locations -->
-<dataTable id="results"></dataTable>
+<!-- The table of retrieved locations -->
+<table id="results"></table>
<script>
@@ -46,8 +46,8 @@
const searchForm = document.getElementById('searchForm');
searchForm.addEventListener('submit', search);
- // Get the dataTable of results
- const dataTable = document.getElementById('results');
+ // Get the table of results
+ const table = document.getElementById('results');
function search(event) {
event.preventDefault();
@@ -60,28 +60,28 @@
fetch(`${window.location.origin}/api/geocoder?${queryString}`)
.then(response => response.json())
.then(response => {
- // Extract the headers from the first dataRow
+ // Extract the headers from the first row
const headers = response.results && response.results.length > 0
? Object.keys(response.results[0].data).sort()
: [];
- // Clear the results dataTable
- dataTable.innerHTML = '';
+ // Clear the results table
+ table.innerHTML = '';
- // Insert the headers in the dataTable
- const headerRow = dataTable.insertRow();
+ // Insert the headers in the table
+ const headerRow = table.insertRow();
headerRow.innerHTML =
`<th>#</th><th>score</th>${headers.map(header =>
`<th>${header}</th>`).join('')}`;
- // Insert the results in the dataTable
+ // Insert the results in the table
response.results.forEach((result, index) => {
- const dataRow = dataTable.insertRow();
- dataRow.insertCell().innerText = index;
- dataRow.insertCell().innerText = result.score;
+ const row = table.insertRow();
+ row.insertCell().innerText = index;
+ row.insertCell().innerText = result.score;
headers.forEach(header => {
if (result.data[header] !== undefined) {
- dataRow.insertCell().innerText =
result.data[header];
+ row.insertCell().innerText = result.data[header];
} else {
- dataRow.insertCell().innerText = '';
+ row.insertCell().innerText = '';
}
});
});
diff --git a/baremaps-server/src/main/resources/iploc/index.html
b/baremaps-server/src/main/resources/iploc/index.html
index c12f1753..e4833a2c 100644
--- a/baremaps-server/src/main/resources/iploc/index.html
+++ b/baremaps-server/src/main/resources/iploc/index.html
@@ -25,7 +25,7 @@
border: 1px solid black;
}
- dataTable {
+ table {
border-collapse: collapse;
}
</style>
@@ -37,8 +37,8 @@
<input type="text" id="ip" name="ip" value=""/>
<input type="submit" value="Submit"/>
</form>
- <!-- The dataTable of retrieved locations -->
- <dataTable id="results"></dataTable>
+ <!-- The table of retrieved locations -->
+ <table id="results"></table>
<script>
function searchByIp(event) {
event.preventDefault();
@@ -59,28 +59,28 @@
// Success!
const geoLocations = JSON.parse(request.responseText);
- // Fill the dataTable of geo locations from the resulting
geoLocations
+ // Fill the table of geo locations from the resulting
geoLocations
// Geo locations contain an address, an ipv4Range, a
location, a network and a country
- const dataTable = document.getElementById('results');
- dataTable.innerHTML = '';
- // Insert header dataRow
- dataTable.insertRow().innerHTML =
'<th>#</th><th>Address</th><th>IP
Range</th><th>Longitude</th><th>Latitude</th><th>Network</th><th>Country</th>';
+ const table = document.getElementById('results');
+ table.innerHTML = '';
+ // Insert header row
+ table.insertRow().innerHTML =
'<th>#</th><th>Address</th><th>IP
Range</th><th>Longitude</th><th>Latitude</th><th>Network</th><th>Country</th>';
for (let i = 0; i < geoLocations.length; i++) {
- const dataRow = dataTable.insertRow(i + 1);
+ const row = table.insertRow(i + 1);
let pos = 0;
- let cell = dataRow.insertCell(pos++);
+ let cell = row.insertCell(pos++);
cell.innerHTML = i + 1;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = geoLocations[i].address;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = `${geoLocations[i].inetStart} -
${geoLocations[i].inetEnd}`;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = geoLocations[i].longitude;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = geoLocations[i].latitude;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = geoLocations[i].network;
- cell = dataRow.insertCell(pos++);
+ cell = row.insertCell(pos++);
cell.innerHTML = geoLocations[i].country;
}
} else {
diff --git a/codestyle.xml b/codestyle.xml
index ad9577c8..70504ae4 100644
--- a/codestyle.xml
+++ b/codestyle.xml
@@ -302,7 +302,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.format_header"
value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
value="do not insert"/>
- <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
value="0"/>
+ <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
value="49"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
value="true"/>
<setting
id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block"
value="insert"/>
