From c60cde5cec59fc1b9832788c2113b2c0db672363 Mon Sep 17 00:00:00 2001
From: Zsolt Jakubinyi <zsolt.jakubinyi@beamtrail.com>
Date: Fri, 1 Aug 2025 14:54:25 +0400
Subject: [PATCH] fix: fixing the asset URLs when using tileserver behind a
 reverse proxy and no publicUrl defined.

---
 src/server.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/server.js b/src/server.js
index fac226e95b..db01d5a91b 100644
--- a/src/server.js
+++ b/src/server.js
@@ -711,7 +711,7 @@ async function start(opts) {
           if (data) {
             data['server_version'] =
               `${packageJson.name} v${packageJson.version}`;
-            data['public_url'] = opts.publicUrl || '/';
+            data['public_url'] = `${getPublicUrl(opts.publicUrl, req)}`;
             data['is_light'] = isLight;
             data['key_query_part'] = req.query.key
               ? `key=${encodeURIComponent(req.query.key)}&amp;`
@@ -896,16 +896,7 @@ async function start(opts) {
       return null;
     }
 
-    let baseUrl;
-    if (opts.publicUrl) {
-      baseUrl = opts.publicUrl;
-    } else {
-      baseUrl = `${
-        req.get('X-Forwarded-Protocol')
-          ? req.get('X-Forwarded-Protocol')
-          : req.protocol
-      }://${req.get('host')}/`;
-    }
+    let baseUrl = `${getPublicUrl(opts.publicUrl, req)}`;
 
     return {
       ...wmts,