From d88db0ead4daac87ffbeddb16316cf4be9e0f3c3 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Tue, 28 Jun 2022 00:36:19 +0200
Subject: [PATCH] update redisMoveCanvas.js util script

---
 src/canvases.json        |  2 +-
 src/core/Tile.js         |  8 ++++++--
 utils/redisMoveCanvas.js | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/canvases.json b/src/canvases.json
index 09fbaf6..4232251 100644
--- a/src/canvases.json
+++ b/src/canvases.json
@@ -300,7 +300,7 @@
     "size": 2048,
     "historicalSizes": [
       [
-        "20220626",
+        "20220627",
         1024
       ]
     ],
diff --git a/src/core/Tile.js b/src/core/Tile.js
index 6186784..02c87c0 100644
--- a/src/core/Tile.js
+++ b/src/core/Tile.js
@@ -610,7 +610,9 @@ export async function initializeTiles(
   const maxBase = TILE_ZOOM_LEVEL ** zoom;
   for (let cx = 0; cx < maxBase; cx += 1) {
     const tileDir = `${canvasTileFolder}/${zoom}/${cx}`;
-    if (!fs.existsSync(tileDir)) fs.mkdirSync(tileDir);
+    if (!fs.existsSync(tileDir)) {
+      fs.mkdirSync(tileDir);
+    }
     for (let cy = 0; cy < maxBase; cy += 1) {
       const filename = `${canvasTileFolder}/${zoom}/${cx}/${cy}.webp`;
       if (force || !fs.existsSync(filename)) {
@@ -639,7 +641,9 @@ export async function initializeTiles(
     const maxZ = TILE_ZOOM_LEVEL ** zoom;
     for (let cx = 0; cx < maxZ; cx += 1) {
       const tileDir = `${canvasTileFolder}/${zoom}/${cx}`;
-      if (!fs.existsSync(tileDir)) fs.mkdirSync(tileDir);
+      if (!fs.existsSync(tileDir)) {
+        fs.mkdirSync(tileDir);
+      }
       for (let cy = 0; cy < maxZ; cy += 1) {
         const filename = `${canvasTileFolder}/${zoom}/${cx}/${cy}.webp`;
         if (force || !fs.existsSync(filename)) {
diff --git a/utils/redisMoveCanvas.js b/utils/redisMoveCanvas.js
index f3d60af..93b14b1 100644
--- a/utils/redisMoveCanvas.js
+++ b/utils/redisMoveCanvas.js
@@ -1,25 +1,25 @@
 // this script moves chunks of a canvas, i.e. to center it after changing size
 
-import redis from 'redis';
+import { createClient } from 'redis';
 
 //ATTENTION Make suer to set the rdis URLs right!!!
 const url = "redis://localhost:6379";
-const redisc = redis.createClient({ url, return_buffers: true });
+const redisc = createClient({ url });
 
-const CANVAS_SIZE = 4096;
+const CANVAS_SIZE = 1024;
 const TILE_SIZE = 256;
-const offset = (16384 - 4096) / 2 / 256;
+const offset = (2048 - 1024) / 2 / 256;
 
 const CHUNKS_XY = CANVAS_SIZE / TILE_SIZE;
 
 async function move() {
   for (let x = CHUNKS_XY - 1; x >= 0; x--) {
     for (let y = CHUNKS_XY - 1; y >= 0; y--) {
-      const key = `ch:1:${x}:${y}`;
-      const chunk = await redisc.get(key);
+      const key = `ch:8:${x}:${y}`;
+      const chunk = await redisc.get(key, { returnBuffers: true });
       if (chunk) {
         const buffer = new Uint8Array(chunk);
-        const newKey = `ch:1:${x + offset}:${y + offset}`
+        const newKey = `ch:8:${x + offset}:${y + offset}`
         await redisc.set(newKey, Buffer.from(buffer.buffer));
         await redisc.del(key);
         console.log('Moved Chunk ', key, ' to ', newKey);