ppfun/pixelplanet
13
Fork 18
Code Issues 24 Pull Requests Releases 2 Activity

even more path.resolve

Browse Source
This commit is contained in:
HF 2023-12-29 14:36:45 +01:00
parent e3f9c92a3b
commit 2bfd556c3c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/Tile.js
View File

@ -242,7 +242,9 @@ function addIndexedSubtiletoTile(
*/ */
function tileFileName(canvasTileFolder, cell) { function tileFileName(canvasTileFolder, cell) {
const [z, x, y] = cell; const [z, x, y] = cell;
const filename = path.resolve(canvasTileFolder, z, x, `${y}.webp`); const filename = path.resolve(
canvasTileFolder, String(z), String(x), `${y}.webp`,
);
try { try {
const mtime = new Date(fs.statSync(filename).mtime).getTime(); const mtime = new Date(fs.statSync(filename).mtime).getTime();
if (Date.now() - mtime < 120000) { if (Date.now() - mtime < 120000) {
@ -616,19 +618,21 @@ export async function initializeTiles(
await createEmptyTile(canvasTileFolder, palette); await createEmptyTile(canvasTileFolder, palette);
// base zoomlevel // base zoomlevel
let zoom = maxTiledZoom - 1; let zoom = maxTiledZoom - 1;
let zoomDir = path.resolve(canvasTileFolder, zoom); let zoomDir = path.resolve(canvasTileFolder, String(zoom));
console.log(`Tiling: Checking zoomlevel ${zoomDir}`); console.log(`Tiling: Checking zoomlevel ${zoomDir}`);
if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir); if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir);
let cnt = 0; let cnt = 0;
let cnts = 0; let cnts = 0;
const maxBase = TILE_ZOOM_LEVEL ** zoom; const maxBase = TILE_ZOOM_LEVEL ** zoom;
for (let cx = 0; cx < maxBase; cx += 1) { for (let cx = 0; cx < maxBase; cx += 1) {
const tileDir = path.resolve(canvasTileFolder, zoom, cx); const tileDir = path.resolve(canvasTileFolder, String(zoom), String(cx));
if (!fs.existsSync(tileDir)) { if (!fs.existsSync(tileDir)) {
fs.mkdirSync(tileDir); fs.mkdirSync(tileDir);
} }
for (let cy = 0; cy < maxBase; cy += 1) { for (let cy = 0; cy < maxBase; cy += 1) {
const filename = path.resolve(canvasTileFolder, zoom, cx, `${cy}.webp`); const filename = path.resolve(
canvasTileFolder, String(zoom), String(cx), `${cy}.webp`,
);
if (force || !fs.existsSync(filename)) { if (force || !fs.existsSync(filename)) {
const ret = await createZoomTileFromChunk( const ret = await createZoomTileFromChunk(
canvasId, canvasId,
@ -649,18 +653,18 @@ export async function initializeTiles(
for (zoom = maxTiledZoom - 2; zoom >= 0; zoom -= 1) { for (zoom = maxTiledZoom - 2; zoom >= 0; zoom -= 1) {
cnt = 0; cnt = 0;
cnts = 0; cnts = 0;
zoomDir = path.resolve(canvasTileFolder, zoom); zoomDir = path.resolve(canvasTileFolder, String(zoom));
console.log(`Tiling: Checking zoomlevel ${zoomDir}`); console.log(`Tiling: Checking zoomlevel ${zoomDir}`);
if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir); if (!fs.existsSync(zoomDir)) fs.mkdirSync(zoomDir);
const maxZ = TILE_ZOOM_LEVEL ** zoom; const maxZ = TILE_ZOOM_LEVEL ** zoom;
for (let cx = 0; cx < maxZ; cx += 1) { for (let cx = 0; cx < maxZ; cx += 1) {
const tileDir = path.resolve(canvasTileFolder, zoom, cx); const tileDir = path.resolve(canvasTileFolder, String(zoom), String(cx));
if (!fs.existsSync(tileDir)) { if (!fs.existsSync(tileDir)) {
fs.mkdirSync(tileDir); fs.mkdirSync(tileDir);
} }
for (let cy = 0; cy < maxZ; cy += 1) { for (let cy = 0; cy < maxZ; cy += 1) {
const filename = path.resolve( const filename = path.resolve(
canvasTileFolder, zoom, cx, `${cy}.webp`, canvasTileFolder, String(zoom), String(cx), `${cy}.webp`,
); );
if (force || !fs.existsSync(filename)) { if (force || !fs.existsSync(filename)) {
const ret = await createZoomedTile( const ret = await createZoomedTile(

4
src/core/tileserver.js
View File

@ -61,7 +61,7 @@ class CanvasUpdater {
this.TileLoadingQueues = []; this.TileLoadingQueues = [];
this.id = id; this.id = id;
this.canvas = canvases[id]; this.canvas = canvases[id];
this.canvasTileFolder = path.resolve(TILE_FOLDER, id); this.canvasTileFolder = path.resolve(TILE_FOLDER, String(id));
this.firstZoomtileWidth = this.canvas.size / TILE_SIZE / TILE_ZOOM_LEVEL; this.firstZoomtileWidth = this.canvas.size / TILE_SIZE / TILE_ZOOM_LEVEL;
this.maxTiledZoom = getMaxTiledZoom(this.canvas.size); this.maxTiledZoom = getMaxTiledZoom(this.canvas.size);
} }
@ -144,7 +144,7 @@ class CanvasUpdater {
*/ */
initialize() { initialize() {
logger.info(`Tiling: Using folder ${this.canvasTileFolder}`); logger.info(`Tiling: Using folder ${this.canvasTileFolder}`);
if (!fs.existsSync(`${this.canvasTileFolder}/0`)) { if (!fs.existsSync(path.resolve(this.canvasTileFolder, '0'))) {
if (!fs.existsSync(this.canvasTileFolder)) { if (!fs.existsSync(this.canvasTileFolder)) {
fs.mkdirSync(this.canvasTileFolder); fs.mkdirSync(this.canvasTileFolder);
} }