homeflowjs 0.13.11 → 0.13.13

package/package.json

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

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

@@ -48,6 +48,13 @@ export default class GeonamesMap extends DraggableMap {
     const prevProperties = store.getState().properties.properties;
 
     this.unsubscribeFromGeonamesChanges = store.subscribe(() => {
+      const zoomLevel = this.map.getZoom();
+      /*
+       * Unsubscribe if the user has zoomed from the initial position as this
+       * was causing the map to zoom back to it's inital position
+       */
+      if (window.initialZoomLevel && window.initialZoomLevel !== zoomLevel) return this.unsubscribeFromGeonamesChanges();
+
       const { geonames, properties } = store.getState().properties
 
       if (properties?.length) this.geonamesInit();
@@ -78,7 +85,14 @@ export default class GeonamesMap extends DraggableMap {
      * If for some reason the markers have not rendered after a few seconds
      * render them so we don't have an empty map
      */
-    setTimeout(() => {
+    const geoNamesTimer = setTimeout(() => {
+      const zoomLevel = this.map.getZoom();
+      /*
+       * Cancel timer if the user has zoomed from the initial position as this
+       * was causing the map to zoom back to it's inital position
+       */
+      if (window.initialZoomLevel && window.initialZoomLevel !== zoomLevel) return cancelGeonamesTimer();
+
       if (!this.markersInitialized) {
         const { geonames, properties } = store.getState().properties
         if (!properties && !geonames?.length) {
@@ -93,6 +107,10 @@ export default class GeonamesMap extends DraggableMap {
         this.setToMarkeredBounds();
       }
     }, 5000);
+
+    function cancelGeonamesTimer() {
+      clearTimeout(geoNamesTimer);
+    }
   }
 
   setMarkerTypeforZoomLevel() {
@@ -172,6 +190,7 @@ export default class GeonamesMap extends DraggableMap {
 
     this.setMarkers();
     this.setToMarkeredBounds();
+    if (!window.initialZoomLevel) window.initialZoomLevel = this.map.getZoom();
 
     const zoomLevel = this.map.getZoom();
 
@@ -190,13 +209,13 @@ export default class GeonamesMap extends DraggableMap {
   }
 
   getMarkerBounds() {
-    const { polygon } = store.getState().search.currentSearch?.place;
+    const polygon = store.getState().search.currentSearch?.place?.polygon;
     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) {
+    } 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)));