From 2c2dac8c9add8e7dd6299224cfa716d4ccdb7cab Mon Sep 17 00:00:00 2001
From: Patrick Joyce <pjaudiomv@gmail.com>
Date: Sun, 18 Feb 2024 11:59:54 -0500
Subject: [PATCH] use xlsx

---
 README.md                    |  2 +-
 src/lib/DataConverter.svelte | 16 ++++++++--------
 src/lib/DataUtils.ts         |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6812081..0720afa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # BMLT Data Converter
 
-- Converts BMLT data from JSON to CSV, XLS or KML
+- Converts BMLT data from JSON to CSV, XLSX or KML
   - Note that export of KML is only supported with GetSearchResults.
 - Use your semantic interface to build query url
 
diff --git a/src/lib/DataConverter.svelte b/src/lib/DataConverter.svelte
index 55f0f19..ba0c6cc 100644
--- a/src/lib/DataConverter.svelte
+++ b/src/lib/DataConverter.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
 	import { writable } from 'svelte/store';
-	import { fetchData, exportCSV, exportXLS, exportKML } from './DataUtils';
+	import { fetchData, exportCSV, exportXLSX, exportKML } from './DataUtils';
 
 	const processing = writable<boolean>(false);
 	const errorMessage = writable<string>('');
 	const loadingText = writable<string>('');
 	let query: string = '';
 	let csvDownloadUrl: string = '';
-	let xlsDownloadUrl: string = '';
+	let xlsxDownloadUrl: string = '';
 	let kmlDownloadUrl: string = '';
 	let interval: number | undefined;
 
@@ -39,7 +39,7 @@
 		errorMessage.set('');
 		loadingText.set('Processing');
 		csvDownloadUrl = '';
-		xlsDownloadUrl = '';
+		xlsxDownloadUrl = '';
 		kmlDownloadUrl = '';
 		startLoadingAnimation();
 
@@ -48,8 +48,8 @@
 			if (data && data.length > 0) {
 				// Process data for CSV
 				csvDownloadUrl = exportCSV(data);
-				// Process data for XLS
-				xlsDownloadUrl = exportXLS(data);
+				// Process data for XLSX
+				xlsxDownloadUrl = exportXLSX(data);
 				// Process data for KML
 				kmlDownloadUrl = query.includes('GetSearchResults') ? exportKML(data) : '';
 			} else {
@@ -91,13 +91,13 @@
 			{#if csvDownloadUrl}
 				<a href={csvDownloadUrl} class="download-links" download="BMLT_data.csv">Download CSV</a><br />
 			{/if}
-			{#if xlsDownloadUrl}
-				<a href={xlsDownloadUrl} class="download-links" download="BMLT_data.xls">Download XLS</a><br />
+			{#if xlsxDownloadUrl}
+				<a href={xlsxDownloadUrl} class="download-links" download="BMLT_data.xlsx">Download XLSX</a><br />
 			{/if}
 			{#if kmlDownloadUrl}
 				<a href={kmlDownloadUrl} class="download-links" download="BMLT_data.kml">Download KML</a>
 			{/if}
-			<div id="description">Converts BMLT data from JSON to CSV, XLS or KML</div>
+			<div id="description">Converts BMLT data from JSON to CSV, XLSX or KML</div>
 		</div>
 		<div id="footer">
 			<a href="https://github.com/bmlt-enabled/bmlt-data-converter/issues" class="footer-link" target="_blank">Issues?</a>
diff --git a/src/lib/DataUtils.ts b/src/lib/DataUtils.ts
index d362464..2cd30c2 100644
--- a/src/lib/DataUtils.ts
+++ b/src/lib/DataUtils.ts
@@ -55,7 +55,7 @@ export function exportCSV(data: any[]): string {
 	return URL.createObjectURL(blob);
 }
 
-export function exportXLS(data: any[]): string {
+export function exportXLSX(data: any[]): string {
 	if (!Array.isArray(data) || data.length === 0) {
 		throw new Error('No data found');
 	}
@@ -63,14 +63,14 @@ export function exportXLS(data: any[]): string {
 	const wb = XLSX.utils.book_new();
 	const ws = XLSX.utils.json_to_sheet(processedData);
 	XLSX.utils.book_append_sheet(wb, ws, 'Data');
-	const wbout = XLSX.write(wb, { bookType: 'xls', type: 'binary' });
+	const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'binary' });
 	function s2ab(s: string): ArrayBuffer {
 		const buf = new ArrayBuffer(s.length);
 		const view = new Uint8Array(buf);
 		for (let i = 0; i < s.length; i++) view[i] = s.charCodeAt(i) & 0xff;
 		return buf;
 	}
-	const blob = new Blob([s2ab(wbout)], { type: 'application/vnd.ms-excel' });
+	const blob = new Blob([s2ab(wbout)], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
 	return URL.createObjectURL(blob);
 }