homeflowjs 0.13.43 → 0.13.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.43",
+  "version": "0.13.44",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/geonames-map.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import DraggableMap from './draggable-map';
 import store from '../../store';
-import { currentGeonameId, filterGeonames } from '../../utils/index';
+import { currentGeonameId, filterGeonames, uniqueGeonamesByNameAndArea } from '../../utils/index';
 import { setProperties, setGeonames, setSelectedMarker } from '../../actions/properties.actions';
 import { setInitialSearch, setPlace, setSearchField } from '../../actions/search.actions';
 import { buildQueryString } from '../../search/property-search/property-search';
@@ -283,11 +283,20 @@ export default class GeonamesMap extends DraggableMap {
     if (json.geonames) {
       this.geonames = this.concatenateDistinctObjects('geoname_id', this.geonames, json.geonames);
       window.markerType = 'geonames';
-      const currentAreaId = store.getState().search.currentSearch?.place?.area;
-      const geonamesFiltered = filterGeonames(
-        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
-      );
-      store.dispatch(setGeonames(geonamesFiltered));
+
+      const currentSearchPlace = store.getState().search.currentSearch?.place;
+      const geonamePosition = currentSearchPlace?.geoname_position || null;
+      const area = currentSearchPlace?.area || null;
+      
+      let geonamesToDisplay = uniqueGeonamesByNameAndArea(this.geonames);
+
+      if (geonamePosition || area) {
+        geonamesToDisplay = filterGeonames(
+          this.currentGeonameIdFromLocationPath, Number(area), Number(geoname_position), geonamesToDisplay
+        );
+
+      }
+      store.dispatch(setGeonames(geonamesToDisplay));
     } else if (json.properties) {
       this.properties = this.concatenateDistinctObjects('property_id', this.properties, json.properties);
       window.markerType = 'properties';
@@ -310,11 +319,20 @@ export default class GeonamesMap extends DraggableMap {
       this.hideSuggestedDestinations();
       this.markersInitialized = true;
     } else if (window.markerType === 'geonames' && this.geonames?.length) {
-      const currentAreaId = store.getState().search.currentSearch?.place?.area;
-      const geonamesFiltered = filterGeonames(
-        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
-      );
-      geonamesFiltered.forEach(geoname => this.setGeonameMarker(geoname));
+      const currentSearchPlace = store.getState()?.search?.currentSearch?.place;
+      
+      const geonamePosition = currentSearchPlace?.geoname_position || null;
+      const area = currentSearchPlace?.area || null;
+
+      let geonamesToDisplay = uniqueGeonamesByNameAndArea(this.geonames);
+
+      if (geonamePosition || area) {
+        geonamesToDisplay = filterGeonames(
+          this.currentGeonameIdFromLocationPath, Number(area), Number(geonamePosition), geonamesToDisplay
+        );
+      }
+
+      geonamesToDisplay.forEach(geoname => this.setGeonameMarker(geoname));
       this.showSuggestedDestinations();
       this.markersInitialized = true;
     }

package/utils/index.js

@@ -93,10 +93,42 @@ export const currentGeonameId = (path) => {
 
 export const DEBOUNCE_DELAY = 200;
 
-export const filterGeonames = (geonameId = null, areaId = null, geonames) => {
+export const filterGeonames = (geonameId = null, areaId = null, geoPosition = null, geonames) => {
   if (!geonameId) return geonames;
 
-  if (areaId) return geonames.filter((geoname) => geoname?.geoname_id !== geonameId && geoname?.area < areaId);
-
-  return geonames.filter((geoname) => geoname?.geoname_id !== geonameId);
+  // Filter our same id
+  let filtered = geonames.filter((geoname) => geoname?.geoname_id !== geonameId);
+  
+  // Filter out higher area
+  if (areaId && !geoPosition) filtered = filtered.filter((geoname) => geoname?.area < areaId);
+  
+  // Filter out lower geoname_position
+  if (geoPosition) filtered = filtered.filter((geoname) => {
+    // Fallback to area if no geoname_position
+    if (
+      geoname?.geoname_position === 0
+      && geoname?.area
+      && geoname?.area !== 0
+      && areaId
+    ) return geoname?.area < areaId;
+    return geoname?.geoname_position > geoPosition;
+  });
+  
+  return filtered;
 };
+
+export const uniqueGeonamesByNameAndArea = (geonames) => {
+  // One of the duplicated Geonames comes with geoname_position set as 0
+  // First set the one with geoname_position = 0 before the one with actual value, ordered by properties_count (as the response).
+  const sortByNameAndGeonamePosition = geonames.sort(
+    (first, second) => {
+      if (first.name === second.name) return first?.geoname_position - second?.geoname_position;
+      return first.properties_count > second.properties_count ? -1 : 1;
+    }
+  );
+  // Then remove duplicates by name
+  const uniqueNamesOnly =  [...new Map(sortByNameAndGeonamePosition.map(item => [item['name'], item])).values()];
+
+  // Finally remove if they have the same area
+  return [...new Map(uniqueNamesOnly.map(item => [item['area'], item])).values()]
+};