@abcagency/hc-ui-components 1.4.4 → 1.4.7

package/src/util/mapUtil.js

@@ -1,55 +1,54 @@
-export const getDistinctItemsByProximity = (items, listingEntitiesDetailsInput) => {
+export const getDistinctItemsByProximity = (items, listingEntitiesDetails) => {
 	const clusters = {};
 
-	if (!listingEntitiesDetailsInput) return [];
-
-	const listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput)
-		? listingEntitiesDetailsInput.reduce((acc, entity) => {
-			if (entity?.entityKey) acc[entity.entityKey] = entity;
-			return acc;
-		  }, {})
-		: listingEntitiesDetailsInput;
+	if (!listingEntitiesDetails) return [];
 
 	const closeItemPairs = findCloseItems(listingEntitiesDetails);
 	if (closeItemPairs.length > 0) {
-		const adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
-		Object.assign(listingEntitiesDetails, adjusted);
+		listingEntitiesDetails = adjustItemPositions(
+			listingEntitiesDetails,
+			closeItemPairs
+		);
 	}
 
 	items?.forEach(item => {
-		const entityKey = item?.fields?.entityKey;
-		if (!entityKey || entityKey === '-1') return;
-		const entityDetails = listingEntitiesDetails[entityKey];
-		if (!entityDetails) {
-			console.error(`Details not found for entityKey: ${entityKey}`);
-			return;
-		}
+		if(item.entityId !== -1){
 
-		item.mapDetails = entityDetails;
+			const entityDetails = listingEntitiesDetails[item.entityId];
 
-		if (!clusters[entityKey]) {
-			clusters[entityKey] = {
-				...entityDetails,
-				items: { [item.id]: item }
-			};
-		} else {
-			clusters[entityKey].items[item.id] = item;
-		}
+			if (!entityDetails) {
+				console.error(`Details not found for entityId: ${item.entityId}`);
+				return;
+			}
+
+			item.mapDetails = entityDetails;
+
+			if (!clusters[item.entityId]) {
+				clusters[item.entityId] = {
+					...item.mapDetails,
+					items: { [item.id]: item }
+				};
+			} else {
+				clusters[item.entityId].items[item.id] = item;
+			}}
 	});
 
 	return Object.values(clusters);
 };
 
-export const findCloseItems = entitiesByKey => {
+export const findCloseItems = itemsObj => {
 	const closeItems = [];
-	const items = Object.values(entitiesByKey); // Convert object to array
+	const items = Object.values(itemsObj); // Convert object to array for iteration
 	const proximityThreshold = 0.0001;
 
 	for (let i = 0; i < items.length; i++) {
 		for (let j = i + 1; j < items.length; j++) {
 			const distanceLat = Math.abs(items[i].latitude - items[j].latitude);
 			const distanceLng = Math.abs(items[i].longitude - items[j].longitude);
-			if (distanceLat < proximityThreshold && distanceLng < proximityThreshold) {
+			if (
+				distanceLat < proximityThreshold &&
+				distanceLng < proximityThreshold
+			) {
 				closeItems.push({ item1: items[i], item2: items[j] });
 			}
 		}
@@ -58,18 +57,14 @@ export const findCloseItems = entitiesByKey => {
 	return closeItems;
 };
 
-export const adjustItemPositions = (entitiesByKey, closeItemPairs) => {
+export const adjustItemPositions = (itemsObj, closeItemPairs) => {
 	const adjustmentValue = 0.0001;
-	const adjustedItems = { ...entitiesByKey };
+	const adjustedItems = { ...itemsObj }; // Create a shallow copy of the object
 
 	closeItemPairs.forEach(pair => {
-		const key2 = pair.item2.entityKey;
-		if (adjustedItems[key2]) {
-			adjustedItems[key2] = {
-				...adjustedItems[key2],
-				latitude: adjustedItems[key2].latitude + adjustmentValue,
-				longitude: adjustedItems[key2].longitude + adjustmentValue
-			};
+		if (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {
+			adjustedItems[pair.item2.id].latitude += adjustmentValue;
+			adjustedItems[pair.item2.id].longitude += adjustmentValue;
 		}
 	});
 
@@ -79,15 +74,13 @@ export const adjustItemPositions = (entitiesByKey, closeItemPairs) => {
 export const clusterOptions = (clusterGridSize, fillColor) => {
 	return {
 		gridSize: clusterGridSize,
-		maxZoom: 15,
-		styles: [
-			{
-				url: createSvgDataUri(fillColor),
-				textColor: 'white',
-				height: 40,
-				width: 40
-			}
-		]
+		maxZoom:15,
+		styles:[{
+			url: createSvgDataUri(fillColor),
+			textColor:'white',
+			height: 40,
+			width: 40
+		}]
 	};
 };