From fd4e5e72605b8027d5316f5c6aa7f3d4ebec239c Mon Sep 17 00:00:00 2001
From: Razzmatazz <razz@badkarma.xyz>
Date: Wed, 10 Jul 2024 08:25:30 -0500
Subject: [PATCH 1/2] update shoreline map

---
 package-lock.json        | 6 +++---
 src/data/maps.json       | 2 +-
 src/pages/quest/index.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 02362c34..d6b0afed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8835,9 +8835,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001576",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001576.tgz",
-      "integrity": "sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==",
+      "version": "1.0.30001640",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+      "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
       "funding": [
         {
           "type": "opencollective",
diff --git a/src/data/maps.json b/src/data/maps.json
index 538eb0e5..267369f0 100644
--- a/src/data/maps.json
+++ b/src/data/maps.json
@@ -2191,7 +2191,7 @@
                 "author": "Shebuka",
                 "authorLink": "https://github.com/TarkovTracker/tarkovdata/",
                 "svgPath": "https://assets.tarkov.dev/maps/svg/Shoreline-Ground_Level.svg",
-                "tilePath": "https://assets.tarkov.dev/maps/shoreline/main/{z}/{x}/{y}.png",
+                "tilePath": "https://assets.tarkov.dev/maps/shoreline/main_spring/{z}/{x}/{y}.png",
                 "layers": [
                     {
                         "name": "Underground",
diff --git a/src/pages/quest/index.js b/src/pages/quest/index.js
index 639fb006..b3fecbb3 100644
--- a/src/pages/quest/index.js
+++ b/src/pages/quest/index.js
@@ -1159,7 +1159,7 @@ function Quest() {
                                                     })
                                                     .reduce((elements, current, index) => {
                                                         if (elements.length > 0) {
-                                                            elements.push(<li key={`or-${index}`}><span style={{verticalAlign: 'middle', minHeight: '64px', display: 'inline-block', padding: '0px 3px'}}> or </span></li>);
+                                                            elements.push(<li key={`or-${index}`}><span style={{verticalAlign: 'middle', minHeight: '64px', display: 'inline-block', padding: '0px 3px'}}> and </span></li>);
                                                         }
                                                         elements.push(current);
                                                         return elements;

From a35d6e5ba5ec54ba4824cc80c61731962ec6ad94 Mon Sep 17 00:00:00 2001
From: Razzmatazz <razz@badkarma.xyz>
Date: Thu, 11 Jul 2024 06:02:30 -0500
Subject: [PATCH 2/2] fix null item property error

---
 src/modules/property-format.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/modules/property-format.js b/src/modules/property-format.js
index 2518d9f6..135a04e6 100644
--- a/src/modules/property-format.js
+++ b/src/modules/property-format.js
@@ -7,16 +7,16 @@ import i18n from '../i18n.js';
 
 const zonesFormat = (zones) => {
     return zones
-            ?.map((zoneName) => {
-                if (zoneName === zoneName.toUpperCase()) {
-                    return zoneName.charAt(0).toUpperCase() + zoneName.substr(1).toLowerCase();
-                }
-
-                return zoneName;
-            })
-            .filter(Boolean)
-            .sort()
-            .join(' · ')
+        ?.map((zoneName) => {
+            if (zoneName === zoneName.toUpperCase()) {
+                return zoneName.charAt(0).toUpperCase() + zoneName.substr(1).toLowerCase();
+            }
+
+            return zoneName;
+        })
+        .filter(Boolean)
+        .sort()
+        .join(' · ');
 }
 
 const ignoreCategories = [
@@ -51,7 +51,7 @@ const formatter = (key, value, id) => {
         }
         value = value.value;
     } 
-    if (typeof value === 'object') {
+    if (typeof value === 'object' && value !== null) {
         if (Array.isArray(value)) {
             value = [...value];
         } else {