From 222da24b031f99273eea405e8419c6e281f634ed Mon Sep 17 00:00:00 2001
From: Andrew Calcutt <acalcutt@techidiots.net>
Date: Mon, 22 Jan 2024 00:21:54 -0500
Subject: [PATCH] fix: remove unneeded tileSize

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
---
 src/serve_data.js     |  2 --
 src/serve_rendered.js |  2 --
 src/server.js         |  8 +-------
 src/utils.js          | 19 +++----------------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/serve_data.js b/src/serve_data.js
index d818c66..51ef0d0 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -169,7 +169,6 @@ export const serve_data = {
     );
 
     app.get('/:id.json', (req, res, next) => {
-      const tileSize = undefined;
       const item = repo[req.params.id];
       if (!item) {
         return res.sendStatus(404);
@@ -179,7 +178,6 @@ export const serve_data = {
         req,
         info.tiles,
         `data/${req.params.id}`,
-        tileSize,
         info.format,
         item.publicUrl,
         {
diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index 3cfeae9..37dd0ee 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -823,7 +823,6 @@ export const serve_rendered = {
     }
 
     app.get('/:id.json', (req, res, next) => {
-      const tileSize = 512;
       const item = repo[req.params.id];
       if (!item) {
         return res.sendStatus(404);
@@ -833,7 +832,6 @@ export const serve_rendered = {
         req,
         info.tiles,
         `styles/${req.params.id}`,
-        tileSize,
         info.format,
         item.publicUrl,
       );
diff --git a/src/server.js b/src/server.js
index bedcd2f..ae2f8ff 100644
--- a/src/server.js
+++ b/src/server.js
@@ -356,7 +356,6 @@ function start(opts) {
 
   const addTileJSONs = (arr, req, type) => {
     for (const id of Object.keys(serving[type])) {
-      const tileSize = 256;
       const info = clone(serving[type][id].tileJSON);
       let path = '';
       if (type === 'rendered') {
@@ -368,7 +367,6 @@ function start(opts) {
         req,
         info.tiles,
         path,
-        tileSize,
         info.format,
         opts.publicUrl,
         {
@@ -454,7 +452,6 @@ function start(opts) {
       };
 
       if (style.serving_rendered) {
-        const tileSize = 256;
         const { center } = style.serving_rendered.tileJSON;
         if (center) {
           style.viewer_hash = `#${center[2]}/${center[1].toFixed(
@@ -470,7 +467,6 @@ function start(opts) {
           req,
           style.serving_rendered.tileJSON.tiles,
           `styles/${id}`,
-          tileSize,
           style.serving_rendered.tileJSON.format,
           opts.publicUrl,
         )[0];
@@ -494,19 +490,17 @@ function start(opts) {
 
       data.is_vector = tileJSON.format === 'pbf';
       if (!data.is_vector) {
-        const tileSize = 256;
         if (center) {
           const centerPx = mercator.px([center[0], center[1]], center[2]);
           data.thumbnail = `${center[2]}/${Math.floor(
             centerPx[0] / 256,
-          )}/${Math.floor(centerPx[1] / tileSize)}.${tileJSON.format}`;
+          )}/${Math.floor(centerPx[1] / 256)}.${tileJSON.format}`;
         }
 
         data.xyz_link = getTileUrls(
           req,
           tileJSON.tiles,
           `data/${id}`,
-          tileSize,
           tileJSON.format,
           opts.publicUrl,
           {
diff --git a/src/utils.js b/src/utils.js
index b8dea23..2e63437 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -26,15 +26,7 @@ export const getPublicUrl = (publicUrl, req) => {
   return getUrlObject(req).toString();
 };
 
-export const getTileUrls = (
-  req,
-  domains,
-  path,
-  tileSize,
-  format,
-  publicUrl,
-  aliases,
-) => {
+export const getTileUrls = (req, domains, path, format, publicUrl, aliases) => {
   const urlObject = getUrlObject(req);
   if (domains) {
     if (domains.constructor === String && domains.length > 0) {
@@ -75,20 +67,15 @@ export const getTileUrls = (
     format = aliases[format];
   }
 
-  let tileParams = '{z}/{x}/{y}';
-  if (tileSize && ['png', 'jpg', 'jpeg', 'webp'].includes(format)) {
-    tileParams = '{tileSize}/{z}/{x}/{y}';
-  }
-
   const uris = [];
   if (!publicUrl) {
     for (const domain of domains) {
       uris.push(
-        `${req.protocol}://${domain}/${path}/${tileParams}.${format}${query}`,
+        `${req.protocol}://${domain}/${path}/{tileSize}/{z}/{x}/{y}.${format}${query}`,
       );
     }
   } else {
-    uris.push(`${publicUrl}${path}/${tileParams}.${format}${query}`);
+    uris.push(`${publicUrl}${path}/{tileSize}/{z}/{x}/{y}.${format}${query}`);
   }
 
   return uris;