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

Python API changed to do I/O in larger blocks

Browse Source
This commit is contained in:
Brandon Liu
2022-07-07 21:57:28 +08:00
parent 3811ff9b1b
commit 80c0e2b436
8 changed files with 125 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
python/bin/pmtiles-serve
View File

@@ -6,7 +6,7 @@ import json
import re
from socketserver import ThreadingMixIn
import sys
from pmtiles.reader import read
from pmtiles.reader import Reader, MmapSource
# https://docs.python.org/3/library/http.server.html
@@ -14,9 +14,7 @@ class ThreadingSimpleServer(ThreadingMixIn, http.server.HTTPServer):
pass
parser = argparse.ArgumentParser(
description="HTTP server for PMTiles archives."
)
parser = argparse.ArgumentParser(description="HTTP server for PMTiles archives.")
parser.add_argument("pmtiles_file", help="PMTiles archive to serve")
parser.add_argument("port", help="Port to bind to")
parser.add_argument("--bind", help="Address to bind server to: default localhost")
@@ -27,8 +25,11 @@ parser.add_argument(
)
args = parser.parse_args()
with read(args.pmtiles_file) as reader:
fmt = reader.metadata["format"]
with open(args.pmtiles_file, "r+b") as f:
source = MmapSource(f)
reader = Reader(source)
fmt = reader.header().metadata["format"]
class Handler(http.server.SimpleHTTPRequestHandler):
def do_GET(self):
@@ -37,7 +38,7 @@ with read(args.pmtiles_file) as reader:
if args.cors_allow_all:
self.send_header("Access-Control-Allow-Origin", "*")
self.end_headers()
self.wfile.write(json.dumps(reader.metadata).encode("utf-8"))
self.wfile.write(json.dumps(reader.header().metadata).encode("utf-8"))
return
match = re.match("/(\d+)/(\d+)/(\d+)." + fmt, self.path)
if not match:

21
python/bin/pmtiles-show
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python
import sys
from pmtiles.reader import Reader, MmapSource
from pmtiles.reader import Reader, MmapSource, load_directory
if len(sys.argv) <= 1:
print("Usage: pmtiles-show PMTILES_FILE")
@@ -9,32 +9,33 @@ if len(sys.argv) <= 1:
print("Usage: pmtiles-show PMTILES_FILE list")
exit(1)
with open(sys.argv[1],'r+b') as f:
with open(sys.argv[1], "r+b") as f:
reader = Reader(MmapSource(f))
spec_version = reader.version
spec_version = reader.header().version
if len(sys.argv) == 2:
print("spec version: ", spec_version)
print("metadata:")
for k, v in reader.metadata.items():
for k, v in reader.header().metadata.items():
print(k, "=", v)
print("root entries:", reader.root_entries)
print("leaf directories:", len(set(reader.leaves.values())))
print("root dir tiles:", len(reader.header().root_dir))
print("leaf directories:", len(set(reader.header().leaves.values())))
elif len(sys.argv) == 3:
last_val = None
for k, v in reader.root_dir.items():
for k, v in reader.header().root_dir.items():
print(f"{k[0]} {k[1]} {k[2]} {v[0]} {v[1]}")
if last_val and k <= last_val:
raise Exception("Error: directory entries not sorted")
last_val = k
for val in set(reader.leaves.values()):
leaf_dir, _ = reader.load_directory(val[0], val[1] // 17)
for val in set(reader.header().leaves.values()):
dir_bytes = reader.get_bytes(val[0], val[1])
leaf_dir, _ = load_directory(dir_bytes, 0, val[1] // 17)
last_val = None
for k, v in leaf_dir.items():
print(f"{k[0]} {k[1]} {k[2]} {v[0]} {v[1]}")
if last_val and k <= last_val:
raise Exception("Error: irectory entries not sorted")
raise Exception("Error: directory entries not sorted")
last_val = k
else:
z = int(sys.argv[2])