@bmlt-enabled/croutonjs 3.20.12 → 3.21.0

package/crouton.nojquery.js

@@ -13291,9 +13291,9 @@ function CroutonLocalization(language) {
 			"formats": "Struktur",
 			"map": "Kort",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -13387,7 +13387,7 @@ function CroutonLocalization(language) {
 			'filter by visibility': "Zeige nur Meetings, die gerade auf dem Karte stehen",
 			'go': "Los!"
 		},
-		"en-AU": {
+"en-AU": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
 			"weekday" : "Weekday",
 			"city" : "City",
@@ -13401,10 +13401,10 @@ function CroutonLocalization(language) {
 			"postal_codes" : "Postcodes",
 			"formats" : "Formats",
 			"map" : "Map",
-			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"neighborhood": "Neighbourhood",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
 			"meeting_count": "Weekly Meetings:",
@@ -13434,7 +13434,7 @@ function CroutonLocalization(language) {
 			'show meetings near...': 'Show meetings near...',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
-			'enter a city or zip code': 'Enter a city or zip code',
+			'enter a city or zip code': 'Enter a city and state',
 			'toggle fullscreen mode': 'Toggle fullscreen mode',
 			'close': "Close",
 			'meeting page': "Meeting Page",
@@ -13459,9 +13459,9 @@ function CroutonLocalization(language) {
 			"formats" : "Formats",
 			"map" : "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -13517,9 +13517,9 @@ function CroutonLocalization(language) {
 			"formats" : "Formats",
 			"map" : "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -13575,9 +13575,9 @@ function CroutonLocalization(language) {
 			"formats" : "Formats",
 			"map" : "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -13633,9 +13633,9 @@ function CroutonLocalization(language) {
 			"formats" : "Formats",
 			"map" : "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -13749,9 +13749,9 @@ function CroutonLocalization(language) {
 			"formats" : "فورمت ها",
 			"map" : "نقشه",
 			"neighborhood": "Neighborhood",
-			"near_me": "Near Me",
-			"text_search": "Text Search",
-			"click_search": "Click Search",
+			"near_me": "Find nearby meetings",
+			"text_search": "Find meetings there",
+			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
 			"languages": "Languages",
 			"common_needs": "Common Needs",
@@ -14667,8 +14667,19 @@ this["hbs_Crouton"]["templates"]["mapMenu"] = Handlebars.template({"1":function(
     + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"go",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":49,"column":59},"end":{"line":49,"column":75}}}))
     + "</button>\n        </div>\n  	</div>\n</div>\n\n";
 },"usePartial":true,"useData":true,"useDepths":true});
-this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
-    var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
+this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
+    var lookupProperty = container.lookupProperty || function(parent, propertyName) {
+        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+          return parent[propertyName];
+        }
+        return undefined
+    };
+
+  return "                        <div class=\"modal-search\">\n                            <button id=\"bmltsearch-clicksearch\" class=\"filter-button\">"
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"click_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":19,"column":86},"end":{"line":20,"column":48}}}))
+    + "</button>\n                        </div>\n";
+},"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
           return parent[propertyName];
         }
@@ -14679,17 +14690,27 @@ this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Open Search Dialog",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":1,"column":58},"end":{"line":1,"column":90}}}))
     + "\">\n    <span class=\"menu-button-label\" style=\"position:initial;\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":2,"column":62},"end":{"line":2,"column":95}}}))
-    + "</span>\n</button>\n<div id=\"bmltsearch_modal\" class=\"modal\" style=\"display: none;\">\n	<div id=\"bmltsearch_content\" class=\"modal-content\">\n		<span id=\"close_search\" class=\"modal-close\">x</span>\n        <span class=\"modal-title\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":7,"column":34},"end":{"line":7,"column":67}}}))
-    + "</span>\n        <table>\n        <tr><td><div class=\"modal-search\">\n            <input id=\"bmltsearch-goto-text\" type=\"text\" placeholder=\""
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":10,"column":70},"end":{"line":10,"column":108}}}))
-    + "\" style=\"margin-bottom:5px;\">\n            <button id=\"bmltsearch-text-button\" class=\"filter-button\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"text_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":11,"column":70},"end":{"line":11,"column":95}}}))
-    + "</button>\n        </div></td></tr>\n        <tr><td><div class=\"modal-search\">\n                <button id=\"bmltsearch-nearbyMeetings\" class=\"filter-button\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"near_me",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":14,"column":77},"end":{"line":14,"column":98}}}))
-    + "</button>\n        </div></td></tr>\n        <tr><td><div class=\"modal-search\">\n                <button id=\"bmltsearch-clicksearch\" class=\"filter-button\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"click_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":17,"column":74},"end":{"line":17,"column":100}}}))
-    + "</button>\n        </div></td></tr></table>\n  	</div>\n</div>";
+    + "</span>\n</button>\n<div id=\"bmltsearch_modal\" class=\"modal\" style=\"display: none;\">\n    <div id=\"bmltsearch_content\" class=\"modal-content\">\n        <span id=\"close_search\" class=\"modal-close\">x</span>\n        <div id=\"modal-search-page\">\n            <div class=\"modal-title\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":8,"column":37},"end":{"line":8,"column":70}}}))
+    + "</div>\n                        <div id=\"modal-search-box\" class=\"modal-search\">\n                            <input id=\"bmltsearch-goto-text\" type=\"text\"\n                                placeholder=\""
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":11,"column":45},"end":{"line":11,"column":83}}}))
+    + "\" style=\"margin-bottom:5px;\">\n                            <button id=\"bmltsearch-text-button\" class=\"filter-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"text_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":12,"column":86},"end":{"line":12,"column":111}}}))
+    + "</button>\n                        </div>\n                        <div class=\"modal-search\">\n                            <button id=\"bmltsearch-nearbyMeetings\" class=\"filter-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"near_me",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":15,"column":89},"end":{"line":15,"column":110}}}))
+    + "</button>\n                        </div>\n"
+    + ((stack1 = lookupProperty(helpers,"if").call(alias1,(depth0 != null ? lookupProperty(depth0,"hasClickSearch") : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":17,"column":16},"end":{"line":22,"column":23}}})) != null ? stack1 : "")
+    + "            <button id=\"show-search-parameters\" class=\"advanced-search-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Adjust Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":23,"column":79},"end":{"line":23,"column":106}}}))
+    + "</button>\n        </div>\n        <div id=\"modal-seach-parameters\">\n            <div class=\"modal-title\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Configure Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":26,"column":37},"end":{"line":26,"column":67}}}))
+    + "</div>\n            <input type=\"number\" id=\"search_parameter\" name=\"search_parameter\" maxlength=\"3\" size=\"3\">\n            <p>"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"This number represents:",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":28,"column":15},"end":{"line":28,"column":52}}}))
+    + "</p>\n            <input type=\"radio\" id=\"search_radius\" name=\"map_search_type\" value=\"radius\">\n            <label id=\"search_radius_label\" for=\"search_radius\"></label><br>\n            <input type=\"radio\" id=\"search_count\" name=\"map_search_type\" value=\"count\">\n            <label for=\"search_count\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Approx. number of meetings in result",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":32,"column":38},"end":{"line":32,"column":88}}}))
+    + "</label><br>\n            <button id=\"show-search-page\" class=\"advanced-search-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Back",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":33,"column":73},"end":{"line":33,"column":91}}}))
+    + "</button>\n        </div>\n    </div>\n</div>";
 },"useData":true});
 this["hbs_Crouton"]["templates"]["meetings"] = Handlebars.template({"1":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, alias4=container.lambda, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -14953,6 +14974,9 @@ var croutonDefaultTemplates = {
 		"<div class='location-information'>{{this.formatted_location_info}}</div>",
 		"{{#if this.virtual_meeting_additional_info}}",
 		"    <div class='meeting-additional-info'>{{this.virtual_meeting_additional_info}}</div>",
+		"{{/if}}",
+		"{{#if this.distance}}",
+		"    <div class='meeting-distance'>{{getWord 'Distance'}}: {{this.distance}}</div>",
 		"{{/if}}"
 	].join('\n'),
 
@@ -14984,7 +15008,6 @@ var croutonDefaultTemplates = {
 		"				{{getWord 'meeting details'}}",
 		"			</a>",
 		"        </div>",
-		"        <div class='geo hide'>{{this.latitude}},{{this.longitude}}</div>",
 		"    {{/unless}}",
 		"{{/isNotTemporarilyClosed}}"
 	].join('\n'),
@@ -15091,7 +15114,7 @@ var croutonDefaultTemplates = {
         This meeting is in <a href="{{serviceBodyUrl}}">{{serviceBodyName}}</a><br/>
 		{{> offerIcsButton}}
         </td>`,
-	marker_contents_template: 
+	marker_contents_template:
 	`<h4>{{meeting_name}}</h4>
 	<div class="active">
 		<div class="marker_div_location_text">{{{this.location_text}}}</div>
@@ -16168,6 +16191,7 @@ function Crouton(config) {
 		int_include_unpublished: 0,	  // Includes unpublished meeting
 		button_filters: [
 			{'title': 'City', 'field': 'location_municipality'},
+			{'title': 'Distance', 'field': 'distance_in_km'},
 		],
 		button_format_filters: [],
 		default_filter_dropdown: "",  // Sets the default format for the dropdowns, the names will match the `has_` fields dropdowns without `has_.  Example: `formats=closed`.
@@ -16188,8 +16212,6 @@ function Crouton(config) {
 		has_common_needs: false, 	  // Shows the Common Needs dropdown
 		has_venues: true,		      // Shows the venue types dropdown
 		has_meeting_count: false,	  // Shows the meeting count
-		show_distance: false,         // Determines distance on page load
-		distance_search: 0,			  // Makes a distance based search with results either number of / or distance from coordinates
 		recurse_service_bodies: false,// Recurses service bodies when making service bodies request
 		service_body: [],             // Array of service bodies to return data for.
 		formats: '',		  		  // Return only meetings with these formats (format shared-id, not key-string)
@@ -16233,7 +16255,9 @@ function Crouton(config) {
 			maxZoom: 18
 		},
 		minZoom: 6,
-		maxZoom: 17
+		maxZoom: 17,
+		distance_units: 'miles',
+		noMap: false
 	};
 
 	self.setConfig(config);
@@ -16366,6 +16390,10 @@ function Crouton(config) {
 			}
 		}
 
+		if (self.config.map_search) {
+			self.queryable_data_keys.push('distance_in_km');
+			self.queryable_data_keys.push('distance_in_miles');
+		}
 		self.collectDataKeys(self.config['meeting_data_template']);
 		self.collectDataKeys(self.config['metadata_template']);
 		self.collectDataKeys(self.config['observer_template']);
@@ -16384,6 +16412,9 @@ function Crouton(config) {
 				return prev +'&formats[]='+id;
 			}, '');
 		}
+		if (self.config.map_search && self.config['venue_types'].length === 0) {
+			self.config['venue_types'].push('-2');
+		}
 		if (self.config['venue_types']) {
 			url += self.config['venue_types'].reduce(function(prev,id) {
 				return prev +'&venue_types[]='+id;
@@ -16395,16 +16426,7 @@ function Crouton(config) {
 			url += "&advanced_published=-1"
 		}
 
-		if (self.config['distance_search'] !== 0) {
-			return retrieveGeolocation().then((position) => {
-				url += '&lat_val=' + position.latitude + '&long_val=' + position.longitude + '&sort_results_by_distance=1';
-				url += (self.config['distance_units'] === "km" ? '&geo_width_km=' : '&geo_width=') + self.config['distance_search'];
-				return self.getMeetings(url);
-			}).catch((error) => {
-				console.error(error.message);
-				return self.getMeetings(url); // Proceed without geolocation if error occurs
-			});
-		} else if (self.config['custom_query'] != null) {
+		if (self.config['custom_query'] != null) {
 			url += self.config['custom_query'] + '&sort_keys='  + self.config['sort_keys'];
 			return self.getMeetings(url);
 		} else if (self.config['service_body'].length > 0) {
@@ -16459,6 +16481,8 @@ function Crouton(config) {
 			self.dayView();
 		} else if (viewName === "city") {
 			self.filteredView("location_municipality");
+		} else if (viewName === "distance") {
+			self.filteredView("distance_in_km");
 		} else {
 			self.filteredView(viewName);
 		}
@@ -16615,7 +16639,7 @@ function Crouton(config) {
 		crouton_Handlebars.registerPartial('bydays', hbs_Crouton.templates['byday']);
 		crouton_Handlebars.registerPartial('formatPopup', hbs_Crouton.templates['formatPopup']);
 		window.crouton = self;
-		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,fitBounds,callback);
+		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,fitBounds,callback,self.config['noMap']);
 	}
 	self.getCurrentLocation = function(callback) {
 		retrieveGeolocation().then(position => {
@@ -16698,31 +16722,6 @@ function Crouton(config) {
 			});
 	}
 
-	self.showLocation = function(position) {
-		var latitude = position.latitude;
-		var longitude = position.longitude;
-		var distanceUnit;
-		var distanceCalculation;
-
-		if (self.config['distance_units'] === "km") {
-			distanceUnit = "km";
-			distanceCalculation = "K";
-		} else if (self.config['distance_units'] === "nm") {
-			distanceUnit = "nm";
-			distanceCalculation = "N";
-		} else {
-			distanceUnit = "mi";
-			distanceCalculation = "M";
-		}
-
-		jQuery( ".geo" ).each(function() {
-			var target = jQuery( this ).html();
-			var arr = target.split(',');
-			var distance_result = self.distance(latitude, longitude, arr[0], arr[1], distanceCalculation);
-			jQuery( this ).removeClass("hide").addClass("show").html(distance_result.toFixed(1) + ' ' + distanceUnit);
-		});
-	};
-
 	self.errorHandler = function(msg) {
 		jQuery('.geo').removeClass("hide").addClass("show").html('');
 	};
@@ -16979,6 +16978,22 @@ function Crouton(config) {
 													);
 			}
 
+			meetingData[m]['distance'] = '';
+			if (self.config['distance_units'] === "km") {
+				if (meetingData[m]['distance_in_km']) {
+					const d = meetingData[m]['distance_in_km'];
+					if (d < 1) {
+						meetingData[m]['distance'] = Math.round( d * 1000) + 'm';
+					}
+					else {
+						meetingData[m]['distance'] = (Math.round(d * 10) / 10).toFixed(1) + 'km';
+					}
+				}
+			} else if (meetingData[m]['distance_in_miles']) {
+				const d = meetingData[m]['distance_in_miles'];
+				meetingData[m]['distance'] = (Math.round(d * 100) / 100).toFixed(2) + ' miles';
+			}
+
 			meetings.push(meetingData[m])
 		}
 
@@ -17043,7 +17058,6 @@ Crouton.prototype.setConfig = function(config) {
 		self.config.show_map = false;
 		self.config.map_page = true;
 	}
-	self.config["distance_search"] = parseInt(self.config["distance_search"] || 0);
 	self.config["day_sequence"] = [];
 	self.config.day_sequence.push(self.config.int_start_day_id);
 	for (var i = 1; i < 7; i++) {
@@ -17294,6 +17308,7 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 
 					for (var f = 0; f < self.config.button_filters.length; f++) {
 						var groupByName = self.config.button_filters[f]['field'];
+						if (groupByName.startsWith('distance')) continue;
 						var groupByData = getUniqueValuesOfKey(daysOfTheWeekMeetings, groupByName).sort();
 						for (var i = 0; i < groupByData.length; i++) {
 							var groupByMeetings = daysOfTheWeekMeetings.filterByObjectKeyValue(groupByName, groupByData[i]);
@@ -17332,15 +17347,20 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 
 				var buttonFiltersDataSorted = {};
 				for (var b = 0; b < self.config.button_filters.length; b++) {
-					var sortKey = [];
 					var groupByName = self.config.button_filters[b]['field'];
+					buttonFiltersDataSorted[groupByName] = {};
+					if (groupByName.startsWith('distance')) {
+						buttonFiltersDataSorted[groupByName]['Sorted by Distance'] = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
+						continue;
+					}
+					var sortKey = [];
+
 					for (var buttonFiltersDataItem in buttonFiltersData[groupByName]) {
 						sortKey.push(buttonFiltersDataItem);
 					}
 
 					sortKey.sort();
 
-					buttonFiltersDataSorted[groupByName] = {};
 					for (var s = 0; s < sortKey.length; s++) {
 						buttonFiltersDataSorted[groupByName][sortKey[s]] = buttonFiltersData[groupByName][sortKey[s]]
 					}
@@ -17530,10 +17550,6 @@ Crouton.prototype.render = function(doMeetingMap = false) {
 						jQuery("#filter-dropdown-" + filter[0]).val('a-' + filter[1]).trigger('change').trigger('select2:select');
 					}
 
-					if (self.config['show_distance']) {
-						self.getCurrentLocation(self.showLocation);
-					}
-
 					if (self.config['show_map'] && !self.config['refresh_map'] && !doMeetingMap) {
 						croutonMap.initialize(self.createBmltMapElement(), self.meetingData);
 						jQuery("#bmlt-map").removeClass("hide");
@@ -18070,7 +18086,7 @@ function MeetingMap(inConfig) {
 	 *	\brief Load the map and set it up.													*
 	 ****************************************************************************************/
 
-	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null) {
+	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null,hide=false) {
 		if (inDiv) {
 			crouton_Handlebars.registerPartial("markerContentsTemplate", config['marker_contents_template']);
 			gInDiv = inDiv;
@@ -18090,7 +18106,7 @@ function MeetingMap(inConfig) {
 			}
 			let loc = {latitude: config.lat, longitude: config.lng, zoom: config.zoom};
 			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};
-			if (gDelegate.createMap(inDiv, loc)) {
+			if (gDelegate.createMap(inDiv, loc, hide)) {
 				gDelegate.addListener('zoomend', function (ev) {
 					if (shouldRedrawMarkers() && gAllMeetings) {
 						if (listOnlyVisible) {
@@ -18116,12 +18132,19 @@ function MeetingMap(inConfig) {
 		};
 	};
 	var gSearchModal;
-	function createSearchButton(menuContext) {
-		var template = hbs_Crouton.templates['mapSearch'];
-		var controlDiv = document.createElement('div');
-		controlDiv.innerHTML = template();
+	function createSearchButton() {
+		const template = hbs_Crouton.templates['mapSearch'];
+		const controlDiv = document.createElement('div');
+		const params = {'hasClickSearch': gDelegate.hasClickSearch()}
+		controlDiv.innerHTML = template(params);
 		controlDiv.querySelector("#map-search-button").addEventListener('click', showBmltSearchDialog);
 		controlDiv.querySelector("#bmltsearch-nearbyMeetings").addEventListener('click', nearMeSearch);
+		controlDiv.querySelector("#bmltsearch-goto-text").addEventListener('keypress', function (event) {
+			if (event.key === "Enter") {
+				event.preventDefault();
+				document.getElementById("bmltsearch-text-button").click();
+			}
+		});
 		controlDiv.querySelector("#bmltsearch-text-button").addEventListener('click', function () {
 			let text = document.getElementById("bmltsearch-goto-text").value.trim();
 			if (text === "") return;
@@ -18129,7 +18152,35 @@ function MeetingMap(inConfig) {
 			gDelegate.callGeocoder(text, null, mapSearchGeocode);
 			closeModalWindow(gSearchModal);
 		});
-		controlDiv.querySelector("#bmltsearch-clicksearch").addEventListener('click', clickSearch);
+		controlDiv.querySelector("#modal-seach-parameters").style.display = 'none';
+		controlDiv.querySelector("#show-search-parameters").addEventListener('click', function (e) {
+			const controlDiv = e.target.parentElement.parentElement;
+			let w = config.map_search.width;
+			let checked = '#search_radius';
+			if (w < 0) {
+				w = -w;
+				checked = '#search_count';
+			}
+			controlDiv.querySelector(checked).checked = true;
+			controlDiv.querySelector('#search_parameter').value = w;
+			controlDiv.querySelector("#modal-seach-parameters").style.display = 'block';
+			controlDiv.querySelector("#modal-search-page").style.display = 'none';
+			controlDiv.querySelector("#search_radius_label").innerHTML = crouton.localization.getWord('Radius of search in $$').replace('$$', crouton.config.distance_units);
+		});
+		controlDiv.querySelector("#show-search-page").addEventListener('click', function (e) {
+			const controlDiv = e.target.parentElement.parentElement;
+			let w = controlDiv.querySelector('#search_parameter').value;
+			if (controlDiv.querySelector('#search_count')) {
+				w = -Math.round(w);
+				if (w == 0) w = -1;
+			}
+			config.map_search.width = w;
+			controlDiv.querySelector("#modal-seach-parameters").style.display = 'none';
+			controlDiv.querySelector("#modal-search-page").style.display = 'block';
+		});
+
+
+		if (gDelegate.hasClickSearch()) controlDiv.querySelector("#bmltsearch-clicksearch").addEventListener('click', clickSearch);
 		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
 		gSearchModal = controlDiv.querySelector("#bmltsearch_modal");
 		gSearchModal.parentElement.removeChild(gSearchModal);
@@ -18224,14 +18275,14 @@ function MeetingMap(inConfig) {
 	function hasMapSearch() {
 		return 'map_search' in config;
 	}
-	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback) {
+	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback, hide) {
 		if (!gDelegate.isApiLoaded()) {
-			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback]);
+			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback, hide]);
 			gDelegate.loadApi();
 			return;
 		}
 		let inDiv = document.getElementById(inDiv_id);
-		loadMap(inDiv, menuContext, handlebarMapOptions,callback);
+		loadMap(inDiv, menuContext, handlebarMapOptions, callback, hide);
 		loadAllMeetings(meetings_responseObject, fitBounds, true);
 	};
 	function loadPopupMap(inDiv_id, meeting, handlebarMapOptions = null) {
@@ -18306,10 +18357,14 @@ function MeetingMap(inConfig) {
 		};
 	};
 	function mapSearchGeocode(resp) {
-		let latlng = gDelegate.getGeocodeCenter(resp);
+		showThrobber();
 		if (document.getElementById("bmltsearch-goto-text"))
 			document.getElementById("bmltsearch-goto-text").value = "";
-		showThrobber();
+		let latlng = gDelegate.getGeocodeCenter(resp);
+		if (!latlng) {
+			hideThrobber();
+			return;
+		}
 		crouton.searchByCoordinates(latlng.lat, latlng.lng, config.map_search.width);
 	}
 	function loadAllMeetings(meetings_responseObject, fitBounds=true, fitAll=false) {
@@ -18797,8 +18852,15 @@ function MapDelegate(config) {
 	var gMainMap;
 	var gTileLayer;
 	var gClusterLayer = null;
-    function createMap(inDiv, inCenter) {
+    function createMap(inDiv, inCenter, inHidden = false) {
 		if (! inCenter ) return null;
+		if ( inHidden ) {
+			gDiv = inDiv;
+			gDiv.style.height = 'auto';
+			gDiv.style.marginBottom = '10px';
+			gMainMap = null;
+			return gDiv;
+		}
 		myOptions = {
                 'minZoom': config.minZoom,
                 'maxZoom': config.maxZoom,
@@ -18828,6 +18890,7 @@ function MapDelegate(config) {
         return gMainMap;
     }
     function addListener(ev,f,once) {
+		if (!gMainMap) return;
 		if (ev=='idle') {
 			ev = 'moveend';
 		}
@@ -18845,9 +18908,11 @@ function MapDelegate(config) {
 		return {'event': ev, 'f': f};
     }
 	function removeListener(o) {
+		if (!gMainMap) return;
 		gMainMap.off(o.event, o.f);
 	}
     function setViewToPosition(position, filterMeetings, extra=null) {
+		if (!gMainMap) return;
         var latlng = L.latLng(position.latitude, position.longitude);
 		gMainMap.flyTo(latlng);
         gMainMap.once('moveend', function(ev) {
@@ -18869,10 +18934,12 @@ function MapDelegate(config) {
 	}
 	function clearAllMarkers ( )
 	{
+		if (!gMainMap) return;
 		gAllMarkers && gAllMarkers.forEach((m) => {m.marker.closePopup(); gMainMap.removeLayer(m.marker)});
 		gAllMarkers = [];
 	};
 	function getZoom() {
+		if (!gMainMap) return null;
 		return gMainMap.getZoom();
 	}
 	function getZoomAdjust(only_out,filterMeetings) {
@@ -18915,12 +18982,15 @@ function MapDelegate(config) {
 		return ret;
 	}
     function setZoom(filterMeetings, force=0) {
+		if (!gMainMap) return;
 		(force > 0) ? gMainMap.setZoom(force) : gMainMap.setZoom(getZoomAdjust(false,filterMeetings));
 	}
 	function zoomOut(filterMeetings) {
+		if (!gMainMap) return;
         gMainMap.setZoom(getZoomAdjust(true,filterMeetings));
 	}
 	function fromLatLngToPoint(lat, lng) {
+		if (!gMainMap) return null;
 		return gMainMap.latLngToLayerPoint(L.latLng(lat,lng));
     }
 	function createMarker (	inCoords,		///< The long/lat for the marker.
@@ -18930,6 +19000,7 @@ function MapDelegate(config) {
 		in_ids
 )
 {
+	if (!gMainMap) return;
     var in_main_icon = (multi ? g_icon_image_multi : g_icon_image_single);
 
 	let highlightRow = function(target) {
@@ -18961,6 +19032,7 @@ function MapDelegate(config) {
     gAllMarkers.push( {ids: in_ids, marker: marker} );
 }
 function openMarker(id) {
+	if (!gMainMap) return;
 	marker = gAllMarkers.find((m) => m.ids.includes(id));
 	if (marker) {
 		marker.marker.openPopup();
@@ -18971,6 +19043,10 @@ function openMarker(id) {
 	jQuery("#meeting-data-row-" + id + " > td").addClass("rowHighlight");
 }
 function addControl(div,pos,cb) {
+	if (!gMainMap) {
+        gDiv.appendChild(div);
+        return;
+    }
 		var ControlClass =  L.Control.extend({
 	  		onAdd: function (map) {
 				return div;
@@ -19114,25 +19190,32 @@ function addControl(div,pos,cb) {
         geocode(in_loc, geoCodeParams, callback, filterMeetings);
     }
 	function contains(bounds, lat, lng) {
+		if (!gMainMap) return true;
 		return bounds.contains(L.latLng ( lat, lng ));
 	}
 	function getBounds() {
+		if (!gMainMap) return null;
 		return gMainMap.getBounds();
 	}
 	function invalidateSize() {
+		if (!gMainMap) return;
 		gMainMap.invalidateSize();
 	}
 	function fitBounds(locations) {
+		if (!gMainMap) return;
 		const bounds = locations.reduce(function(b,lat_lng) {b.extend(lat_lng); return b;}, L.latLngBounds());
 		gMainMap.fitBounds(bounds);
 	}
 	function createClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer = L.markerClusterGroup();
 	}
 	function addClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer && gMainMap.addLayer(gClusterLayer);
 	}
 	function removeClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer && gMainMap.removeLayer(gClusterLayer);
 		gClusterLayer = null;
 	}
@@ -19155,6 +19238,9 @@ function addControl(div,pos,cb) {
 		f();
 	}
 	function returnTrue() {return true;}
+	function hasClickSearch() {
+		return gMainMap != null;
+	}
     this.createMap = createMap;
     this.addListener = addListener;
 	this.removeListener = removeListener;
@@ -19181,6 +19267,7 @@ function addControl(div,pos,cb) {
 	this.modalOn = modalOn;
 	this.modalOff = modalOff;
 	this.afterInit = afterInit;
+	this.hasClickSearch = hasClickSearch;
 }
 MapDelegate.prototype.createMap = null;
 MapDelegate.prototype.addListener = null;
@@ -19208,6 +19295,7 @@ MapDelegate.prototype.getGeocodeCenter = null;
 MapDelegate.prototype.modalOn = null;
 MapDelegate.prototype.modalOff = null;
 MapDelegate.prototype.afterInit = null;
+MapDelegate.prototype.hasClickSearch = null;
 
 /* @preserve
  * Leaflet 1.5.1+Detached: 2e3e0ffbe87f246eb76d86d2633ddd59b262830b.2e3e0ff, a JS library for interactive maps. http://leafletjs.com