Skip to content
Snippets Groups Projects
Commit 584816a0 authored by Miłosz Grocholewski's avatar Miłosz Grocholewski
Browse files

Merge branch 'bugfix/MIN-123-showing-data-overlays-does-not-work' into 'development'

fix(vector-map): correct logic for areOverlayOrdersNotEqual function

Closes MIN-123

See merge request !345
parents e92e53a7 9b934071
No related branches found
No related tags found
1 merge request!345fix(vector-map): correct logic for areOverlayOrdersNotEqual function
Pipeline #99273 passed
...@@ -49,7 +49,7 @@ import MapBackgroundsEnum from '@/redux/map/map.enums'; ...@@ -49,7 +49,7 @@ import MapBackgroundsEnum from '@/redux/map/map.enums';
import { setMapBackgroundType } from '@/redux/map/map.slice'; import { setMapBackgroundType } from '@/redux/map/map.slice';
import { ZOOM_RESCALING_FACTOR } from '@/constants/map'; import { ZOOM_RESCALING_FACTOR } from '@/constants/map';
import { OverlayOrder } from '@/redux/overlayBioEntity/overlayBioEntity.utils'; 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 = ({ export const useOlMapReactionsLayer = ({
mapInstance, mapInstance,
...@@ -88,7 +88,7 @@ export const useOlMapReactionsLayer = ({ ...@@ -88,7 +88,7 @@ export const useOlMapReactionsLayer = ({
}, [mapModelOriginalMaxZoom, mapSize.maxZoom]); }, [mapModelOriginalMaxZoom, mapSize.maxZoom]);
useEffect(() => { useEffect(() => {
if (areOverlayOrdersEqual(overlaysOrderState, overlaysOrder)) { if (areOverlayOrdersNotEqual(overlaysOrderState, overlaysOrder)) {
setOverlaysOrderState(overlaysOrder); setOverlaysOrderState(overlaysOrder);
} }
}, [overlaysOrder, overlaysOrderState]); }, [overlaysOrder, overlaysOrderState]);
......
/* eslint-disable no-magic-numbers */ /* eslint-disable no-magic-numbers */
import { OverlayOrder } from '@/redux/overlayBioEntity/overlayBioEntity.utils'; import { OverlayOrder } from '@/redux/overlayBioEntity/overlayBioEntity.utils';
export default function areOverlayOrdersEqual( export default function areOverlayOrdersNotEqual(
overlaysOrder1: Array<OverlayOrder>, overlaysOrder1: Array<OverlayOrder>,
overlaysOrder2: Array<OverlayOrder>, overlaysOrder2: Array<OverlayOrder>,
): boolean { ): boolean {
if (overlaysOrder1 === overlaysOrder2) { if (overlaysOrder1 === overlaysOrder2) {
return true; return false;
} }
if (overlaysOrder1.length !== overlaysOrder2.length) { if (overlaysOrder1.length !== overlaysOrder2.length) {
return false; return true;
} }
for (let index = 0; index < overlaysOrder1.length; index += 1) { for (let index = 0; index < overlaysOrder1.length; index += 1) {
...@@ -23,9 +23,9 @@ export default function areOverlayOrdersEqual( ...@@ -23,9 +23,9 @@ export default function areOverlayOrdersEqual(
obj1.calculatedOrder !== obj2.calculatedOrder || obj1.calculatedOrder !== obj2.calculatedOrder ||
obj1.index !== obj2.index obj1.index !== obj2.index
) { ) {
return false; return true;
} }
} }
return true; return false;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment