some fix

geolonia · Feb 9, 2024 · c53014d · c53014d
1 parent a988a7a
commit c53014d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/bin/convertToUtf8.js b/bin/convertToUtf8.js
@@ -8,7 +8,12 @@ const convertToUtf8 = (content) => {
     return iconv.decode(content, 'Shift_JIS');
   }
 
-  return content;
+  // UTF-8 と判定された場合はそのまま返す
+  if (detectedEncoding === 'UTF-8') {
+    return content;
+  }
+
+  return false;
 }
 
 module.exports = convertToUtf8;
diff --git a/bin/excel2geojson.js b/bin/excel2geojson.js
@@ -30,6 +30,12 @@ const excelToGeoJson = async (inputDir) => {
     } else if (file.path.endsWith(".csv")) {
       csvData = await readFile(file.path);
       csvData = convertToUtf8(csvData);
+
+      if (!csvData) {
+        console.log(`Error: CSV データ ${file.path} を UTF-8 に変換できませんでした。`);
+        continue;
+      }
+
       csvData = csvData.toString('utf-8');
     }