mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 02:41:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from protomaps/python-writer-improvements

Browse Source 
python writer improvements
This commit is contained in:
Brandon Liu
2023-06-23 11:39:51 +08:00
committed by GitHub
parent ce4c930439 1940b4eff6
commit 651e3ce5f4
5 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/pmtiles/tile.py
View File

@@ -274,12 +274,16 @@ def serialize_header(h):
write_uint8(h["tile_type"].value)
write_uint8(h["min_zoom"])
write_uint8(h["max_zoom"])
write_int32(h["min_lon_e7"])
write_int32(h["min_lat_e7"])
write_int32(h["max_lon_e7"])
write_int32(h["max_lat_e7"])
write_uint8(h["center_zoom"])
write_int32(h["center_lon_e7"])
write_int32(h["center_lat_e7"])
min_lon_e7 = h.get("min_lon_e7",-180)
write_int32(min_lon_e7)
min_lat_e7 = h.get("min_lat_e7",-90)
write_int32(min_lat_e7)
max_lon_e7 = h.get("max_lon_e7",180)
write_int32(max_lon_e7)
max_lat_e7 = h.get("max_lat_e7",90)
write_int32(max_lat_e7)
write_uint8(h.get("center_zoom",h["min_zoom"]))
write_int32(h.get("center_lon_e7", round((min_lon_e7 + max_lon_e7) / 2)))
write_int32(h.get("center_lat_e7", round((min_lat_e7 + max_lat_e7) / 2)))
return b_io.getvalue()

20
python/pmtiles/writer.py
View File

@@ -3,7 +3,13 @@ import tempfile
import gzip
import shutil
from contextlib import contextmanager
from .tile import Entry, serialize_directory, Compression, serialize_header
from .tile import (
Entry,
serialize_directory,
Compression,
serialize_header,
tileid_to_zxy,
)
@contextmanager
@@ -55,9 +61,12 @@ class Writer:
self.tile_f = tempfile.TemporaryFile()
self.offset = 0
self.addressed_tiles = 0
self.clustered = True
# TODO enforce ordered writes
def write_tile(self, tileid, data):
if len(self.tile_entries) > 0 and tileid < self.tile_entries[-1].tile_id:
self.clustered = False
hsh = hash(data)
if hsh in self.hash_to_offset:
last = self.tile_entries[-1]
@@ -83,6 +92,11 @@ class Writer:
header["tile_entries_count"] = len(self.tile_entries)
header["tile_contents_count"] = len(self.hash_to_offset)
self.tile_entries = sorted(self.tile_entries, key=lambda e: e.tile_id)
header["min_zoom"] = tileid_to_zxy(self.tile_entries[0].tile_id)[0]
header["max_zoom"] = tileid_to_zxy(self.tile_entries[-1].tile_id)[0]
root_bytes, leaves_bytes, num_leaves = optimize_directories(
self.tile_entries, 16384 - 127
)
@@ -105,7 +119,7 @@ class Writer:
)
compressed_metadata = gzip.compress(json.dumps(metadata).encode())
header["clustered"] = True
header["clustered"] = self.clustered
header["internal_compression"] = Compression.GZIP
header["root_offset"] = 127
header["root_length"] = len(root_bytes)