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 10:52:50 UTC
[incubator-baremaps] branch mvt-refactoring created (now 76e48b26)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch mvt-refactoring
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
at 76e48b26 Remove the mvt package
This branch includes the following new commits:
new 76e48b26 Remove the mvt package
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-baremaps] 01/01: Remove the mvt package
Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch mvt-refactoring
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit 76e48b2699a9d37fc02789ec7e2b71742102c8a8
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Sun May 7 12:52:33 2023 +0200
Remove the mvt package
---
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 +-
.../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 +-
.../main/java/org/apache/baremaps/server/BaseUriRequestFilter.java | 2 +-
.../src/main/java/org/apache/baremaps/server/DevResources.java | 4 ++--
.../src/main/java/org/apache/baremaps/server/ServerResources.java | 6 +++---
19 files changed, 26 insertions(+), 27 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..1d1b5321 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,7 +27,7 @@ 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.vectortile.tileset.Tileset;
import org.apache.baremaps.server.CorsFilter;
import org.apache.baremaps.server.ServerResources;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
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..6077478c 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,8 +30,8 @@ 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.vectortile.tileset.Tileset;
+import org.apache.baremaps.vectortile.tileset.TilesetQuery;
import org.apache.baremaps.openstreetmap.utils.StreamProgress;
import org.apache.baremaps.stream.StreamUtils;
import org.apache.baremaps.workflow.Task;
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..9a81a19e 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,7 +23,7 @@ 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.vectortile.expression.Expressions.Expression;
import org.apache.baremaps.storage.*;
import org.apache.baremaps.storage.postgres.PostgresStore;
import org.apache.baremaps.workflow.Task;
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..ef9df7b2 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,15 +10,15 @@
* 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.vectortile.expression.Expressions;
+import org.apache.baremaps.vectortile.expression.Expressions.*;
import org.apache.baremaps.storage.Row;
import org.apache.baremaps.storage.Schema;
import org.junit.jupiter.api.Test;
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..b9e0dfc2 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,7 +17,7 @@ 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.vectortile.expression.Expressions.Has;
import org.apache.baremaps.testing.PostgresContainerTest;
import org.apache.baremaps.testing.TestFiles;
import org.apache.baremaps.workflow.WorkflowContext;
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..b19787f1 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
@@ -29,7 +29,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("/")