homeflowjs 0.13.21 → 0.13.23

package/package.json

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

package/properties/properties-map/drawable-map.js

@@ -146,6 +146,9 @@ export default class DrawableMap extends DraggableMap {
     });
 
     this.map.on("draw:drawstart", e => {
+      if (!Homeflow.get('initial_properties_payload')) {
+        Homeflow.set('initial_properties_payload', this.properties);
+      }
       this.first = false;
       this.map.removeLayer(this.marker_layer);
       if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
@@ -242,6 +245,11 @@ export default class DrawableMap extends DraggableMap {
       store.dispatch(setSearchField({ poly: null }));
       this.updateURL();
       Homeflow.kickEvent('deletebannertoggled');
+      if (Homeflow.get('initial_properties_payload')) {
+        const initialProperties = Homeflow.get('initial_properties_payload');
+        this.properties = initialProperties;
+        this.setMarkers();
+      }
       if (this.circle != null) {
         this.map.addLayer(this.circle);
         this.onMapDrag();

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

@@ -1,12 +1,15 @@
 /* eslint-disable */
 import DraggableMap from './draggable-map';
 import store from '../../store';
-import { currentGeonameId } from '../../utils/index';
+import { currentGeonameId, filterGeonames } 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';
 import mapLoader from './map-loader';
 import './geonames.css';
+import Toastify from 'toastify-js';
+import 'toastify-js/src/toastify.css';
+import { sanitizeText } from '../../utils/index'; 
 
 export default class GeonamesMap extends DraggableMap {
   constructor() {
@@ -16,6 +19,7 @@ export default class GeonamesMap extends DraggableMap {
 
     this.geonameMarkerLayers = [];
     this.geonameMarkerHoverLayers = [];
+    this.currentGeonameIdFromLocationPath = currentGeonameId();
   }
 
   initOnMarkerClick() {
@@ -68,6 +72,16 @@ export default class GeonamesMap extends DraggableMap {
     this.map.on('zoomend', () => {
       this.setMarkerTypeforZoomLevel()
 
+      const zoomLevel = this.map.getZoom();
+      const pagination = store.getState().properties?.pagination;
+      const propertiesShown = this.properties.length;
+
+      if (zoomLevel > this.locationPinsMaxZoomLevel 
+        && zoomLevel < 16
+        && pagination?.total_count > propertiesShown) {
+          this.showToastMessage('Too many properties to show. Zoom in.');
+      }
+
       this.setMarkers();
     });
 
@@ -258,11 +272,15 @@ export default class GeonamesMap extends DraggableMap {
 
   setSearchResponse(json) {
     if (!json) return;
-
+  
     if (json.geonames) {
       this.geonames = this.concatenateDistinctObjects('geoname_id', this.geonames, json.geonames);
       window.markerType = 'geonames';
-      store.dispatch(setGeonames(json.geonames));
+      const currentAreaId = store.getState().search.currentSearch?.place?.area;
+      const geonamesFiltered = filterGeonames(
+        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
+      );
+      store.dispatch(setGeonames(geonamesFiltered));
     } else if (json.properties) {
       this.properties = this.concatenateDistinctObjects('property_id', this.properties, json.properties);
       window.markerType = 'properties';
@@ -285,7 +303,11 @@ export default class GeonamesMap extends DraggableMap {
       this.hideSuggestedDestinations();
       this.markersInitialized = true;
     } else if (window.markerType === 'geonames' && this.geonames?.length) {
-      this.geonames.forEach(geoname => this.setGeonameMarker(geoname));
+      const currentAreaId = store.getState().search.currentSearch?.place?.area;
+      const geonamesFiltered = filterGeonames(
+        this.currentGeonameIdFromLocationPath, Number(currentAreaId), this.geonames
+      );
+      geonamesFiltered.forEach(geoname => this.setGeonameMarker(geoname));
       this.showSuggestedDestinations();
       this.markersInitialized = true;
     }
@@ -411,6 +433,21 @@ export default class GeonamesMap extends DraggableMap {
     }
   }
 
+  showToastMessage(message) {
+    const primaryColour = store.getState().app.themePreferences.primaryColour;
+    Toastify({
+      duration: 5000,
+      close: true,
+      gravity: 'bottom',
+      position: 'center',
+      stopOnFocus: true,
+      text: sanitizeText(message),
+      escapeMarkup: false,
+      className: 'properties-map-toast',
+      style: { background: primaryColour, marginBottom: '200px', },
+    }).showToast();
+  }
+
   onMapDrag({ markerPlaceId } = { markerPlaceId: null }) {
     this.showLoader();
 

package/utils/index.js

@@ -1,3 +1,8 @@
+/* eslint-disable arrow-body-style */
+/* eslint-disable max-len */
+/* eslint-disable semi */
+/* eslint-disable no-undef */
+/* eslint-disable no-restricted-syntax */
 export { default as stampDutyCalculator } from './stamp-duty-calculator/stamp-duty-calculator';
 
 export const capitalizeFirstLetter = (str) => (
@@ -82,8 +87,16 @@ export const sanitizeText = (string) => new Option(string).innerHTML;
 
 export const currentGeonameId = (path) => {
   const pathname = path || window.location.pathname;
-  const segment = pathname.split('/').reverse().find(item => item.startsWith('gid-'))?.replace(/^gid-/, '')
+  const segment = pathname.split('/').reverse().find((item) => item.startsWith('gid-'))?.replace(/^gid-/, '');
   return parseInt(segment, 10) || null;
 };
 
 export const DEBOUNCE_DELAY = 200;
+
+export const filterGeonames = (geonameId = null, areaId = 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);
+};