open images in new widnow

geops · Mar 8, 2024 · fa4656c · fa4656c
1 parent 5818d55
commit fa4656c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 50 deletions.
diff --git a/src/img/geltungsbereicheLegends/ga_legend_a4_de.svg b/src/img/geltungsbereicheLegends/ga_legend_a4_de.svg
diff --git a/src/utils/exportUtils.js b/src/utils/exportUtils.js
@@ -391,12 +391,10 @@ export const exportPdf = async (
 
     // Convert SVG to image
     updatedSvg = new XMLSerializer().serializeToString(svgDoc);
-    // const blob = new Blob([updatedSvg], { type: "image/svg+xml" });
-    // const url = URL.createObjectURL(blob);
+    const blob = new Blob([updatedSvg], { type: "image/svg+xml" });
+    const url = URL.createObjectURL(blob);
     // window.open(url, "_blank");
-    const image = await loadImage(
-      `data:image/svg+xml;base64,${btoa(unescape(encodeURIComponent(updatedSvg)))}`,
-    );
+    const image = await loadImage(url);
 
     // Add SVG to map canvas
     ctx.drawImage(image, 0, 0, canvas.width, canvas.height);

diff --git a/src/utils/fontUtils.js b/src/utils/fontUtils.js
@@ -35,17 +35,20 @@ export const sbbWebThin = {
   family: "SBBWeb-Thin",
   file: SBBWebThinPath,
 };
-
+const cache = {};
 export const getFontBase64FontFace = async (file, fontFamily) => {
-  const fontBase64 = await fetch(file)
-    .then((res) => res.blob())
-    .then((blob) => toBase64(blob));
-  return `
-    @font-face {
-      src: url(${fontBase64});
-      font-family: '${fontFamily}';
-    }
-  `;
+  if (!cache[fontFamily]) {
+    const fontBase64 = await fetch(file)
+      .then((res) => res.blob())
+      .then((blob) => toBase64(blob));
+    cache[fontFamily] = `
+      @font-face {
+        src: url(${fontBase64});
+        font-family: '${fontFamily}';
+      }
+    `;
+  }
+  return cache[fontFamily];
 };
 
 const sbbFontsBase64 = [