homeflowjs 0.13.6 → 0.13.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.6",
+  "version": "0.13.8",
   "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')),
@@ -283,9 +304,11 @@ export default class GeonamesMap extends DraggableMap {
     marker.on('mouseover', (e) => {
       if (!marker?.property) return;
 
+      const geoPopup = Homeflow.get('custom_geo_popup') || this.popup;
+
       L.popup({ closeButton: false, offset: [0, -40] })
         .setLatLng(e.latlng)
-        .setContent(this.popup(marker))
+        .setContent(geoPopup(marker))
         .openOn(this.map)
     });