homeflowjs 0.13.18 → 0.13.20

package/package.json

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

package/properties/properties-map/draggable-map.js

@@ -306,6 +306,7 @@ export default class DraggableMap {
 
     this.properties.map(property => this.setPropertyMarker(property));
     this.clusteringMarkerLayer.addTo(this.map);
+    this.nonClusteringMarkerLayer.addTo(this.map);
 
     return this.bounds;
   }
@@ -659,7 +660,7 @@ export default class DraggableMap {
           this._running_update = false;
 
           if (json.properties) {
-            setSearchResponse(json);
+            this.setSearchResponse(json);
           }
       })
   }

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

@@ -91,6 +91,7 @@ export default class DrawableMap extends DraggableMap {
       if (!additionalDrawing) {
         this.drawnItems.clearLayers();
         if (this.marker_layer) { this.map.removeLayer(this.marker_layer); }
+        if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
         if (this.geo_marker_layer != null) { this.map.removeLayer(this.geo_marker_layer); }
         if (this.circle != null) { this.map.removeLayer(this.circle); }
       }
@@ -147,6 +148,7 @@ export default class DrawableMap extends DraggableMap {
     this.map.on("draw:drawstart", e => {
       this.first = false;
       this.map.removeLayer(this.marker_layer);
+      if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
       if (this.geo_marker_layer) { this.map.removeLayer(this.geo_marker_layer); }
       if (this.circle) { this.map.removeLayer(this.circle); }
       return Homeflow.kickEvent('drawbannertoggled', this);
@@ -235,6 +237,7 @@ export default class DrawableMap extends DraggableMap {
 
     return this.map.on("draw:deleted", e => {
       this.map.removeLayer(this.marker_layer);
+      if (this.nonClusteringMarkerLayer) { this.map.removeLayer(this.nonClusteringMarkerLayer); }
       if (this.geo_marker_layer != null) { this.map.removeLayer(this.geo_marker_layer); }
       store.dispatch(setSearchField({ poly: null }));
       this.updateURL();

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

@@ -95,7 +95,7 @@ export default class GeonamesMap extends DraggableMap {
 
       if (!this.markersInitialized) {
         const { geonames, properties } = store.getState().properties
-        if (!properties && !geonames?.length) {
+        if (!properties && !geonames?.length && !this.viewport && !store.getState().search.currentSearch?.place?.polygon) {
           const place = store.getState().search.currentSearch?.place;
           const { lat, lng } = place;
           this.map.setView(new L.LatLng(lat, lng), 14);
@@ -118,7 +118,7 @@ export default class GeonamesMap extends DraggableMap {
 
     if (!zoomLevel) zoomLevel = window.lastZoomLevel;
 
-    if (zoomLevel > 9) {
+    if (zoomLevel > this.locationPinsMaxZoomLevel) {
       window.markerType = 'properties';
     } else {
       window.markerType = 'geonames';
@@ -181,6 +181,8 @@ export default class GeonamesMap extends DraggableMap {
   geonamesInit() {
     if (!this.map || this.geonamesInitialized) return;
 
+    this.locationPinsMaxZoomLevel = store.getState().app.themePreferences?.locationPinsMaxZoomLevel || 9;
+
     const { geonames } = store.getState().properties;
 
     if (geonames && !this.geonames) {
@@ -195,14 +197,14 @@ export default class GeonamesMap extends DraggableMap {
     const zoomLevel = this.map.getZoom();
 
     // If we don't have any geonames we need to show property markers
-    if (!geonames && zoomLevel > 9) window.markerType = 'properties';
+    if (!geonames && zoomLevel > this.locationPinsMaxZoomLevel) window.markerType = 'properties';
 
     /**
      * If we don't have any geonames we need to run onMapDrag
      * as it doesn't run for open searches otherwise and we need
      * it to load geonames
      */
-    if (!geonames && zoomLevel < 10) {
+    if (!geonames && zoomLevel < this.locationPinsMaxZoomLevel) {
       this.onMapDrag();
       window.markerType = 'geonames';
     }