Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor modules and add data stores #903

Merged
merged 18 commits into from
Nov 9, 2024
Merged

Refactor modules and add data stores #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aeca0ec
Add a data table for openstreetmap data
bchapuis Nov 7, 2024
a15ad54
Separate data table and data collection packages
bchapuis Nov 7, 2024
e9fa9f5
Move the store interface in a dedicated module
bchapuis Nov 7, 2024
86065fc
Move flatgeobuf store from the core to the flatgeobuf module
bchapuis Nov 7, 2024
9b2bf3d
Move the flatgeobuf reader and writer in a format package
bchapuis Nov 7, 2024
5a7d475
Move the csv store in a dedicated module
bchapuis Nov 7, 2024
0d3f9e7
Refactor the geopackage module
bchapuis Nov 7, 2024
ac31a9c
Refactor the geoparquet package
bchapuis Nov 7, 2024
4a09b41
Introduce a module for the shapefile store
bchapuis Nov 7, 2024
a1b1d7a
Refactor the openstreetmap module
bchapuis Nov 7, 2024
3497b3f
Introduce a postgres module
bchapuis Nov 7, 2024
8166e4f
Fix integration tests
bchapuis Nov 7, 2024
7894cbf
Set the test scope for baremaps testing
bchapuis Nov 7, 2024
03d217a
Clean dependencies
bchapuis Nov 8, 2024
21d67cf
Move RPSL classes in a dedicated module
bchapuis Nov 8, 2024
08b8be7
Add rpsl data store and simplify package structure
bchapuis Nov 8, 2024
17d7b1e
Fix iplocmapper
bchapuis Nov 8, 2024
634bd21
Fix minor formatting issues
bchapuis Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ examples/transformation/*.pbf

# Benchmarking
baremaps-benchmarking/data/
baremaps-benchmarking/dependency-reduced-pom.xml

# Docs
.jekyll-cache/
Expand Down
1 change: 1 addition & 0 deletions baremaps-benchmarking/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand Down
17 changes: 3 additions & 14 deletions baremaps-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,9 @@ limitations under the License.
<artifactId>baremaps-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class ExecuteSql implements Callable<Integer> {

@Override
public Integer call() throws Exception {
new org.apache.baremaps.workflow.tasks.ExecuteSql(database, file.toAbsolutePath(),
new org.apache.baremaps.tasks.ExecuteSql(database, file.toAbsolutePath(),
parallel).execute(new WorkflowContext());
return 0;
}
Expand Down
3 changes: 2 additions & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.nio.file.Path;
import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.tasks.ImportOsmPbf;
import org.apache.baremaps.workflow.WorkflowContext;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
Expand Down Expand Up @@ -50,7 +51,7 @@ public class ImportOsm implements Callable<Integer> {

@Override
public Integer call() throws Exception {
new org.apache.baremaps.workflow.tasks.ImportOsmPbf(
new ImportOsmPbf(
file.toAbsolutePath(),
database,
srid,
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.tasks.UpdateOsmDatabase;
import org.apache.baremaps.workflow.WorkflowContext;
import org.apache.baremaps.workflow.tasks.UpdateOsmDatabase;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/dem/VectorTileContours.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import org.apache.baremaps.maplibre.tileset.TilesetLayer;
import org.apache.baremaps.openstreetmap.stream.ProgressLogger;
import org.apache.baremaps.openstreetmap.stream.StreamUtils;
import org.apache.baremaps.tasks.ExportVectorTiles;
import org.apache.baremaps.tilestore.TileCoord;
import org.apache.baremaps.tilestore.TileEntry;
import org.apache.baremaps.tilestore.TileStoreException;
import org.apache.baremaps.tilestore.pmtiles.PMTilesStore;
import org.apache.baremaps.tilestore.raster.*;
import org.apache.baremaps.workflow.WorkflowException;
import org.apache.baremaps.workflow.tasks.ExportVectorTiles;
import org.locationtech.jts.geom.Envelope;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.maplibre.style.Style;
import org.apache.baremaps.maplibre.tileset.Tileset;
import org.apache.baremaps.postgres.utils.PostgresUtils;
import org.apache.baremaps.server.ChangeResource;
import org.apache.baremaps.server.StyleResource;
import org.apache.baremaps.server.TilesetResource;
import org.apache.baremaps.server.VectorTileResource;
import org.apache.baremaps.tilestore.TileStore;
import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.utils.PostgresUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.nio.file.Path;
import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.tasks.ExportVectorTiles;
import org.apache.baremaps.workflow.WorkflowContext;
import org.apache.baremaps.workflow.tasks.ExportVectorTiles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
import org.apache.baremaps.maplibre.style.Style;
import org.apache.baremaps.maplibre.tilejson.TileJSON;
import org.apache.baremaps.maplibre.tileset.Tileset;
import org.apache.baremaps.postgres.utils.PostgresUtils;
import org.apache.baremaps.server.SearchResource;
import org.apache.baremaps.server.StyleResource;
import org.apache.baremaps.server.TileJSONResource;
import org.apache.baremaps.server.VectorTileResource;
import org.apache.baremaps.tilestore.TileStore;
import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.tilestore.vector.VectorTileCache;
import org.apache.baremaps.utils.PostgresUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
Expand Down
2 changes: 1 addition & 1 deletion baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Init.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.Callable;
import org.apache.baremaps.tasks.LogMessage;
import org.apache.baremaps.workflow.Step;
import org.apache.baremaps.workflow.Workflow;
import org.apache.baremaps.workflow.tasks.LogMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
Expand Down
57 changes: 19 additions & 38 deletions baremaps-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,10 @@ limitations under the License.
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand All @@ -66,21 +42,13 @@ limitations under the License.
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
<dependency>
<groupId>de.bytefish</groupId>
<artifactId>pgbulkinsert</artifactId>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>mil.nga.geopackage</groupId>
<artifactId>geopackage</artifactId>
</dependency>
<dependency>
<groupId>net.ripe.ipresource</groupId>
<artifactId>ipresource</artifactId>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-csv</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
Expand All @@ -94,6 +62,10 @@ limitations under the License.
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-flatgeobuf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-geopackage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-geoparquet</artifactId>
Expand All @@ -110,9 +82,22 @@ limitations under the License.
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-pmtiles</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-postgres</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-rpsl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-shapefile</artifactId>
</dependency>
<dependency>
<groupId>org.apache.baremaps</groupId>
<artifactId>baremaps-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -162,10 +147,6 @@ limitations under the License.
<groupId>org.locationtech.proj4j</groupId>
<artifactId>proj4j</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion baremaps-core/src/main/java/org/apache/baremaps/geocoder/DataRowConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.baremaps.geocoder;

import java.util.function.Consumer;
import org.apache.baremaps.data.storage.DataRow;
import org.apache.baremaps.store.DataRow;
import org.apache.lucene.index.IndexWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions baremaps-core/src/main/java/org/apache/baremaps/geocoder/DataRowMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import org.apache.baremaps.data.storage.DataColumn;
import org.apache.baremaps.data.storage.DataRow;
import org.apache.baremaps.data.storage.DataSchema;
import org.apache.baremaps.store.DataColumn;
import org.apache.baremaps.store.DataRow;
import org.apache.baremaps.store.DataSchema;
import org.apache.lucene.document.*;
import org.locationtech.jts.geom.*;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions baremaps-core/src/main/java/org/apache/baremaps/geocoder/DataTableQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.baremaps.data.storage.DataColumn;
import org.apache.baremaps.data.storage.DataSchema;
import org.apache.baremaps.store.DataColumn;
import org.apache.baremaps.store.DataSchema;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryparser.classic.QueryParserBase;
import org.apache.lucene.queryparser.simple.SimpleQueryParser;
Expand Down
Loading
Loading