Merge pull request #963 from the-hideout/shoreline-map-update

Shoreline map update
the-hideout · Jul 13, 2024 · 4f002e8 · 4f002e8
2 parents 80cd984 + a35d6e5
commit 4f002e8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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/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 {

diff --git 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;