Upgrade omt to pull in tile size optimizations (#672)

pull/674/head
Michael Barry 2023-09-25 06:04:53 -04:00 zatwierdzone przez GitHub
rodzic d43a9e9159
commit 1b53493ac7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 1 dodań i 52 usunięć

Wyświetl plik

@ -498,52 +498,6 @@ public final class Mbtiles implements WriteableTileArchive, ReadableTileArchive
}
}
/**
* Contents of a row of the tiles table, or in case of compact mode in the tiles view.
*
* @deprecated Use {@link Tile} instead
*/
@Deprecated(forRemoval = true)
public record TileEntry(TileCoord tile, byte[] bytes) implements Comparable<TileEntry> {
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
TileEntry tileEntry = (TileEntry) o;
if (!tile.equals(tileEntry.tile)) {
return false;
}
return Arrays.equals(bytes, tileEntry.bytes);
}
@Override
public int hashCode() {
int result = tile.hashCode();
result = 31 * result + Arrays.hashCode(bytes);
return result;
}
@Override
public String toString() {
return "TileEntry{" +
"tile=" + tile +
", bytes=" + Arrays.toString(bytes) +
'}';
}
@Override
public int compareTo(TileEntry o) {
return tile.compareTo(o.tile);
}
}
/** Contents of a row of the tiles_shallow table. */
private record TileShallowEntry(TileCoord coord, int tileDataId) {}

Wyświetl plik

@ -232,11 +232,6 @@ public class TestUtils {
}
}
@Deprecated(forRemoval = true)
public static Set<Mbtiles.TileEntry> getAllTiles(ReadableTileArchive db) {
return db.getAllTiles().stream().map(t -> new Mbtiles.TileEntry(t.coord(), t.bytes())).collect(Collectors.toSet());
}
public static Set<Tile> getTiles(ReadableTileArchive db) {
return db.getAllTiles().stream().collect(Collectors.toSet());
}

@ -1 +1 @@
Subproject commit dd5454365016d9e3b3eec2cd1299bd50d3fcccd9
Subproject commit e7dde1e0860197ba831b84d1eb1aa1e9d73cf2a7