From ec80a924e6cd772a5f6d22bae46b0ea7b72e2e33 Mon Sep 17 00:00:00 2001 From: Shebuka Date: Sat, 12 Aug 2023 15:03:57 +0200 Subject: [PATCH 1/6] New bounds for Streets of Tarkov map expansion --- src/data/maps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/maps.json b/src/data/maps.json index a75f73fa1..83a49212b 100644 --- a/src/data/maps.json +++ b/src/data/maps.json @@ -10,10 +10,10 @@ "maxZoom": 5, "transform": [0.38, 0, 0.38, 0], "coordinateRotation": 180, - "bounds": [[340, 0], [-320, 520]], + "bounds": [[322, -210], [-276, 548]], "author": "Shebuka", "authorLink": "https://github.com/TarkovTracker/tarkovdata/", - "svgPath": "https://assets.tarkov.dev/maps/svg/StreetsOfTarkov.svg" + "svgPath": "https://raw.githubusercontent.com/Shebuka/tarkovdata/separate_floors/maps/StreetsOfTarkov.svg" }, { "key": "streets-3d", From 4be638b8fe9486c0bd742e7924b12accb97f1297 Mon Sep 17 00:00:00 2001 From: Shebuka Date: Sat, 12 Aug 2023 15:05:36 +0200 Subject: [PATCH 2/6] New path to assets of Streets map --- src/data/maps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/maps.json b/src/data/maps.json index 83a49212b..6d7075c31 100644 --- a/src/data/maps.json +++ b/src/data/maps.json @@ -13,7 +13,7 @@ "bounds": [[322, -210], [-276, 548]], "author": "Shebuka", "authorLink": "https://github.com/TarkovTracker/tarkovdata/", - "svgPath": "https://raw.githubusercontent.com/Shebuka/tarkovdata/separate_floors/maps/StreetsOfTarkov.svg" + "svgPath": "https://assets.tarkov.dev/StreetsOfTarkov-0.13.5.svg" }, { "key": "streets-3d", From 0cfb905180a1a0bfd404f6c83548e14ef66964ee Mon Sep 17 00:00:00 2001 From: Shebuka Date: Sat, 12 Aug 2023 22:45:22 +0200 Subject: [PATCH 3/6] Revert "New path to assets of Streets map" This reverts commit 4be638b8fe9486c0bd742e7924b12accb97f1297. --- src/data/maps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/maps.json b/src/data/maps.json index 6d7075c31..83a49212b 100644 --- a/src/data/maps.json +++ b/src/data/maps.json @@ -13,7 +13,7 @@ "bounds": [[322, -210], [-276, 548]], "author": "Shebuka", "authorLink": "https://github.com/TarkovTracker/tarkovdata/", - "svgPath": "https://assets.tarkov.dev/StreetsOfTarkov-0.13.5.svg" + "svgPath": "https://raw.githubusercontent.com/Shebuka/tarkovdata/separate_floors/maps/StreetsOfTarkov.svg" }, { "key": "streets-3d", From 5bab11910f2d7d691bc0779e991ca06e79882557 Mon Sep 17 00:00:00 2001 From: Razzmatazz <35779878+Razzmatazzz@users.noreply.github.com> Date: Sun, 13 Aug 2023 16:24:55 -0500 Subject: [PATCH 4/6] Update maps.json --- src/data/maps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/maps.json b/src/data/maps.json index 83a49212b..e65b91ea7 100644 --- a/src/data/maps.json +++ b/src/data/maps.json @@ -13,7 +13,7 @@ "bounds": [[322, -210], [-276, 548]], "author": "Shebuka", "authorLink": "https://github.com/TarkovTracker/tarkovdata/", - "svgPath": "https://raw.githubusercontent.com/Shebuka/tarkovdata/separate_floors/maps/StreetsOfTarkov.svg" + "svgPath": "https://assets.tarkov.dev/maps/svg/StreetsOfTarkov-0.13.5.svg" }, { "key": "streets-3d", From d25fe18bc54c331f5cdcf23149caa20709233c44 Mon Sep 17 00:00:00 2001 From: Shebuka Date: Tue, 15 Aug 2023 21:29:13 +0200 Subject: [PATCH 5/6] Streets bounds tweak --- src/data/maps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/maps.json b/src/data/maps.json index e65b91ea7..5e9cb4f35 100644 --- a/src/data/maps.json +++ b/src/data/maps.json @@ -10,7 +10,7 @@ "maxZoom": 5, "transform": [0.38, 0, 0.38, 0], "coordinateRotation": 180, - "bounds": [[322, -210], [-276, 548]], + "bounds": [[324, -215], [-279, 548]], "author": "Shebuka", "authorLink": "https://github.com/TarkovTracker/tarkovdata/", "svgPath": "https://assets.tarkov.dev/maps/svg/StreetsOfTarkov-0.13.5.svg" From a73c3645b1d2e3c21184944dc760b93441708417 Mon Sep 17 00:00:00 2001 From: Shebuka Date: Tue, 15 Aug 2023 22:09:38 +0200 Subject: [PATCH 6/6] Fixes new Rigs without grid: update to useEffect, return should only return a destructor function. --- src/components/canvas-grid/index.js | 2 +- src/pages/ammo/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/canvas-grid/index.js b/src/components/canvas-grid/index.js index 44c1ee530..efeb08d05 100644 --- a/src/components/canvas-grid/index.js +++ b/src/components/canvas-grid/index.js @@ -24,7 +24,7 @@ function CanvasGrid(props) { const canvasEle = canvas.current; if (!canvasEle) { - return true; + return; } canvasEle.width = canvasEle.clientWidth; diff --git a/src/pages/ammo/index.js b/src/pages/ammo/index.js index bd0c45701..71ccb6008 100644 --- a/src/pages/ammo/index.js +++ b/src/pages/ammo/index.js @@ -73,10 +73,10 @@ function Ammo() { const { t } = useTranslation(); useEffect(() => { - if (currentAmmo === []) { + if (!currentAmmo || !currentAmmo.length) { setSelectedLegendName([]); - return true; + return; } if (currentAmmo) {