You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/05/07 11:24:30 UTC
[incubator-baremaps] branch main updated: Merge the mvt and vectortile packages (#644)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new b06833d2 Merge the mvt and vectortile packages (#644)
b06833d2 is described below
commit b06833d27c992ed8d78bb2f13387fcebf2e7332b
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Sun May 7 13:24:27 2023 +0200
Merge the mvt and vectortile packages (#644)
---
baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java | 6 +++---
baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java | 2 +-
.../src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java | 2 +-
.../main/java/org/apache/baremaps/config/DefaultObjectMapper.java | 2 +-
.../java/org/apache/baremaps/database/tile/PostgresTileStore.java | 2 +-
.../apache/baremaps/{mvt => vectortile}/expression/Expressions.java | 2 +-
.../java/org/apache/baremaps/{mvt => vectortile}/style/Style.java | 2 +-
.../org/apache/baremaps/{mvt => vectortile}/style/StyleLayer.java | 2 +-
.../org/apache/baremaps/{mvt => vectortile}/style/StyleSource.java | 2 +-
.../org/apache/baremaps/{mvt => vectortile}/tileset/Tileset.java | 2 +-
.../apache/baremaps/{mvt => vectortile}/tileset/TilesetLayer.java | 2 +-
.../apache/baremaps/{mvt => vectortile}/tileset/TilesetQuery.java | 2 +-
.../org/apache/baremaps/workflow/tasks/CreateGeonamesIndex.java | 1 -
.../java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java | 4 ++--
.../apache/baremaps/workflow/tasks/TransformEntityCollection.java | 2 +-
.../org/apache/baremaps/{mvt => vectortile}/ExpressionsTest.java | 6 +++---
.../workflow/tasks/CreateAndTransformEntityCollectionTest.java | 2 +-
.../src/main/java/org/apache/baremaps/ogcapi/StylesResource.java | 4 ++--
.../src/main/java/org/apache/baremaps/ogcapi/TilesResource.java | 2 +-
.../src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java | 2 +-
.../main/java/org/apache/baremaps/server/BaseUriRequestFilter.java | 3 +--
.../src/main/java/org/apache/baremaps/server/DevResources.java | 4 ++--
.../src/main/java/org/apache/baremaps/server/ServerResources.java | 6 +++---
23 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
index 5da6bd23..d3530260 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
@@ -20,9 +20,9 @@ import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
-import org.apache.baremaps.mvt.style.Style;
-import org.apache.baremaps.mvt.style.StyleSource;
-import org.apache.baremaps.mvt.tileset.Tileset;
+import org.apache.baremaps.vectortile.style.Style;
+import org.apache.baremaps.vectortile.style.StyleSource;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
index 47e40388..64986e65 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
@@ -27,9 +27,9 @@ import org.apache.baremaps.database.PostgresUtils;
import org.apache.baremaps.database.tile.PostgresTileStore;
import org.apache.baremaps.database.tile.TileCache;
import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.mvt.tileset.Tileset;
import org.apache.baremaps.server.CorsFilter;
import org.apache.baremaps.server.ServerResources;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
index ee33cb2c..86969bbe 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
@@ -30,9 +30,9 @@ import org.apache.baremaps.database.PostgresUtils;
import org.apache.baremaps.database.tile.PostgresTileStore;
import org.apache.baremaps.database.tile.TileCache;
import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.mvt.tileset.Tileset;
import org.apache.baremaps.ogcapi.*;
import org.apache.baremaps.server.CorsFilter;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java b/baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java
index 9536492e..9bf8ef8c 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/config/DefaultObjectMapper.java
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonGenerator.Feature;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.baremaps.mvt.expression.Expressions;
+import org.apache.baremaps.vectortile.expression.Expressions;
public class DefaultObjectMapper {
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java
index d20fb5bb..d1be52dd 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java
@@ -33,7 +33,7 @@ import net.sf.jsqlparser.expression.Parenthesis;
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.statement.select.Join;
-import org.apache.baremaps.mvt.tileset.Tileset;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/expression/Expressions.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/expression/Expressions.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
index 4d3b3442..0a34662c 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/expression/Expressions.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.expression;
+package org.apache.baremaps.vectortile.expression;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/Style.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/Style.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/style/Style.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/Style.java
index e26a7556..962ced92 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/Style.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/Style.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.style;
+package org.apache.baremaps.vectortile.style;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleLayer.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleLayer.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleLayer.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleLayer.java
index c4218337..7e81d8bc 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleLayer.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleLayer.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.style;
+package org.apache.baremaps.vectortile.style;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleSource.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleSource.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleSource.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleSource.java
index 90ea439b..8ac5cfd6 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/style/StyleSource.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/style/StyleSource.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.style;
+package org.apache.baremaps.vectortile.style;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/Tileset.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/Tileset.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/Tileset.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/Tileset.java
index b47a58cc..02dc947f 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/Tileset.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/Tileset.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.tileset;
+package org.apache.baremaps.vectortile.tileset;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetLayer.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetLayer.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetLayer.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetLayer.java
index 7160e3a5..d50050aa 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetLayer.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetLayer.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.tileset;
+package org.apache.baremaps.vectortile.tileset;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetQuery.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetQuery.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetQuery.java
rename to baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetQuery.java
index 18ff7476..70dba0e4 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/mvt/tileset/TilesetQuery.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tileset/TilesetQuery.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.mvt.tileset;
+package org.apache.baremaps.vectortile.tileset;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/CreateGeonamesIndex.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/CreateGeonamesIndex.java
index 531ce8bd..76829588 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/CreateGeonamesIndex.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/CreateGeonamesIndex.java
@@ -38,7 +38,6 @@ public record CreateGeonamesIndex(Path dataFile, Path indexDirectory) implements
public void execute(WorkflowContext context) throws Exception {
var directory = MMapDirectory.open(indexDirectory);
var config = new IndexWriterConfig(GeocoderConstants.ANALYZER);
-
try (var indexWriter = new IndexWriter(directory, config);
var inputStream = Files.newInputStream(dataFile)) {
indexWriter.deleteAll();
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
index bb9e7ad1..0e5b5eff 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
@@ -30,10 +30,10 @@ import org.apache.baremaps.database.tile.Tile;
import org.apache.baremaps.database.tile.TileChannel;
import org.apache.baremaps.database.tile.TileStore;
import org.apache.baremaps.database.tile.TileStoreException;
-import org.apache.baremaps.mvt.tileset.Tileset;
-import org.apache.baremaps.mvt.tileset.TilesetQuery;
import org.apache.baremaps.openstreetmap.utils.StreamProgress;
import org.apache.baremaps.stream.StreamUtils;
+import org.apache.baremaps.vectortile.tileset.Tileset;
+import org.apache.baremaps.vectortile.tileset.TilesetQuery;
import org.apache.baremaps.workflow.Task;
import org.apache.baremaps.workflow.WorkflowContext;
import org.locationtech.jts.geom.Envelope;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/TransformEntityCollection.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/TransformEntityCollection.java
index fc7c6731..4bfcffff 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/TransformEntityCollection.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/TransformEntityCollection.java
@@ -23,9 +23,9 @@ import java.util.stream.Stream;
import org.apache.baremaps.collection.AppendOnlyBuffer;
import org.apache.baremaps.collection.algorithm.UnionStream;
import org.apache.baremaps.collection.memory.MemoryMappedFile;
-import org.apache.baremaps.mvt.expression.Expressions.Expression;
import org.apache.baremaps.storage.*;
import org.apache.baremaps.storage.postgres.PostgresStore;
+import org.apache.baremaps.vectortile.expression.Expressions.Expression;
import org.apache.baremaps.workflow.Task;
import org.apache.baremaps.workflow.WorkflowContext;
import org.locationtech.jts.geom.Geometry;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/mvt/ExpressionsTest.java b/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java
similarity index 98%
rename from baremaps-core/src/test/java/org/apache/baremaps/mvt/ExpressionsTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java
index a4b9637e..da436be0 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/mvt/ExpressionsTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java
@@ -10,17 +10,17 @@
* the License.
*/
-package org.apache.baremaps.mvt;
+package org.apache.baremaps.vectortile;
import static org.junit.jupiter.api.Assertions.*;
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import org.apache.baremaps.mvt.expression.Expressions;
-import org.apache.baremaps.mvt.expression.Expressions.*;
import org.apache.baremaps.storage.Row;
import org.apache.baremaps.storage.Schema;
+import org.apache.baremaps.vectortile.expression.Expressions;
+import org.apache.baremaps.vectortile.expression.Expressions.*;
import org.junit.jupiter.api.Test;
class ExpressionsTest {
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/CreateAndTransformEntityCollectionTest.java b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/CreateAndTransformEntityCollectionTest.java
index 6e4a864a..d2ce68e1 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/CreateAndTransformEntityCollectionTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/CreateAndTransformEntityCollectionTest.java
@@ -17,9 +17,9 @@ package org.apache.baremaps.workflow.tasks;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
-import org.apache.baremaps.mvt.expression.Expressions.Has;
import org.apache.baremaps.testing.PostgresContainerTest;
import org.apache.baremaps.testing.TestFiles;
+import org.apache.baremaps.vectortile.expression.Expressions.Has;
import org.apache.baremaps.workflow.WorkflowContext;
import org.apache.baremaps.workflow.tasks.TransformEntityCollection.Operation;
import org.apache.baremaps.workflow.tasks.TransformEntityCollection.Recipe;
diff --git a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/StylesResource.java b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/StylesResource.java
index 68b03544..2d78f7f1 100644
--- a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/StylesResource.java
+++ b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/StylesResource.java
@@ -25,11 +25,11 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.baremaps.config.ConfigReader;
-import org.apache.baremaps.mvt.style.Style;
-import org.apache.baremaps.mvt.style.StyleSource;
import org.apache.baremaps.ogcapi.api.StylesApi;
import org.apache.baremaps.ogcapi.model.StyleSet;
import org.apache.baremaps.ogcapi.model.StyleSetEntry;
+import org.apache.baremaps.vectortile.style.Style;
+import org.apache.baremaps.vectortile.style.StyleSource;
/**
* The styles resource.
diff --git a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
index 2ab1023b..42de7712 100644
--- a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
+++ b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
@@ -29,10 +29,10 @@ import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.database.tile.Tile;
import org.apache.baremaps.database.tile.TileStore;
import org.apache.baremaps.database.tile.TileStoreException;
-import org.apache.baremaps.mvt.tileset.Tileset;
import org.apache.baremaps.ogcapi.api.TilesApi;
import org.apache.baremaps.ogcapi.model.TileSetItem;
import org.apache.baremaps.ogcapi.model.TileSets;
+import org.apache.baremaps.vectortile.tileset.Tileset;
@Singleton
public class TilesResource implements TilesApi {
diff --git a/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java b/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
index 7837fd89..dab77e8b 100644
--- a/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
+++ b/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
@@ -23,7 +23,7 @@ import javax.sql.DataSource;
import org.apache.baremaps.database.PostgresUtils;
import org.apache.baremaps.database.tile.PostgresTileStore;
import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.mvt.tileset.Tileset;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/BaseUriRequestFilter.java b/baremaps-server/src/main/java/org/apache/baremaps/server/BaseUriRequestFilter.java
index 7af87b44..065c051f 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/BaseUriRequestFilter.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/BaseUriRequestFilter.java
@@ -14,7 +14,6 @@ package org.apache.baremaps.server;
-import java.io.IOException;
import javax.inject.Singleton;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -29,7 +28,7 @@ import javax.ws.rs.ext.Provider;
public class BaseUriRequestFilter implements ContainerRequestFilter {
@Override
- public void filter(ContainerRequestContext requestContext) throws IOException {
+ public void filter(ContainerRequestContext requestContext) {
UriBuilder baseUri = UriBuilder.fromUri(requestContext.getUriInfo().getBaseUri());
MultivaluedMap<String, String> headers = requestContext.getHeaders();
if (headers.get("X-Forwarded-Proto") != null) {
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
index 1e3a5e7f..bf379b7b 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
@@ -42,8 +42,8 @@ import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.database.tile.PostgresTileStore;
import org.apache.baremaps.database.tile.Tile;
import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.mvt.style.Style;
-import org.apache.baremaps.mvt.tileset.Tileset;
+import org.apache.baremaps.vectortile.style.Style;
+import org.apache.baremaps.vectortile.tileset.Tileset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
index 89fca491..0e286a4c 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
@@ -33,9 +33,9 @@ import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.database.tile.Tile;
import org.apache.baremaps.database.tile.TileStore;
import org.apache.baremaps.database.tile.TileStoreException;
-import org.apache.baremaps.mvt.style.Style;
-import org.apache.baremaps.mvt.tileset.Tileset;
-import org.apache.baremaps.mvt.tileset.TilesetLayer;
+import org.apache.baremaps.vectortile.style.Style;
+import org.apache.baremaps.vectortile.tileset.Tileset;
+import org.apache.baremaps.vectortile.tileset.TilesetLayer;
@Singleton
@javax.ws.rs.Path("/")