Improved zooming when maxDistance setting is enabled taking advantage of the fitBounds method

Author: bjorn2404

dist/assets/js/plugins/storeLocator/jquery.storelocator.js

@@ -1,4 +1,4 @@
-/*! jQuery Google Maps Store Locator - v3.1.5 - 2021-09-26
+/*! jQuery Google Maps Store Locator - v3.1.5 - 2021-09-27
 * http://www.bjornblog.com/web/jquery-store-locator-plugin
 * Copyright (c) 2021 Bjorn Holine; Licensed MIT */
 
@@ -2899,7 +2899,6 @@
 
 				// Create array for featured locations
 				featuredset = $.grep(locationset, function (val) {
-
 						if (val.hasOwnProperty('featured')) {
 								return val.featured === 'true';
 						}
@@ -2910,9 +2909,8 @@
 
 				// Create array for normal locations
 				normalset = $.grep(locationset, function (val) {
-
 					if (val.hasOwnProperty('featured')) {
-                        return val.featured !== 'true';
+						return val.featured !== 'true';
 					}
 				});
 
@@ -2975,7 +2973,13 @@
 			_this.resultsTotalCount(locationset.length);
 
 			// Google maps settings
-			if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+			if (
+				(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+				(_this.settings.mapSettings.zoom === 0) ||
+				(typeof origin === 'undefined') ||
+				(distError === true) ||
+				(_this.settings.maxDistance === true && firstRun === false)
+			) {
 				myOptions = _this.settings.mapSettings;
 				bounds = new google.maps.LatLngBounds();
 			}
@@ -3061,15 +3065,27 @@
 				marker = _this.createMarker(point, locationset[y].name, locationset[y].address, letter, _this.map, locationset[y].category);
 				marker.set('id', y);
 				markers[y] = marker;
-				if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+				if (
+					(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+					(_this.settings.mapSettings.zoom === 0) ||
+					(typeof origin === 'undefined') ||
+					(distError === true) ||
+					(_this.settings.maxDistance === true && firstRun === false)
+				) {
 					bounds.extend(point);
 				}
 				// Pass variables to the pop-up infowindows
 				_this.createInfowindow(marker, null, infowindow, storeStart, page);
 			}
 
 			// Center and zoom if no origin or zoom was provided, or distance of first marker is greater than distanceAlert
-			if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+			if (
+				(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+				(_this.settings.mapSettings.zoom === 0) ||
+				(typeof origin === 'undefined') ||
+				(distError === true) ||
+				(_this.settings.maxDistance === true && firstRun === false)
+			) {
 				_this.map.fitBounds(bounds);
 
 				// Prevent zooming in too far after fitBounds
@@ -3086,7 +3102,13 @@
 			locList.empty();
 
 			// Set up the location list markup
-			if (firstRun && _this.settings.fullMapStartListLimit !== false && !isNaN(_this.settings.fullMapStartListLimit) && _this.settings.fullMapStartListLimit !== -1 && markers.length > _this.settings.fullMapStartListLimit) {
+			if (
+				firstRun &&
+				_this.settings.fullMapStartListLimit !== false &&
+				!isNaN(_this.settings.fullMapStartListLimit) &&
+				_this.settings.fullMapStartListLimit !== -1 &&
+				markers.length > _this.settings.fullMapStartListLimit
+			) {
 				for (var m = 0; m < _this.settings.fullMapStartListLimit; m++) {
 					var currentMarker = markers[m];
 					_this.listSetup(currentMarker, storeStart, page);

dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js

@@ -37,6 +37,7 @@ filtering.
 
 ### Version 3.1.5
 * Added a zoom listener after fitBounds is used to prevent high zoom levels after name search and taxonomy filtering.
+* Improved zooming when maxDistance setting is enabled taking advantage of the fitBounds method.
 
 ### Version 3.1.4
 * Fixed name search filter value not clearing if form input is cleared.

readme.md

@@ -2895,7 +2895,6 @@
 
 				// Create array for featured locations
 				featuredset = $.grep(locationset, function (val) {
-
 						if (val.hasOwnProperty('featured')) {
 								return val.featured === 'true';
 						}
@@ -2906,9 +2905,8 @@
 
 				// Create array for normal locations
 				normalset = $.grep(locationset, function (val) {
-
 					if (val.hasOwnProperty('featured')) {
-                        return val.featured !== 'true';
+						return val.featured !== 'true';
 					}
 				});
 
@@ -2971,7 +2969,13 @@
 			_this.resultsTotalCount(locationset.length);
 
 			// Google maps settings
-			if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+			if (
+				(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+				(_this.settings.mapSettings.zoom === 0) ||
+				(typeof origin === 'undefined') ||
+				(distError === true) ||
+				(_this.settings.maxDistance === true && firstRun === false)
+			) {
 				myOptions = _this.settings.mapSettings;
 				bounds = new google.maps.LatLngBounds();
 			}
@@ -3057,15 +3061,27 @@
 				marker = _this.createMarker(point, locationset[y].name, locationset[y].address, letter, _this.map, locationset[y].category);
 				marker.set('id', y);
 				markers[y] = marker;
-				if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+				if (
+					(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+					(_this.settings.mapSettings.zoom === 0) ||
+					(typeof origin === 'undefined') ||
+					(distError === true) ||
+					(_this.settings.maxDistance === true && firstRun === false)
+				) {
 					bounds.extend(point);
 				}
 				// Pass variables to the pop-up infowindows
 				_this.createInfowindow(marker, null, infowindow, storeStart, page);
 			}
 
 			// Center and zoom if no origin or zoom was provided, or distance of first marker is greater than distanceAlert
-			if ((_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) || (_this.settings.mapSettings.zoom === 0) || (typeof origin === 'undefined') || (distError === true)) {
+			if (
+				(_this.settings.fullMapStart === true && firstRun === true && _this.settings.querystringParams !== true) ||
+				(_this.settings.mapSettings.zoom === 0) ||
+				(typeof origin === 'undefined') ||
+				(distError === true) ||
+				(_this.settings.maxDistance === true && firstRun === false)
+			) {
 				_this.map.fitBounds(bounds);
 
 				// Prevent zooming in too far after fitBounds
@@ -3082,7 +3098,13 @@
 			locList.empty();
 
 			// Set up the location list markup
-			if (firstRun && _this.settings.fullMapStartListLimit !== false && !isNaN(_this.settings.fullMapStartListLimit) && _this.settings.fullMapStartListLimit !== -1 && markers.length > _this.settings.fullMapStartListLimit) {
+			if (
+				firstRun &&
+				_this.settings.fullMapStartListLimit !== false &&
+				!isNaN(_this.settings.fullMapStartListLimit) &&
+				_this.settings.fullMapStartListLimit !== -1 &&
+				markers.length > _this.settings.fullMapStartListLimit
+			) {
 				for (var m = 0; m < _this.settings.fullMapStartListLimit; m++) {
 					var currentMarker = markers[m];
 					_this.listSetup(currentMarker, storeStart, page);