@abcagency/hc-ui-components 1.5.1 → 1.5.3

package/src/util/mapUtil.js

@@ -1,54 +1,59 @@
-export const getDistinctItemsByProximity = (items, listingEntitiesDetails) => {
+export const getDistinctItemsByProximity = (items, listingEntitiesDetailsInput) => {
 	const clusters = {};
 
-	if (!listingEntitiesDetails) return [];
+	if (!listingEntitiesDetailsInput) return [];
+
+	const listingEntitiesDetails = Array.isArray(listingEntitiesDetailsInput)
+		? listingEntitiesDetailsInput.reduce((acc, entity) => {
+			if (entity?.entityKey) acc[entity.entityKey.toLowerCase()] = entity;
+			return acc;
+		  }, {})
+		: Object.keys(listingEntitiesDetailsInput).reduce((acc, key) => {
+			acc[key.toLowerCase()] = listingEntitiesDetailsInput[key];
+			return acc;
+		  }, {});
 
 	const closeItemPairs = findCloseItems(listingEntitiesDetails);
 	if (closeItemPairs.length > 0) {
-		listingEntitiesDetails = adjustItemPositions(
-			listingEntitiesDetails,
-			closeItemPairs
-		);
+		const adjusted = adjustItemPositions(listingEntitiesDetails, closeItemPairs);
+		Object.assign(listingEntitiesDetails, adjusted);
 	}
 
 	items?.forEach(item => {
-		if(item.entityId !== -1){
-
-			const entityDetails = listingEntitiesDetails[item.entityId];
-
-			if (!entityDetails) {
-				console.error(`Details not found for entityId: ${item.entityId}`);
-				return;
-			}
+		const entityKey = item?.fields?.entityKey;
+		if (!entityKey || entityKey === '-1') return;
+		const entityDetails = listingEntitiesDetails[entityKey.toLowerCase()];
+		if (!entityDetails) {
+			console.error(`Details not found for entityKey: ${entityKey}`);
+			return;
+		}
 
-			item.mapDetails = entityDetails;
+		item.mapDetails = entityDetails;
 
-			if (!clusters[item.entityId]) {
-				clusters[item.entityId] = {
-					...item.mapDetails,
-					items: { [item.id]: item }
-				};
-			} else {
-				clusters[item.entityId].items[item.id] = item;
-			}}
+		const normalizedEntityKey = entityKey.toLowerCase();
+		if (!clusters[normalizedEntityKey]) {
+			clusters[normalizedEntityKey] = {
+				...entityDetails,
+				items: { [item.id]: item }
+			};
+		} else {
+			clusters[normalizedEntityKey].items[item.id] = item;
+		}
 	});
 
 	return Object.values(clusters);
 };
 
-export const findCloseItems = itemsObj => {
+export const findCloseItems = entitiesByKey => {
 	const closeItems = [];
-	const items = Object.values(itemsObj); // Convert object to array for iteration
+	const items = Object.values(entitiesByKey); // Convert object to array
 	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] });
 			}
 		}
@@ -57,14 +62,18 @@ export const findCloseItems = itemsObj => {
 	return closeItems;
 };
 
-export const adjustItemPositions = (itemsObj, closeItemPairs) => {
+export const adjustItemPositions = (entitiesByKey, closeItemPairs) => {
 	const adjustmentValue = 0.0001;
-	const adjustedItems = { ...itemsObj }; // Create a shallow copy of the object
+	const adjustedItems = { ...entitiesByKey };
 
 	closeItemPairs.forEach(pair => {
-		if (adjustedItems[pair.item1.id] && adjustedItems[pair.item2.id]) {
-			adjustedItems[pair.item2.id].latitude += adjustmentValue;
-			adjustedItems[pair.item2.id].longitude += adjustmentValue;
+		const key2 = pair.item2.entityKey;
+		if (adjustedItems[key2]) {
+			adjustedItems[key2] = {
+				...adjustedItems[key2],
+				latitude: adjustedItems[key2].latitude + adjustmentValue,
+				longitude: adjustedItems[key2].longitude + adjustmentValue
+			};
 		}
 	});
 
@@ -74,13 +83,15 @@ export const adjustItemPositions = (itemsObj, 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
+			}
+		]
 	};
 };