Move pmtiles classes in dedicated module

apache · May 15, 2024 · 1b3930c · 1b3930c
1 parent 54a48e2
commit 1b3930c
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 9 deletions.
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml
@@ -90,6 +90,10 @@ limitations under the License.
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-openstreetmap</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-pmtiles</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-testing</artifactId>

diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesStore.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/pmtiles/PMTilesStore.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.apache.baremaps.maplibre.tileset.Tileset;
+import org.apache.baremaps.pmtiles.PMTilesWriter;
 import org.apache.baremaps.tilestore.TileCoord;
 import org.apache.baremaps.tilestore.TileStore;
 import org.apache.baremaps.tilestore.TileStoreException;

diff --git a/baremaps-pmtiles/pom.xml b/baremaps-pmtiles/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.baremaps</groupId>
+    <artifactId>baremaps</artifactId>
+    <version>0.7.4-SNAPSHOT</version>
+  </parent>
+  <artifactId>baremaps-pmtiles</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-testing</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.locationtech.jts</groupId>
+      <artifactId>jts-core</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...remaps/tilestore/pmtiles/Compression.java → .../apache/baremaps/pmtiles/Compression.java b/...remaps/tilestore/pmtiles/Compression.java → .../apache/baremaps/pmtiles/Compression.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import java.io.*;
 import java.util.zip.GZIPInputStream;

diff --git a/...remaps/tilestore/pmtiles/Directories.java → .../apache/baremaps/pmtiles/Directories.java b/...remaps/tilestore/pmtiles/Directories.java → .../apache/baremaps/pmtiles/Directories.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 class Directories {
 

diff --git a/...che/baremaps/tilestore/pmtiles/Entry.java → ...va/org/apache/baremaps/pmtiles/Entry.java b/...che/baremaps/tilestore/pmtiles/Entry.java → ...va/org/apache/baremaps/pmtiles/Entry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 class Entry {
   private long tileId;

diff --git a/...he/baremaps/tilestore/pmtiles/Header.java → ...a/org/apache/baremaps/pmtiles/Header.java b/...he/baremaps/tilestore/pmtiles/Header.java → ...a/org/apache/baremaps/pmtiles/Header.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import java.util.Objects;
 

diff --git a/...e/baremaps/tilestore/pmtiles/PMTiles.java → .../org/apache/baremaps/pmtiles/PMTiles.java b/...e/baremaps/tilestore/pmtiles/PMTiles.java → .../org/apache/baremaps/pmtiles/PMTiles.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import com.google.common.math.LongMath;
 import java.io.ByteArrayOutputStream;

diff --git a/...maps/tilestore/pmtiles/PMTilesReader.java → ...pache/baremaps/pmtiles/PMTilesReader.java b/...maps/tilestore/pmtiles/PMTilesReader.java → ...pache/baremaps/pmtiles/PMTilesReader.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import com.google.common.io.LittleEndianDataInputStream;
 import java.io.ByteArrayInputStream;

diff --git a/...maps/tilestore/pmtiles/PMTilesWriter.java → ...pache/baremaps/pmtiles/PMTilesWriter.java b/...maps/tilestore/pmtiles/PMTilesWriter.java → ...pache/baremaps/pmtiles/PMTilesWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.hash.Hashing;

diff --git a/.../baremaps/tilestore/pmtiles/TileType.java → ...org/apache/baremaps/pmtiles/TileType.java b/.../baremaps/tilestore/pmtiles/TileType.java → ...org/apache/baremaps/pmtiles/TileType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 enum TileType {
   unknown,

diff --git a/...remaps/tilestore/pmtiles/PMTilesTest.java → .../apache/baremaps/pmtiles/PMTilesTest.java b/...remaps/tilestore/pmtiles/PMTilesTest.java → .../apache/baremaps/pmtiles/PMTilesTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.tilestore.pmtiles;
+package org.apache.baremaps.pmtiles;
 
 import static org.junit.jupiter.api.Assertions.*;
 

diff --git a/pom.xml b/pom.xml
@@ -54,6 +54,7 @@ limitations under the License.
     <module>baremaps-data</module>
     <module>baremaps-maplibre</module>
     <module>baremaps-openstreetmap</module>
+    <module>baremaps-pmtiles</module>
     <module>baremaps-server</module>
     <module>baremaps-testing</module>
   </modules>
@@ -242,6 +243,11 @@ limitations under the License.
         <artifactId>baremaps-openstreetmap</artifactId>
         <version>${project.parent.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.baremaps</groupId>
+        <artifactId>baremaps-pmtiles</artifactId>
+        <version>${project.parent.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.baremaps</groupId>
         <artifactId>baremaps-server</artifactId>