homeflowjs 0.13.5 → 0.13.7

package/package.json

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

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

@@ -190,16 +190,37 @@ export default class GeonamesMap extends DraggableMap {
   }
 
   getMarkerBounds() {
+    const { polygon } = store.getState().search.currentSearch?.place;
     if (this.viewport) {
       const viewportBounds = this.getViewportBounds();
       if (viewportBounds.flat().find(coordinate => coordinate === Infinity)) return null;
 
       return L.latLngBounds(...viewportBounds.map(bound => L.latLng(...bound)));
+    } else if (polygon && polygon.length) {
+      const polyBounds = [this.getTopRightPolygonCoordinates(polygon[0]), this.getBottomLeftPolygonCoordinates(polygon[0])];
+      const options = Homeflow.get('custom_map_bounds_padding')
+      const latLongBounds = L.latLngBounds(...polyBounds.map(bound => L.latLng(...bound)));
+
+      this.map.fitBounds(latLongBounds, options);
     } else {
       return super.getMarkerBounds();
     }
   }
 
+  getTopRightPolygonCoordinates(polygon) {
+    return [
+      Math.max(...polygon.map(coords => parseFloat(coords[1]))),
+      Math.max(...polygon.map(coords => parseFloat(coords[0])))
+    ];
+  }
+
+  getBottomLeftPolygonCoordinates(polygon) {
+    return [
+      Math.min(...polygon.map(coords => parseFloat(coords[1]))),
+      Math.min(...polygon.map(coords => parseFloat(coords[0])))
+    ];
+  }
+
   getTopRightMarkerCoordinates() {
     return [
       Math.max(...this.parseCoordinateArray([this.properties, this.geonames].flat(), 'lat')),
@@ -252,6 +273,18 @@ export default class GeonamesMap extends DraggableMap {
     this.propertiesLayer.addTo(this.map);
   }
 
+  popup(marker) {
+    const formatter = Intl.NumberFormat('en', { notation: 'compact' });
+    const priceValue = marker?.property?.price_value;
+    const formattedPrice = priceValue ? formatter.format(priceValue) : null;
+
+    if (!priceValue) return;
+
+    return `
+      <div class="geomap__property-popup">£${formattedPrice}</div>
+    `;
+  }
+
   generateMarker(propertyOrGeoname) {
     const marker = L.marker(
       [propertyOrGeoname.lat, propertyOrGeoname.lng],
@@ -268,6 +301,15 @@ export default class GeonamesMap extends DraggableMap {
       }
     });
 
+    marker.on('mouseover', (e) => {
+      if (!marker?.property) return;
+
+      L.popup({ closeButton: false, offset: [0, -40] })
+        .setLatLng(e.latlng)
+        .setContent(this.popup(marker))
+        .openOn(this.map)
+    });
+
     if (Homeflow.get('show_geoname_polygon_on_mouseover') && propertyOrGeoname.polygon?.length) {
       marker.on('mouseover', () => this.geonameMarkerMouseOver(marker));
       marker.on('mouseout', () => this.geonameMarkerMouseOut(marker));