maplibre-tilepackage-protocol 1.2.0 → 1.2.1

package/dist/index.esm.js

@@ -316,9 +316,18 @@ class FetchSource extends Source {
     this.url = url;
     this.customHeaders = customHeaders;
     this.mustReload = false;
+    // Safe global detection for legacy environments without globalThis
+    const g =
+      typeof globalThis !== "undefined"
+        ? globalThis
+        : typeof window !== "undefined"
+        ? window
+        : typeof self !== "undefined"
+        ? self
+        : {};
     let userAgent = "";
-    if ("navigator" in globalThis) {
-      userAgent = globalThis.navigator.userAgent || "";
+    if (g && typeof g.navigator !== "undefined") {
+      userAgent = g.navigator.userAgent || "";
     }
     const isWindows = userAgent.indexOf("Windows") > -1;
     const isChromiumBased = /Chrome|Chromium|Edg|OPR|Brave/.test(userAgent);
@@ -1187,16 +1196,23 @@ async function defaultDecompress(buf, compression) {
     return buf;
   }
   if (compression === "gzip") {
-    if (typeof globalThis.DecompressionStream === "undefined") {
+    // Safe global detection for DecompressionStream feature test
+    const g =
+      typeof globalThis !== "undefined"
+        ? globalThis
+        : typeof window !== "undefined"
+        ? window
+        : typeof self !== "undefined"
+        ? self
+        : {};
+    if (typeof g.DecompressionStream === "undefined") {
       return decompressSync(new Uint8Array(buf));
     }
     const stream = new Response(buf).body;
     if (!stream) {
       throw new Error("Failed to read response stream");
     }
-    const result = stream.pipeThrough(
-      new globalThis.DecompressionStream("gzip"),
-    );
+    const result = stream.pipeThrough(new g.DecompressionStream("gzip"));
     return new Response(result).arrayBuffer();
   }
   throw new Error("Compression method not supported");
@@ -1717,13 +1733,23 @@ class SharedPromiseCache {
   }
 }
 
+/**
+ * Escape literal newlines in JSON text.
+ * Replaces actual newline characters with the JSON escape sequence.
+ */
+function escapeJsonNewlines(text) {
+  // Replace literal newlines with JSON escape sequences
+  // This handles \r\n, \n, and \r
+  return text.replace(/\r\n/g, "\\n").replace(/[\r\n]/g, "\\n");
+}
+
 function calculateFilename(z, x, y, header) {
   const zoom = z.toString().padStart(2, "0");
   const baseRow = Math.floor(y / 128) * 128;
   const baseCol = Math.floor(x / 128) * 128;
   const rowHex = baseRow.toString(16).padStart(4, "0");
   const colHex = baseCol.toString(16).padStart(4, "0");
-  let basePath = header.type === "tpkx" ? "tile" : "p12/tile";
+  const basePath = header.type === "tpkx" ? "tile" : "p12/tile";
   return `${basePath}/L${zoom}/R${rowHex}C${colHex}.bundle`;
 }
 
@@ -1883,13 +1909,16 @@ class TilePackage {
     let metadata = {};
     if (header.packageType === "vtpk") {
       const resp = await this.source.getBytes(
-        header.jsonMetadataOffset,
-        header.jsonMetadataLength,
+        header.metadataOffset,
+        header.metadataLength,
         undefined,
         header.etag,
       );
       const decoder = new TextDecoder("utf-8");
-      metadata = JSON.parse(decoder.decode(resp.data));
+      const jsonText = decoder.decode(resp.data);
+      console.log("test", jsonText);
+      console.log("escaped text", escapeJsonNewlines(jsonText));
+      metadata = JSON.parse(escapeJsonNewlines(jsonText));
     }
     metadata.name = header.name;
     return metadata;