Fix: distに震度分布画像のアセットと地域マップがコピーされるように / Del: 正確にスケジュールが動作する機能 / Fix: 返信とメンションの返答が記録されない問題 / Fix: 震度分布画像が投稿されない問題 / Chg: 震度分布画像のメッセージを変更 / Fix: 条件に合わなくても震度分布画像を生成する問題 / Fix: 震度分布画像に隙間が空く問題

src/feature/earthquake/generateImage/index.ts

@@ -154,7 +154,9 @@ function getEdge<T extends any[]>(arr: T, property: keyof T[number]) {
 export default async function generateImage(message: any) {
   if (
     message.earthquake.hypocenter === undefined ||
-    message.points === undefined
+    message.earthquake.hypocenter?.name === "" ||
+    !(Array.isArray(message.points)) ||
+    message.points.length === 0
   )
     return "input_lack";
 
@@ -289,34 +291,12 @@ export default async function generateImage(message: any) {
 
   xSize = tileXCount.most - tileXCount.least + 1;
   ySize = tileYCount.most - tileYCount.least + 1;
-
   if (xSize > ySize) {
     tileSize = Math.round(WIDTH / xSize);
   } else {
     tileSize = Math.round(HEIGHT / ySize);
   }
 
-  // 全画面
-  if (WIDTH - xSize * tileSize > 10) {
-    const requireTilesX = Math.ceil(WIDTH / tileSize);
-    const halfTilesX = Math.ceil(requireTilesX / 2);
-
-    tileXCount = {
-      least: tileXCount.least - halfTilesX,
-      most: tileXCount.most + halfTilesX,
-    }
-  }
-
-  if (HEIGHT - ySize * tileSize > 10) {
-    const requireTilesY = Math.ceil(HEIGHT / tileSize);
-    const halfTilesY = Math.ceil(requireTilesY / 2);
-
-    tileYCount = {
-      least: tileYCount.least - halfTilesY,
-      most: tileYCount.most + halfTilesY,
-    }
-  }
-
   // 震源を中心とする
   const epicenterPosition = positions.filter(position => position.type === "epicenter")[0];
   if (!epicenterPosition)
@@ -362,13 +342,37 @@ export default async function generateImage(message: any) {
   // タイルサイズ再計算
   xSize = tileXCount.most - tileXCount.least + 1;
   ySize = tileYCount.most - tileYCount.least + 1;
-
   if (xSize > ySize) {
     tileSize = Math.round(WIDTH / xSize);
   } else {
     tileSize = Math.round(HEIGHT / ySize);
   }
 
+  // 全画面
+  if (WIDTH - xSize * tileSize > 5) {
+    const requireTilesX = Math.ceil(WIDTH / tileSize);
+    const halfTilesX = Math.ceil(requireTilesX / 2);
+
+    tileXCount = {
+      least: tileXCount.least - halfTilesX,
+      most: tileXCount.most + halfTilesX,
+    }
+  }
+
+  if (HEIGHT - ySize * tileSize > 5) {
+    const requireTilesY = Math.ceil(HEIGHT / tileSize);
+    const halfTilesY = Math.ceil(requireTilesY / 2);
+
+    tileYCount = {
+      least: tileYCount.least - halfTilesY,
+      most: tileYCount.most + halfTilesY,
+    }
+  }
+
+  // タイル幅再計算
+  xSize = tileXCount.most - tileXCount.least + 1;
+  ySize = tileYCount.most - tileYCount.least + 1;
+
   // 欠けているタイルを取得
   for (let xIndex = 0; xIndex < xSize; xIndex++) {
     const itX = xIndex + tileXCount.least;