From d941fbe9a38d6f47b8493e34974720b80dfa3483 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Wed, 10 Jan 2024 05:13:04 -0500 Subject: [PATCH] typos --- .../onthegomap/planetiler/archive/TileArchiveWriter.java | 2 +- .../onthegomap/planetiler/archive/TileCompression.java | 6 +++--- .../onthegomap/planetiler/pmtiles/ReadablePmtiles.java | 2 +- .../planetiler/stream/WriteableProtoStreamArchive.java | 2 +- .../com/onthegomap/planetiler/util/CompareArchives.java | 8 ++++---- .../test/java/com/onthegomap/planetiler/TestUtils.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveWriter.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveWriter.java index 7b932d55..86e0af7f 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveWriter.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileArchiveWriter.java @@ -296,7 +296,7 @@ public class TileArchiveWriter { bytes = switch (config.tileCompression()) { case GZIP -> gzip(encoded); case NONE -> encoded; - case UNKNWON -> throw new IllegalArgumentException("cannot compress \"UNKNOWN\""); + case UNKNOWN -> throw new IllegalArgumentException("cannot compress \"UNKNOWN\""); }; layerStats = TileSizeStats.computeTileStats(proto); if (encoded.length > config.tileWarningSizeBytes()) { diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileCompression.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileCompression.java index 1277b313..2e8b5bd7 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileCompression.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/archive/TileCompression.java @@ -20,7 +20,7 @@ public enum TileCompression { @JsonProperty("gzip") GZIP("gzip"), @JsonProperty("unknown") - UNKNWON("unknown"); + UNKNOWN("unknown"); private final String id; @@ -42,7 +42,7 @@ public enum TileCompression { } public static Set 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() { @@ -52,7 +52,7 @@ public enum TileCompression { static class Deserializer extends JsonDeserializer { @Override public TileCompression deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { - return findById(p.getValueAsString()).orElse(TileCompression.UNKNWON); + return findById(p.getValueAsString()).orElse(TileCompression.UNKNOWN); } @Override diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/ReadablePmtiles.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/ReadablePmtiles.java index 4e4bb714..88fd0d71 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/ReadablePmtiles.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/ReadablePmtiles.java @@ -121,7 +121,7 @@ public class ReadablePmtiles implements ReadableTileArchive { TileCompression tileCompression = switch (header.tileCompression()) { case GZIP -> TileCompression.GZIP; case NONE -> TileCompression.NONE; - case UNKNOWN -> TileCompression.UNKNWON; + case UNKNOWN -> TileCompression.UNKNOWN; }; String format = switch (header.tileType()) { diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableProtoStreamArchive.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableProtoStreamArchive.java index cf5da59b..54566948 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableProtoStreamArchive.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/stream/WriteableProtoStreamArchive.java @@ -88,7 +88,7 @@ public final class WriteableProtoStreamArchive extends WriteableStreamArchive { final StreamArchiveProto.TileCompression tileCompression = switch (metadata.tileCompression()) { case GZIP -> StreamArchiveProto.TileCompression.TILE_COMPRESSION_GZIP; 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); if (metadata.vectorLayers() != null) { diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CompareArchives.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CompareArchives.java index 426f770b..0a73c7e5 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CompareArchives.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CompareArchives.java @@ -107,8 +107,8 @@ public class CompareArchives { archive2: {} """, reader1.metadata(), reader2.metadata()); } - compression = metadata1 == null ? TileCompression.UNKNWON : metadata1.tileCompression(); - TileCompression compression2 = metadata2 == null ? TileCompression.UNKNWON : metadata2.tileCompression(); + compression = metadata1 == null ? TileCompression.UNKNOWN : metadata1.tileCompression(); + TileCompression compression2 = metadata2 == null ? TileCompression.UNKNOWN : metadata2.tileCompression(); if (compression != compression2) { throw new IllegalArgumentException( "input1 and input2 must have the same compression, got " + compression + " and " + @@ -123,7 +123,7 @@ public class CompareArchives { var total = new AtomicLong(0); var diffs = new AtomicLong(0); record Diff(Tile a, Tile b) {} - var pipeline = WorkerPipeline.start("tilestats", stats) + var pipeline = WorkerPipeline.start("compare", stats) .fromGenerator("enumerate", next -> { try ( var reader1 = TileArchives.newReader(input1, config); @@ -270,7 +270,7 @@ public class CompareArchives { byte[] decompressed = switch (tileCompression) { case GZIP -> Gzip.gunzip(bytes); case NONE -> bytes; - case UNKNWON -> throw new IllegalArgumentException("Unknown compression"); + case UNKNOWN -> throw new IllegalArgumentException("Unknown compression"); }; return VectorTileProto.Tile.parseFrom(decompressed); } diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java index 8065ac99..a0b69852 100644 --- a/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java +++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java @@ -276,7 +276,7 @@ public class TestUtils { var bytes = switch (tileCompression) { case GZIP -> gunzip(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() .map(feature -> feature(decodeSilently(feature.geometry()), feature.attrs())).toList();