From b1b9d4934cfda21563a9c1e30634fa1f5fc85643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Grocholewski?= <m.grocholewski@atcomp.pl>
Date: Fri, 13 Dec 2024 11:33:50 +0100
Subject: [PATCH 1/2] fix(vector-map): correct logic for
areOverlayOrdersNotEqual function
---
.../utils/config/reactionsLayer/useOlMapReactionsLayer.ts | 2 +-
.../{areOverlayOrdersEqual.ts => areOverlayOrdersNotEqual.ts} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/{areOverlayOrdersEqual.ts => areOverlayOrdersNotEqual.ts} (100%)
diff --git a/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts b/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
index 509d5cbb..702498c5 100644
--- a/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
+++ b/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
@@ -88,7 +88,7 @@ export const useOlMapReactionsLayer = ({
}, [mapModelOriginalMaxZoom, mapSize.maxZoom]);
useEffect(() => {
- if (areOverlayOrdersEqual(overlaysOrderState, overlaysOrder)) {
+ if (!areOverlayOrdersEqual(overlaysOrderState, overlaysOrder)) {
setOverlaysOrderState(overlaysOrder);
}
}, [overlaysOrder, overlaysOrderState]);
diff --git a/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersEqual.ts b/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts
similarity index 100%
rename from src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersEqual.ts
rename to src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts
--
GitLab
From 41e18125bfda3de4f389fa0bfae5e4042099d310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Grocholewski?= <m.grocholewski@atcomp.pl>
Date: Fri, 13 Dec 2024 12:04:37 +0100
Subject: [PATCH 2/2] fix(vector-map): invert logic of areOverlayOrdersEqual to
areOverlayOrdersNotEqual
---
.../config/reactionsLayer/useOlMapReactionsLayer.ts | 4 ++--
.../utils/shapes/overlay/areOverlayOrdersNotEqual.ts | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts b/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
index 702498c5..9fb7e48d 100644
--- a/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
+++ b/src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/useOlMapReactionsLayer.ts
@@ -49,7 +49,7 @@ import MapBackgroundsEnum from '@/redux/map/map.enums';
import { setMapBackgroundType } from '@/redux/map/map.slice';
import { ZOOM_RESCALING_FACTOR } from '@/constants/map';
import { OverlayOrder } from '@/redux/overlayBioEntity/overlayBioEntity.utils';
-import areOverlayOrdersEqual from '@/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersEqual';
+import areOverlayOrdersNotEqual from '@/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual';
export const useOlMapReactionsLayer = ({
mapInstance,
@@ -88,7 +88,7 @@ export const useOlMapReactionsLayer = ({
}, [mapModelOriginalMaxZoom, mapSize.maxZoom]);
useEffect(() => {
- if (!areOverlayOrdersEqual(overlaysOrderState, overlaysOrder)) {
+ if (areOverlayOrdersNotEqual(overlaysOrderState, overlaysOrder)) {
setOverlaysOrderState(overlaysOrder);
}
}, [overlaysOrder, overlaysOrderState]);
diff --git a/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts b/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts
index 965ef019..c4e2e553 100644
--- a/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts
+++ b/src/components/Map/MapViewer/MapViewerVector/utils/shapes/overlay/areOverlayOrdersNotEqual.ts
@@ -1,16 +1,16 @@
/* eslint-disable no-magic-numbers */
import { OverlayOrder } from '@/redux/overlayBioEntity/overlayBioEntity.utils';
-export default function areOverlayOrdersEqual(
+export default function areOverlayOrdersNotEqual(
overlaysOrder1: Array<OverlayOrder>,
overlaysOrder2: Array<OverlayOrder>,
): boolean {
if (overlaysOrder1 === overlaysOrder2) {
- return true;
+ return false;
}
if (overlaysOrder1.length !== overlaysOrder2.length) {
- return false;
+ return true;
}
for (let index = 0; index < overlaysOrder1.length; index += 1) {
@@ -23,9 +23,9 @@ export default function areOverlayOrdersEqual(
obj1.calculatedOrder !== obj2.calculatedOrder ||
obj1.index !== obj2.index
) {
- return false;
+ return true;
}
}
- return true;
+ return false;
}
--
GitLab