From 30ac843a5f77a79743a8568f63370bab36511f83 Mon Sep 17 00:00:00 2001
From: Miko <miko@none>
Date: Fri, 17 Jan 2025 22:15:06 +0100
Subject: [PATCH] remove not working isLight function

---
 src/serve_data.js | 10 ++++++++--
 src/server.js     |  4 ++--
 src/utils.js      | 14 --------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/serve_data.js b/src/serve_data.js
index 99459b9..e63d9f3 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -14,14 +14,20 @@ import {
   getTileUrls,
   isValidHttpUrl,
   fetchTileData,
-  isLight,
 } from './utils.js';
 import { getPMtilesInfo, openPMtiles } from './pmtiles_adapter.js';
 import { gunzipP, gzipP } from './promises.js';
 import { openMbTilesWrapper } from './mbtiles_wrapper.js';
 
+import fs from 'node:fs';
+import { fileURLToPath } from 'url';
+const packageJson = JSON.parse(
+  fs.readFileSync(path.dirname(fileURLToPath(import.meta.url)) + '/../package.json', 'utf8'),
+);
+
+const isLight = (packageJson.name.slice(-6) === '-light');
 const serve_rendered = (
-  await import(`${!isLight() ? `./serve_rendered.js` : `./serve_light.js`}`)
+  await import(`${!isLight ? `./serve_rendered.js` : `./serve_light.js`}`)
 ).serve_rendered;
 
 export const serve_data = {
diff --git a/src/server.js b/src/server.js
index 3b5b6f6..b30e28f 100644
--- a/src/server.js
+++ b/src/server.js
@@ -21,7 +21,6 @@ import {
   getTileUrls,
   getPublicUrl,
   isValidHttpUrl,
-  isLight,
 } from './utils.js';
 
 import { fileURLToPath } from 'url';
@@ -29,9 +28,10 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const packageJson = JSON.parse(
   fs.readFileSync(__dirname + '/../package.json', 'utf8'),
 );
+const isLight = (packageJson.name.slice(-6) === '-light');
 
 const serve_rendered = (
-  await import(`${!isLight() ? `./serve_rendered.js` : `./serve_light.js`}`)
+  await import(`${!isLight ? `./serve_rendered.js` : `./serve_light.js`}`)
 ).serve_rendered;
 
 /**
diff --git a/src/utils.js b/src/utils.js
index 41fa831..5dab80a 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -12,20 +12,6 @@ export const allowedSpriteFormats = allowedOptions(['png', 'json']);
 
 export const allowedTileSizes = allowedOptions(['256', '512']);
 
-import { fileURLToPath } from 'url';
-
-/**
- *
- */
-export function isLight() {
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
-  const packageJson = JSON.parse(
-    fs.readFileSync(__dirname + '/../package.json', 'utf8'),
-  );
-  return packageJson.name.slice(-6) === '-light';
-}
-
 /**
  * Restrict user input to an allowed set of options.
  * @param {string[]} opts - An array of allowed option strings.