From a1c33dc5d58891b6913654dbd0326276afe470d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bilger?= Date: Fri, 4 Aug 2023 03:52:42 +0200 Subject: [PATCH] remove the old TileEncodingResult (#642) * remove the old TileEncodingResult ...only to be merged once planetiler-openmaptile has been updated * update pt-omt --------- Co-authored-by: Mike Barry --- .../archive/WriteableTileArchive.java | 5 --- .../mbtiles/TileEncodingResult.java | 44 ------------------- planetiler-openmaptiles | 2 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 planetiler-core/src/main/java/com/onthegomap/planetiler/mbtiles/TileEncodingResult.java diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/WriteableTileArchive.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/WriteableTileArchive.java index 3c3b6df7..26c2a3bc 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/WriteableTileArchive.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/WriteableTileArchive.java @@ -48,11 +48,6 @@ public interface WriteableTileArchive extends Closeable { void write(TileEncodingResult encodingResult); - // TODO: exists for compatibility reasons - default void write(com.onthegomap.planetiler.mbtiles.TileEncodingResult encodingResult) { - write(new TileEncodingResult(encodingResult.coord(), encodingResult.tileData(), encodingResult.tileDataHash())); - } - @Override void close(); diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/mbtiles/TileEncodingResult.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/mbtiles/TileEncodingResult.java deleted file mode 100644 index 54bdd1f7..00000000 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/mbtiles/TileEncodingResult.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.onthegomap.planetiler.mbtiles; - -import com.onthegomap.planetiler.geo.TileCoord; -import java.util.Arrays; -import java.util.Objects; -import java.util.OptionalLong; - -// TODO: exists for compatibility reasons -public record TileEncodingResult( - TileCoord coord, - byte[] tileData, - /** will always be empty in non-compact mode and might also be empty in compact mode */ - OptionalLong tileDataHash -) { - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + Arrays.hashCode(tileData); - result = prime * result + Objects.hash(coord, tileDataHash); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof TileEncodingResult)) { - return false; - } - TileEncodingResult other = (TileEncodingResult) obj; - return Objects.equals(coord, other.coord) && Arrays.equals(tileData, other.tileData) && - Objects.equals(tileDataHash, other.tileDataHash); - } - - @Override - public String toString() { - return "TileEncodingResult [coord=" + coord + ", tileData=" + Arrays.toString(tileData) + ", tileDataHash=" + - tileDataHash + "]"; - } - -} diff --git a/planetiler-openmaptiles b/planetiler-openmaptiles index 6317d82e..dd545436 160000 --- a/planetiler-openmaptiles +++ b/planetiler-openmaptiles @@ -1 +1 @@ -Subproject commit 6317d82ec9dff205cd2de90d020433592009e807 +Subproject commit dd5454365016d9e3b3eec2cd1299bd50d3fcccd9