pull/780/head
Mike Barry 2024-01-10 05:13:04 -05:00
rodzic 150d98ab66
commit d941fbe9a3
6 zmienionych plików z 11 dodań i 11 usunięć

Wyświetl plik

@ -296,7 +296,7 @@ public class TileArchiveWriter {
bytes = switch (config.tileCompression()) { bytes = switch (config.tileCompression()) {
case GZIP -> gzip(encoded); case GZIP -> gzip(encoded);
case NONE -> encoded; case NONE -> encoded;
case UNKNWON -> throw new IllegalArgumentException("cannot compress \"UNKNOWN\""); case UNKNOWN -> throw new IllegalArgumentException("cannot compress \"UNKNOWN\"");
}; };
layerStats = TileSizeStats.computeTileStats(proto); layerStats = TileSizeStats.computeTileStats(proto);
if (encoded.length > config.tileWarningSizeBytes()) { if (encoded.length > config.tileWarningSizeBytes()) {

Wyświetl plik

@ -20,7 +20,7 @@ public enum TileCompression {
@JsonProperty("gzip") @JsonProperty("gzip")
GZIP("gzip"), GZIP("gzip"),
@JsonProperty("unknown") @JsonProperty("unknown")
UNKNWON("unknown"); UNKNOWN("unknown");
private final String id; private final String id;
@ -42,7 +42,7 @@ public enum TileCompression {
} }
public static Set<TileCompression> availableValues() { public static Set<TileCompression> availableValues() {
return Arrays.stream(TileCompression.values()).filter(tc -> tc != UNKNWON).collect(Collectors.toUnmodifiableSet()); return Arrays.stream(TileCompression.values()).filter(tc -> tc != UNKNOWN).collect(Collectors.toUnmodifiableSet());
} }
public String id() { public String id() {
@ -52,7 +52,7 @@ public enum TileCompression {
static class Deserializer extends JsonDeserializer<TileCompression> { static class Deserializer extends JsonDeserializer<TileCompression> {
@Override @Override
public TileCompression deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { public TileCompression deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
return findById(p.getValueAsString()).orElse(TileCompression.UNKNWON); return findById(p.getValueAsString()).orElse(TileCompression.UNKNOWN);
} }
@Override @Override

Wyświetl plik

@ -121,7 +121,7 @@ public class ReadablePmtiles implements ReadableTileArchive {
TileCompression tileCompression = switch (header.tileCompression()) { TileCompression tileCompression = switch (header.tileCompression()) {
case GZIP -> TileCompression.GZIP; case GZIP -> TileCompression.GZIP;
case NONE -> TileCompression.NONE; case NONE -> TileCompression.NONE;
case UNKNOWN -> TileCompression.UNKNWON; case UNKNOWN -> TileCompression.UNKNOWN;
}; };
String format = switch (header.tileType()) { String format = switch (header.tileType()) {

Wyświetl plik

@ -88,7 +88,7 @@ public final class WriteableProtoStreamArchive extends WriteableStreamArchive {
final StreamArchiveProto.TileCompression tileCompression = switch (metadata.tileCompression()) { final StreamArchiveProto.TileCompression tileCompression = switch (metadata.tileCompression()) {
case GZIP -> StreamArchiveProto.TileCompression.TILE_COMPRESSION_GZIP; case GZIP -> StreamArchiveProto.TileCompression.TILE_COMPRESSION_GZIP;
case NONE -> StreamArchiveProto.TileCompression.TILE_COMPRESSION_NONE; case NONE -> StreamArchiveProto.TileCompression.TILE_COMPRESSION_NONE;
case UNKNWON -> throw new IllegalArgumentException("should not produce \"UNKNOWN\" compression"); case UNKNOWN -> throw new IllegalArgumentException("should not produce \"UNKNOWN\" compression");
}; };
metaDataBuilder.setTileCompression(tileCompression); metaDataBuilder.setTileCompression(tileCompression);
if (metadata.vectorLayers() != null) { if (metadata.vectorLayers() != null) {

Wyświetl plik

@ -107,8 +107,8 @@ public class CompareArchives {
archive2: {} archive2: {}
""", reader1.metadata(), reader2.metadata()); """, reader1.metadata(), reader2.metadata());
} }
compression = metadata1 == null ? TileCompression.UNKNWON : metadata1.tileCompression(); compression = metadata1 == null ? TileCompression.UNKNOWN : metadata1.tileCompression();
TileCompression compression2 = metadata2 == null ? TileCompression.UNKNWON : metadata2.tileCompression(); TileCompression compression2 = metadata2 == null ? TileCompression.UNKNOWN : metadata2.tileCompression();
if (compression != compression2) { if (compression != compression2) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"input1 and input2 must have the same compression, got " + compression + " and " + "input1 and input2 must have the same compression, got " + compression + " and " +
@ -123,7 +123,7 @@ public class CompareArchives {
var total = new AtomicLong(0); var total = new AtomicLong(0);
var diffs = new AtomicLong(0); var diffs = new AtomicLong(0);
record Diff(Tile a, Tile b) {} record Diff(Tile a, Tile b) {}
var pipeline = WorkerPipeline.start("tilestats", stats) var pipeline = WorkerPipeline.start("compare", stats)
.<Diff>fromGenerator("enumerate", next -> { .<Diff>fromGenerator("enumerate", next -> {
try ( try (
var reader1 = TileArchives.newReader(input1, config); var reader1 = TileArchives.newReader(input1, config);
@ -270,7 +270,7 @@ public class CompareArchives {
byte[] decompressed = switch (tileCompression) { byte[] decompressed = switch (tileCompression) {
case GZIP -> Gzip.gunzip(bytes); case GZIP -> Gzip.gunzip(bytes);
case NONE -> bytes; case NONE -> bytes;
case UNKNWON -> throw new IllegalArgumentException("Unknown compression"); case UNKNOWN -> throw new IllegalArgumentException("Unknown compression");
}; };
return VectorTileProto.Tile.parseFrom(decompressed); return VectorTileProto.Tile.parseFrom(decompressed);
} }

Wyświetl plik

@ -276,7 +276,7 @@ public class TestUtils {
var bytes = switch (tileCompression) { var bytes = switch (tileCompression) {
case GZIP -> gunzip(tile.bytes()); case GZIP -> gunzip(tile.bytes());
case NONE -> tile.bytes(); case NONE -> tile.bytes();
case UNKNWON -> throw new IllegalArgumentException("cannot decompress \"UNKNOWN\""); case UNKNOWN -> throw new IllegalArgumentException("cannot decompress \"UNKNOWN\"");
}; };
var decoded = VectorTile.decode(bytes).stream() var decoded = VectorTile.decode(bytes).stream()
.map(feature -> feature(decodeSilently(feature.geometry()), feature.attrs())).toList(); .map(feature -> feature(decodeSilently(feature.geometry()), feature.attrs())).toList();