From a233e683bd6f153c5d6b8cbdc20c68a3f3c48953 Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Thu, 28 Dec 2023 19:43:00 +0800 Subject: [PATCH] fix center coordinates of pmtiles writer (#769) --- .../planetiler/pmtiles/WriteablePmtiles.java | 4 ++-- .../planetiler/pmtiles/PmtilesTest.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/WriteablePmtiles.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/WriteablePmtiles.java index f7be4efc..7a4b4a21 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/WriteablePmtiles.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/WriteablePmtiles.java @@ -199,8 +199,8 @@ public final class WriteablePmtiles implements WriteableTileArchive { (int) (bounds.getMaxX() * 10_000_000), (int) (bounds.getMaxY() * 10_000_000), (byte) zoom, - (int) center.x * 10_000_000, - (int) center.y * 10_000_000 + (int) (center.x * 10_000_000), + (int) (center.y * 10_000_000) ); LOGGER.info("Writing metadata and leaf directories..."); diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/pmtiles/PmtilesTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/pmtiles/PmtilesTest.java index 48c09cea..0bfc1f80 100644 --- a/planetiler-core/src/test/java/com/onthegomap/planetiler/pmtiles/PmtilesTest.java +++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/pmtiles/PmtilesTest.java @@ -54,13 +54,13 @@ class PmtilesTest { Pmtiles.TileType tileType = Pmtiles.TileType.MVT; byte minZoom = 1; byte maxZoom = 3; - int minLonE7 = -10_000_000; - int minLatE7 = -20_000_000; - int maxLonE7 = 10_000_000; - int maxLatE7 = 20_000_000; + int minLonE7 = -10_100_000; + int minLatE7 = -20_200_000; + int maxLonE7 = 10_100_000; + int maxLatE7 = 20_200_000; byte centerZoom = 2; - int centerLonE7 = -5_000_000; - int centerLatE7 = -6_000_000; + int centerLonE7 = -5_500_000; + int centerLatE7 = -6_600_000; Pmtiles.Header in = new Pmtiles.Header( specVersion, @@ -220,8 +220,8 @@ class PmtilesTest { "MyVersion", "baselayer", TileArchiveMetadata.MVT_FORMAT, - new Envelope(1, 2, 3, 4), - new CoordinateXY(5, 6), + new Envelope(1.1, 2.2, 3.3, 4.4), + new CoordinateXY(5.5, 6.6), 7d, 8, 9,