chiitiler 1.20.2 → 1.21.0

package/README.md

@@ -142,7 +142,7 @@ Chiitiler caches *source assets* (vector tiles, glyphs, sprites) — not final r
 ## Deployment
 
 - **Docker** — `ghcr.io/kanahiro/chiitiler:latest` (entrypoint: `tile-server`)
-- **Docker Compose** — see [`docker-compose.yml`](./docker-compose.yml) (includes MinIO + fake-gcs-server for local testing)
+- **Docker Compose** — see [`docker-compose.yml`](./docker-compose.yml) (includes RustFS + fake-gcs-server for local testing)
 - **AWS Lambda** — ready-to-deploy CDK app in [`cdk/`](./cdk)
 
 ## Develop

package/dist/render/index.js

@@ -1,8 +1,7 @@
 import sharp from 'sharp';
-import { SphericalMercator } from '@mapbox/sphericalmercator';
-const mercator = new SphericalMercator();
 import { LRUCache } from 'lru-cache';
 import { renderTile, render } from './rasterize.js';
+import { mercX, mercY, invMercY } from './mercator.js';
 import { getSource } from '../source/index.js';
 const styleCache = new LRUCache({
     max: 5,
@@ -93,22 +92,23 @@ async function getRenderedTile({ stylejson, z, x, y, tileSize, cache, margin, ex
     }
 }
 const calcRenderingParams = (bbox, size) => {
-    // reference: https://github.com/maptiler/tileserver-gl/blob/cc4b8f7954069fd0e1db731ff07f5349f7b9c8cd/src/serve_rendered.js#L346
-    // very hacky and it might be wrong
-    let zoom = 25;
-    const minCorner = mercator.px([bbox[0], bbox[3]], zoom);
-    const maxCorner = mercator.px([bbox[2], bbox[1]], zoom);
-    const dx = maxCorner[0] - minCorner[0];
-    const dy = maxCorner[1] - minCorner[1];
-    zoom -= Math.max(Math.log(dx / size), Math.log(dy / size)) / Math.LN2;
-    zoom = Math.max(Math.log(size / 256) / Math.LN2, Math.min(25, zoom)) - 1;
-    const width = dx > dy ? size : Math.ceil((dx / dy) * size);
-    const height = dx > dy ? Math.ceil((dy / dx) * size) : size;
-    const mercCenter = [
-        (maxCorner[0] + minCorner[0]) / 2,
-        (maxCorner[1] + minCorner[1]) / 2,
+    // bbox width/height as fractions of the whole world ([0, 1] mercator)
+    const x1 = mercX(bbox[0]);
+    const x2 = mercX(bbox[2]);
+    const y1 = mercY(bbox[3]); // north -> smaller y
+    const y2 = mercY(bbox[1]);
+    const dx = x2 - x1;
+    const dy = y2 - y1;
+    // maplibre-native's world is 512px wide at zoom 0, so at zoom z it is
+    // 512 * 2^z px. The zoom that fits the longer side into `size` px solves
+    // 512 * 2^z * max(dx, dy) = size.
+    const zoom = Math.log2(size / (512 * Math.max(dx, dy)));
+    const width = dx >= dy ? size : Math.ceil((dx / dy) * size);
+    const height = dx >= dy ? Math.ceil((dy / dx) * size) : size;
+    const center = [
+        (bbox[0] + bbox[2]) / 2, // longitude is linear in mercator x
+        invMercY((y1 + y2) / 2), // latitude: invert the mercator-space midpoint
     ];
-    const center = mercator.ll(mercCenter, 25); // latlon
     return { zoom, width, height, center };
 };
 async function getRenderedClip({ stylejson, bbox, size, cache, ext, quality, }) {

package/dist/render/mercator.d.ts

@@ -0,0 +1,5 @@
+declare const mercX: (lon: number) => number;
+declare const mercY: (lat: number) => number;
+declare const invMercX: (x: number) => number;
+declare const invMercY: (y: number) => number;
+export { mercX, mercY, invMercX, invMercY };

package/dist/render/mercator.js

@@ -0,0 +1,8 @@
+const DEG2RAD = Math.PI / 180;
+// lon/lat <-> world coords normalized to [0, 1] (Web Mercator).
+// north is small y; antimeridian is x=0/1.
+const mercX = (lon) => (lon + 180) / 360;
+const mercY = (lat) => 0.5 - Math.log(Math.tan(Math.PI / 4 + (lat * DEG2RAD) / 2)) / (2 * Math.PI);
+const invMercX = (x) => x * 360 - 180;
+const invMercY = (y) => (2 * Math.atan(Math.exp((0.5 - y) * 2 * Math.PI)) - Math.PI / 2) / DEG2RAD;
+export { mercX, mercY, invMercX, invMercY };

package/dist/render/rasterize.js

@@ -1,13 +1,10 @@
-import { SphericalMercator } from '@mapbox/sphericalmercator';
 import { getRenderPool } from './pool.js';
-function getTileCenter(z, x, y, tileSize = 256) {
-    const mercator = new SphericalMercator({
-        size: tileSize,
-    });
-    const px = tileSize / 2 + x * tileSize;
-    const py = tileSize / 2 + y * tileSize;
-    const tileCenter = mercator.ll([px, py], z);
-    return tileCenter;
+import { invMercX, invMercY } from './mercator.js';
+function getTileCenter(z, x, y) {
+    // tile (x, y) center as a world fraction is (x + 0.5) / 2^z, independent
+    // of tile pixel size; convert that back to lon/lat.
+    const n = 2 ** z;
+    return [invMercX((x + 0.5) / n), invMercY((y + 0.5) / n)];
 }
 async function render(style, renderOptions, cache, mode) {
     const pool = await getRenderPool(style, cache, mode);
@@ -56,7 +53,7 @@ async function renderTile(style, z, x, y, options) {
         zoom: renderingParams.zoom,
         width: renderingParams.width + (options.margin ?? 0),
         height: renderingParams.height + (options.margin ?? 0),
-        center: getTileCenter(z, x, y, options.tileSize),
+        center: getTileCenter(z, x, y),
         bearing: 0,
         pitch: 0,
     }, options.cache, tileMode ? 'tile' : 'static');

package/dist/server/routes/camera.d.ts

@@ -115,8 +115,8 @@ declare function createCameraRouter(options: {
                 };
             };
             output: "failed to render static image";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         };
     };
 } & {
@@ -214,8 +214,8 @@ declare function createCameraRouter(options: {
                 };
             };
             output: "failed to render static image";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         } | {
             input: {
                 param: {

package/dist/server/routes/camera.js

@@ -68,7 +68,9 @@ function createCameraRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render static image', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render static image', 500);
         }
     })
         .post('/:zoom/:lat/:lon/:bearing/:pitch/:dimensions_ext', async (c) => {
@@ -122,7 +124,9 @@ function createCameraRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render static image', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render static image', 500);
         }
     });
     return camera;

package/dist/server/routes/clip.d.ts

@@ -37,8 +37,8 @@ declare function createClipRouter(options: {
                 };
             };
             output: "failed to render tile";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         } | {
             input: {
                 param: {
@@ -95,8 +95,8 @@ declare function createClipRouter(options: {
                 };
             };
             output: "failed to render tile";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         } | {
             input: {
                 param: {

package/dist/server/routes/clip.js

@@ -37,7 +37,9 @@ function createClipRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render tile', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render tile', 500);
         }
     })
         .post('/:filename_ext', async (c) => {
@@ -76,7 +78,9 @@ function createClipRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render tile', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render tile', 500);
         }
     });
     return clip;

package/dist/server/routes/tiles.d.ts

@@ -53,8 +53,8 @@ declare function createTilesRouter(options: {
                 };
             };
             output: "failed to render tile";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         } | {
             input: {
                 param: {
@@ -109,8 +109,8 @@ declare function createTilesRouter(options: {
                 };
             };
             output: "failed to render tile";
-            outputFormat: "body";
-            status: 400;
+            outputFormat: "text";
+            status: 500;
         } | {
             input: {
                 param: {

package/dist/server/routes/tiles.js

@@ -45,7 +45,9 @@ function createTilesRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render tile', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render tile', 500);
         }
     })
         .post('/:z/:x/:y_ext', async (c) => {
@@ -85,7 +87,9 @@ function createTilesRouter(options) {
         }
         catch (e) {
             console.error(`render error: ${e}`);
-            return c.body('failed to render tile', 400);
+            // c.text overrides the image/* Content-Type set above; a render
+            // failure is a server-side error so respond 500, not 400.
+            return c.text('failed to render tile', 500);
         }
     });
     return tiles;

package/dist/source/mbtiles.js

@@ -1,8 +1,12 @@
-import Database from 'better-sqlite3';
+import { DatabaseSync } from 'node:sqlite';
 import { unzip } from 'zlib';
 import { LRUCache } from 'lru-cache';
+// A StatementSync is only valid while its DatabaseSync is alive, and node:sqlite
+// does not guarantee the statement keeps the database from being GC'd. Cache the
+// database alongside the statement so both share the entry's lifetime.
 const mbtilesCache = new LRUCache({
     max: 20,
+    dispose: ({ db }) => db.close(),
 });
 /**
  * uri = mbtiles://path/to/file.mbtiles/{z}/{x}/{y}
@@ -11,12 +15,14 @@ async function getMbtilesSource(uri) {
     const mbtilesFilepath = uri
         .replace('mbtiles://', '')
         .replace(/\/\d+\/\d+\/\d+$/, '');
-    let statement = mbtilesCache.get(mbtilesFilepath);
-    if (statement === undefined) {
-        const db = new Database(mbtilesFilepath, { readonly: true });
-        statement = db.prepare('SELECT tile_data FROM tiles WHERE zoom_level = ? AND tile_column = ? AND tile_row = ?');
-        mbtilesCache.set(mbtilesFilepath, statement);
+    let entry = mbtilesCache.get(mbtilesFilepath);
+    if (entry === undefined) {
+        const db = new DatabaseSync(mbtilesFilepath, { readOnly: true });
+        const statement = db.prepare('SELECT tile_data FROM tiles WHERE zoom_level = ? AND tile_column = ? AND tile_row = ?');
+        entry = { db, statement };
+        mbtilesCache.set(mbtilesFilepath, entry);
     }
+    const { statement } = entry;
     const [z, x, y] = uri
         .replace(`mbtiles://${mbtilesFilepath}/`, '')
         .split('/');

package/package.json

@@ -1,56 +1,55 @@
 {
-	"type": "module",
-	"name": "chiitiler",
-	"version": "1.20.2",
-	"description": "Tiny map rendering server for MapLibre Style Spec",
-	"main": "./dist/index.js",
-	"types": "./dist/index.d.ts",
-	"files": [
-		"dist"
-	],
-	"scripts": {
-		"build": "npx esbuild --bundle src/main.ts --minify --outfile=build/main.cjs --platform=node --external:@maplibre/maplibre-gl-native --external:sharp",
-		"check": "tsc --noEmit",
-		"dev": "tsx watch src/main.ts tile-server -D",
-		"test:unit": "vitest src",
-		"test:coverage": "vitest src --coverage --coverage.provider=v8",
-		"test:integration": "vitest tests/integration.test.ts",
-		"test:benchmark": "vitest bench"
-	},
-	"keywords": [],
-	"author": "Kanahiro Iguchi",
-	"license": "MIT",
-	"repository": {
-		"url": "https://github.com/Kanahiro/chiitiler"
-	},
-	"devDependencies": {
-		"@tsconfig/node24": "^24.0.4",
-		"@types/better-sqlite3": "^7.6.13",
-		"@types/node": "^25.6.0",
-		"@vitest/coverage-v8": "^4.1.4",
-		"esbuild": "^0.28.0",
-		"image-size": "^2.0.2",
-		"tsx": "^4.21.0",
-		"typescript": "^6.0.3",
-		"vitest": "^4.1.4"
-	},
-	"dependencies": {
-		"@aws-sdk/client-s3": "^3.1032.0",
-		"@google-cloud/storage": "^7.19.0",
-		"@hono/node-server": "^2.0.0",
-		"@mapbox/sphericalmercator": "^2.0.2",
-		"@mapbox/tilebelt": "^2.0.3",
-		"@maplibre/maplibre-gl-native": "^6.4.1",
-		"@maplibre/maplibre-gl-style-spec": "^24.8.1",
-		"better-sqlite3": "12.9.0",
-		"commander": "^14.0.3",
-		"file-system-cache": "^2.4.7",
-		"higuruma": "^0.1.6",
-		"hono": "^4.12.14",
-		"lightning-pool": "^4.12.0",
-		"lru-cache": "^11.3.5",
-		"maplibre-gl": "^5.23.0",
-		"pmtiles": "^4.4.1",
-		"sharp": "^0.34.5"
-	}
+  "type": "module",
+  "name": "chiitiler",
+  "version": "1.21.0",
+  "description": "Tiny map rendering server for MapLibre Style Spec",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "npx esbuild --bundle src/main.ts --minify --outfile=build/main.cjs --platform=node --external:@maplibre/maplibre-gl-native --external:sharp",
+    "check": "tsc --noEmit",
+    "dev": "tsx watch src/main.ts tile-server -D",
+    "test:unit": "vitest src",
+    "test:coverage": "vitest src --coverage --coverage.provider=v8",
+    "test:integration": "vitest tests/integration.test.ts",
+    "test:benchmark": "tsx tests/benchmark.ts"
+  },
+  "keywords": [],
+  "author": "Kanahiro Iguchi",
+  "license": "MIT",
+  "repository": {
+    "url": "https://github.com/Kanahiro/chiitiler"
+  },
+  "devDependencies": {
+    "@tsconfig/node24": "^24.0.4",
+    "@types/autocannon": "^7.12.7",
+    "@types/node": "^25.6.0",
+    "@vitest/coverage-v8": "^4.1.4",
+    "autocannon": "^8.0.0",
+    "esbuild": "^0.28.0",
+    "image-size": "^2.0.2",
+    "tsx": "^4.21.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.4"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.1032.0",
+    "@google-cloud/storage": "^7.19.0",
+    "@hono/node-server": "^2.0.0",
+    "@mapbox/tilebelt": "^2.0.3",
+    "@maplibre/maplibre-gl-native": "^6.4.1",
+    "@maplibre/maplibre-gl-style-spec": "^24.8.1",
+    "commander": "^14.0.3",
+    "file-system-cache": "^2.4.7",
+    "higuruma": "^0.1.6",
+    "hono": "^4.12.14",
+    "lightning-pool": "^4.12.0",
+    "lru-cache": "^11.3.5",
+    "maplibre-gl": "^5.23.0",
+    "pmtiles": "^4.4.1",
+    "sharp": "^0.34.5"
+  }
 }