@bmlt-enabled/croutonjs 3.23.0 → 3.24.1

package/crouton.nojquery.js

@@ -13337,6 +13337,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Afstand",
 			"get_directions": "Få vejvisning",
 			"select_map_app": "Vælg kortapp",
 			"apple_maps": "Apple Maps",
@@ -13345,6 +13346,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Åbn i Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Åbn i Waze app",
+			"sorted by distance": "Sorteret efter Afstand",
 		},
 		"de-DE":{
 			"days_of_the_week": ["", "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
@@ -13407,11 +13409,13 @@ function CroutonLocalization(language) {
 			"apple_maps": "Apple Maps",
 			"apple_maps_desc": "In Apple Maps App öffnen",
 			"google_maps": "Google Maps",
+			"distance": "Entfernung",
 			"google_maps_desc_mobile": "In Google Maps App öffnen",
 			"waze": "Waze",
 			"waze_desc": "In Waze App öffnen",
 			"remember my choice": "Auswahl speichern",
-			"zoomed-out-message": "Wir können nicht die ganze Fläche nach Meetings durchsuchen.  Bitte reinzoomen oder eine neue Suche machen."
+			"zoomed-out-message": "Wir können nicht die ganze Fläche nach Meetings durchsuchen.  Bitte reinzoomen oder eine neue Suche machen.",
+			"sorted by distance": "Sortiert nach Entfernung",
 		},
 "en-AU": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -13477,7 +13481,8 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Open in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Open in Waze app",
-			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search."
+			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
+			"sorted by distance": "Sorted by Distance",
 		},
 		"en-CA": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -13544,7 +13549,8 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Open in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Open in Waze app",
-			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search."
+			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
+			"sorted by distance": "Sorted by Distance",
 		},
 		"en-NZ": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -13611,7 +13617,8 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Open in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Open in Waze app",
-			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search."
+			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
+			"sorted by distance": "Sorted by Distance",
 		},
 		"en-UK": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -13678,7 +13685,8 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Open in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Open in Waze app",
-			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search."
+			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
+			"sorted by distance": "Sorted by Distance",
 		},
 		"en-US": {
 			"days_of_the_week" : ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -13745,7 +13753,8 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Open in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Open in Waze app",
-			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search."
+			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
+			"sorted by distance": "Sorted by Distance",
 		},
 		"es-US": {
     		"days_of_the_week" : ["", "Domingo", " Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"],
@@ -13804,6 +13813,7 @@ function CroutonLocalization(language) {
     		'report update': "Actualización de informe",
     		'filter by visibility': "Listar solo estas reuniones",
     		'go': "¡Adelante!",
+			"distance": "Distancia",
     		"get_directions": "Obtener Direcciones",
     		"select_map_app": "Seleccionar Aplicación de Mapas",
     		"apple_maps": "Apple Maps",
@@ -13812,7 +13822,8 @@ function CroutonLocalization(language) {
     		"google_maps_desc_mobile": "Abrir en la aplicación Google Maps",
     		"waze": "Waze",
     		"waze_desc": "Abrir en la aplicación Waze",
-			"zoomed-out-message": "No podemos buscar reuniones en toda la zona. Por favor, acérquese o haga una nueva búsqueda."
+			"zoomed-out-message": "No podemos buscar reuniones en toda la zona. Por favor, acérquese o haga una nueva búsqueda.",
+			"sorted by distance": "Ordenado por distancia",
 		},
 		"fa-IR": {
 			"days_of_the_week" : ["", 'یَکشَنب', 'دوشَنبه', 'سه‌شنبه', 'چهار شنبه', 'پَنج شَنبه', 'جُمعه', 'شَنبه'],
@@ -13869,6 +13880,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "فاصله",
 			"get_directions": "دریافت مسیر",
 			"select_map_app": "انتخاب برنامه نقشه",
 			"apple_maps": "نقشه اپل",
@@ -13877,6 +13889,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "باز کردن در برنامه گوگل مپس",
 			"waze": "ویز",
 			"waze_desc": "باز کردن در برنامه ویز",
+			"sorted by distance": "مرتب شده بر اساس فاصله",
 		},
 		"fr-CA": {
 			"days_of_the_week" : ["", "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"],
@@ -13934,6 +13947,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Distance",
 			"get_directions": "Obtenir l'itinéraire",
 			"select_map_app": "Sélectionner l'application de cartes",
 			"apple_maps": "Apple Maps",
@@ -13942,6 +13956,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Ouvrir dans l'application Google Maps",
 			"waze": "Waze",
 			"waze_desc": "Ouvrir dans l'application Waze",
+			"sorted by distance": "Trié par distance",
 		},
 		"it-IT": {
 			"days_of_the_week" : ["", "Domenica", " Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"],
@@ -13999,6 +14014,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Distanza",
 			"get_directions": "Ottieni Indicazioni",
 			"select_map_app": "Seleziona App Mappe",
 			"apple_maps": "Apple Maps",
@@ -14007,6 +14023,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Apri nell'app Google Maps",
 			"waze": "Waze",
 			"waze_desc": "Apri nell'app Waze",
+			"sorted by distance": "Ordinati per distanza",
 		},
 		"nl-NL": {
 			"days_of_the_week" : ["", "Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"],
@@ -14072,6 +14089,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Openen in Google Maps app",
 			"waze": "Waze",
 			"waze_desc": "Openen in Waze app",
+			"sorted by distance": "Gesorteerd op afstand",
 		},
 		"pl-PL": {
 			"days_of_the_week" : ["", "Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota"],
@@ -14129,6 +14147,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Odległość",
 			"get_directions": "Pobierz Wskazówki",
 			"select_map_app": "Wybierz Aplikację Map",
 			"apple_maps": "Apple Maps",
@@ -14137,6 +14156,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Otwórz w aplikacji Google Maps",
 			"waze": "Waze",
 			"waze_desc": "Otwórz w aplikacji Waze",
+			"sorted by distance": "Posortowane według odległości",
 		},
 		"pt-BR": {
 			"days_of_the_week" : ["", "Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"],
@@ -14194,6 +14214,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Distância",
 			"get_directions": "Obter Direções",
 			"select_map_app": "Selecionar Aplicativo de Mapas",
 			"apple_maps": "Apple Maps",
@@ -14202,6 +14223,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Abrir no aplicativo Google Maps",
 			"waze": "Waze",
 			"waze_desc": "Abrir no aplicativo Waze",
+			"sorted by distance": "Classificado por distância",
 		},
 		"ru-RU": {
 			"days_of_the_week" : ["", "Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"],
@@ -14259,6 +14281,7 @@ function CroutonLocalization(language) {
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
 			'go': "Go!",
+			"distance": "Расстояние",
 			"get_directions": "Проложить маршрут",
 			"select_map_app": "Выбрать приложение карт",
 			"apple_maps": "Apple Maps",
@@ -14267,6 +14290,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Открыть в приложении Google Maps",
 			"waze": "Waze",
 			"waze_desc": "Открыть в приложении Waze",
+			"sorted by distance": "Сортировка по расстоянию",
 		},
 		"sv-SE": {
 			"days_of_the_week" : ["", "Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"],
@@ -14332,6 +14356,7 @@ function CroutonLocalization(language) {
 			"google_maps_desc_mobile": "Öppna i Google Maps-appen",
 			"waze": "Waze",
 			"waze_desc": "Öppna i Waze-appen",
+			"sorted by distance": "Sorterade efter avstånd",
 		}
 	};
 }
@@ -14371,8 +14396,8 @@ this["hbs_Crouton"]["templates"]["byday"] = Handlebars.template({"1":function(co
     + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":3,"column":39},"end":{"line":3,"column":68}}})) != null ? stack1 : "")
     + ">\n                <div class=\"group-header\">"
     + alias4(alias3((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
-    + "</div>\n                <div class=\"group-table-div\">\n                    <table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
-    + alias4((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":116},"end":{"line":6,"column":143}}}))
+    + "</div>\n                <div class=\"group-table-div\">\n                    <table class='bmlt-table table table-hover table-bordered tablesaw tablesaw-stack "
+    + alias4((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":102},"end":{"line":6,"column":129}}}))
     + "'>\n                        <tbody class=\"h-"
     + alias4(alias3((depth0 != null ? lookupProperty(depth0,"day") : depth0), depth0))
     + "\">\n"
@@ -14404,8 +14429,8 @@ this["hbs_Crouton"]["templates"]["byfield"] = Handlebars.template({"1":function(
     + ((stack1 = (lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"css-textAlign",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":3,"column":63},"end":{"line":3,"column":92}}})) != null ? stack1 : "")
     + ">\n                <div class=\"group-header\">"
     + alias1(((helper = (helper = lookupProperty(helpers,"key") || (data && lookupProperty(data,"key"))) != null ? helper : alias3),(typeof helper === "function" ? helper.call(alias2,{"name":"key","hash":{},"data":data,"loc":{"start":{"line":4,"column":42},"end":{"line":4,"column":50}}}) : helper)))
-    + "</div>\n                <div class=\"group-table-div\">\n					<table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
-    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":101},"end":{"line":6,"column":128}}}))
+    + "</div>\n                <div class=\"group-table-div\">\n					<table class='bmlt-table table table-hover table-bordered tablesaw tablesaw-stack "
+    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":6,"column":87},"end":{"line":6,"column":114}}}))
     + "'>\n                    	<tbody class=\"byfield.hbs\">\n"
     + ((stack1 = container.invokePartial(lookupProperty(partials,"meetings"),(depth0 != null ? lookupProperty(depth0,"group") : depth0),{"name":"meetings","data":data,"indent":"                        \t","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "                    	</tbody>\n                	</table>\n				</div>\n            </div>\n";
@@ -15095,8 +15120,8 @@ this["hbs_Crouton"]["templates"]["weekdays"] = Handlebars.template({"1":function
 
   return "        <div id='tab"
     + alias3(((helper = (helper = lookupProperty(helpers,"day") || (depth0 != null ? lookupProperty(depth0,"day") : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"day","hash":{},"data":data,"loc":{"start":{"line":3,"column":20},"end":{"line":3,"column":29}}}) : helper)))
-    + "' class='tab-pane'>\n            <div id=\"bmlt-table-div\">\n                <table class='bmlt-table table table-striped table-hover table-bordered tablesaw tablesaw-stack "
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":5,"column":112},"end":{"line":5,"column":139}}}))
+    + "' class='tab-pane'>\n            <div id=\"bmlt-table-div\">\n                <table class='bmlt-table table table-hover table-bordered tablesaw tablesaw-stack "
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":5,"column":98},"end":{"line":5,"column":125}}}))
     + "'>\n                    <tbody class=\"weekdays.hbs\">\n"
     + ((stack1 = (lookupProperty(helpers,"greaterThan")||(depth0 && lookupProperty(depth0,"greaterThan"))||alias2).call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),0,{"name":"greaterThan","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":7,"column":6},"end":{"line":9,"column":22}}})) != null ? stack1 : "")
     + ((stack1 = (lookupProperty(helpers,"lessThan")||(depth0 && lookupProperty(depth0,"lessThan"))||alias2).call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),1,{"name":"lessThan","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":10,"column":6},"end":{"line":16,"column":19}}})) != null ? stack1 : "")
@@ -15146,9 +15171,7 @@ var croutonDefaultTemplates = {
 		"{{#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}}"
+		"{{> distance }}"
 	].join('\n'),
 
 	metadata_template: [
@@ -16322,6 +16345,7 @@ function Crouton(config) {
 	self.filtering = false;
 	self.masterFormatCodes = [];
 	self.currentView = "weekday";
+	self.distanceTabAllowed = false;
 	self.config = {
 		on_complete: null,            // Javascript function to callback when data querying is completed.
 		root_server: null,			  // The root server to use.
@@ -16671,6 +16695,10 @@ function Crouton(config) {
 	};
 
 	self.groupedView = function (field) {
+		if (field.includes('distance') && !self.distanceTabAllowed) {
+			self.dayView();
+			return;
+		}
 		self.lowlightButton("#day");
 		self.lowlightButton(".groupingButton");
 		self.highlightButton("#groupingButton_" + field);
@@ -16706,11 +16734,22 @@ function Crouton(config) {
 	self.hideAllPages = function (id) {
 		jQuery("#tab-pane").removeClass("show").addClass("hide");
 	};
-
+	self.addStripes = function() {
+		var showingNow = [];
+		jQuery(".bmlt-data-row:not(.hide)").each(function (index, value) {
+			jQuery(value).addClass((index % 2) ? 'oddRow' : 'evenRow');
+			const rowId = value.id.split("-");
+			showingNow.push(rowId[rowId.length-1]);
+		});
+		showingNow = [...new Set(showingNow)];
+		return showingNow;
+	}
 	self.filterMeetingsFromView = function () {
 		jQuery(".group-header").removeClass("hide");
 		jQuery(".meeting-group").removeClass("hide");
 		jQuery(".bmlt-data-row").removeClass("hide");
+		jQuery(".bmlt-data-row").removeClass("evenRow");
+		jQuery(".bmlt-data-row").removeClass("oddRow");
 		jQuery(".filter-dropdown").each(function(index, filter) {
 			const dataValue = filter.value.replace("a-", "");
 			if (dataValue === "") return;
@@ -16721,13 +16760,7 @@ function Crouton(config) {
 				jQuery(".bmlt-data-row").not("[data-" + dataType + "~='" + dataValue + "']").addClass("hide");
 			}
 		});
-		var showingNow = [];
-		jQuery(".bmlt-data-row").not(".hide").each(function (index, value) {
-			jQuery(value).addClass((index % 2) ? 'oddRow' : 'evenRow');
-			const rowId = value.id.split("-");
-			showingNow.push(rowId[rowId.length-1]);
-		});
-		showingNow = [...new Set(showingNow)];
+		var showingNow = this.addStripes();
 		self.updateMeetingCount(showingNow);
 		self.updateFilters();
 		if (croutonMap) croutonMap.fillMap(showingNow);
@@ -17109,36 +17142,87 @@ function Crouton(config) {
 													   + (self.config.force_rootserver_in_querystring ? '&root_server=' + encodeURIComponent(self.config.root_server) : '')
 													);
 			}
+			this.calculateDistance(meetingData[m]);
+			meetings.push(meetingData[m])
+		}
 
-			meetingData[m]['distance'] = '';
-			if (meetingData[m]['venue_type'] != 2) {
-				const point = {"lat": meetingData[m]['latitude'], "lng": meetingData[m]['longitude']};
-				const distances = croutonMap.getDistanceFromSearch(point);
-				if (distances) {
-					meetingData[m]['distance_in_km'] = distances.km;
-					meetingData[m]['distance_in_miles'] = distances.miles;
-
-					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';
-							}
+		return meetings;
+	};
+	Crouton.prototype.updateDistances = function() {
+		const self = this;
+		var knt = 0;
+		jQuery('.meeting-distance').each(function(index) {
+			const jThis = jQuery(this);
+			const id = jQuery(this).data('id');
+			if (!id) return;
+			knt++;
+			const m = self.meetingData.find((m) => m.id_bigint==id);
+			self.calculateDistance(m);
+			if (m['distance'] == '') {
+				if (!jThis.hasClass('hide')) jThis.addClass('hide');
+			} else {
+				jThis.removeClass('hide');
+				jQuery(this).html(self.localization.getWord('Distance')+': '+m['distance']);
+				jQuery(this).closest('tr').data('distance', m['distance_in_km']);
+			}
+		});
+		const parent = jQuery('#byfield_distance_in_km tbody');
+		if (parent.length == 0) return;
+		if (knt === 0) {
+			parent.children().each(function (index) {
+				if (!this.id) return;
+				const id = this.id.replace("meeting-data-row-", "");
+				const m = self.meetingData.find((m) => m.id_bigint==id);
+				if (!m) return;
+				self.calculateDistance(m);
+				if (m['distance'] != '') {
+					jQuery(this).data('distance', m['distance_in_km']);
+					knt++;
+				}
+			});
+		}
+		const sorted = parent.children().sort(function (a, b) {
+			const distanceA =parseFloat( jQuery(a).data('distance'));
+			const distanceB =parseFloat( jQuery(b).data('distance'));
+      		return (distanceA < distanceB) ? -1 : (distanceA > distanceB) ? 1 : 0;
+   		});
+		parent.html(sorted);
+		jQuery("#byfield_distance_in_km tbody .bmlt-data-row").css({cursor: "pointer"});
+		jQuery("#byfield_distance_in_km tbody .bmlt-data-row").click(function (e) {
+			if (e.target.tagName !== 'A')
+				croutonMap.rowClick(parseInt(this.id.replace("meeting-data-row-", "")));
+		});
+		if (knt > 0) {
+			jQuery('#groupingButton_distance_in_km').removeClass('hide');
+			self.distanceTabAllowed = true;
+		}
+	}
+	self.calculateDistance = function(meetingData) {
+		meetingData['distance'] = '';
+		if (meetingData['venue_type'] != 2) {
+			const point = {"lat": meetingData['latitude'], "lng": meetingData['longitude']};
+			const distances = croutonMap.getDistanceFromSearch(point);
+			if (distances) {
+				meetingData['distance_in_km'] = distances.km;
+				meetingData['distance_in_miles'] = distances.miles;
+
+				if (self.config['distance_units'] === "km") {
+					if (meetingData['distance_in_km']) {
+						const d = meetingData['distance_in_km'];
+						if (d < 1) {
+							meetingData['distance'] = Math.round( d * 1000) + 'm';
+						}
+						else {
+							meetingData['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';
 					}
+				} else if (meetingData['distance_in_miles']) {
+					const d = meetingData['distance_in_miles'];
+					meetingData['distance'] = (Math.round(d * 100) / 100).toFixed(2) + ' miles';
 				}
 			}
-			meetings.push(meetingData[m])
 		}
-
-		return meetings;
-	};
+	}
 	self.showMessage = function(message) {
 		jQuery("#" + self.config['placeholder_id']).html("crouton: " + message);
 		jQuery("#" + self.config['placeholder_id']).removeClass("hide");
@@ -17352,6 +17436,7 @@ Crouton.prototype.meetingModal = function(meetingId) {
 }
 Crouton.prototype.searchMap = function() {
 	var self = this;
+	self.distanceTabAllowed = true;
 	if (!self.config.map_search || typeof self.config.map_search !== 'object') {
 		self.config.map_search = {
 			width: -50,
@@ -17393,10 +17478,6 @@ Crouton.prototype.searchMap = function() {
 Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 	var self = this;
 
-	if (!self.config.map_search) {
-		self.config.grouping_buttons = self.config.grouping_buttons.filter((b) => !b.field.startsWith('distance'));
-		if (self.config['view_by'] == 'distance') self.config['view_by'] = 'weekday';
-	}
 	self.lock(function() {
 		var body = jQuery("body");
 		if (self.config['theme'] !== '') {
@@ -17512,9 +17593,13 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 						? self.config.grouping_buttons[b]['accordionState'] : '';
 					groupingButtonsDataSorted[groupByName] = {};
 					if (groupByName.startsWith('distance')) {
-						groupingButtonsDataSorted[groupByName]['Sorted by Distance'] = {};
-						groupingButtonsDataSorted[groupByName]['Sorted by Distance'].group = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
-						groupingButtonsDataSorted[groupByName]['Sorted by Distance'].accordionState = 'non-collapsable';
+						groupingButtonsDataSorted[groupByName][self.localization.getWord('Sorted by Distance')] = {};
+						if (self.config.map_search) {
+							groupingButtonsDataSorted[groupByName][self.localization.getWord('Sorted by Distance')].group = [...self.meetingData].sort((a,b) => a['distance_in_km'] - b['distance_in_km']);
+						} else { // when not crouton_map, sorting byy distance is triggered by an action in meeting_map.
+							groupingButtonsDataSorted[groupByName][self.localization.getWord('Sorted by Distance')].group = [...self.meetingData].filter(m => m.venue_type != 2);
+						}
+						groupingButtonsDataSorted[groupByName][self.localization.getWord('Sorted by Distance')].accordionState = 'non-collapsable';
 						continue;
 					}
 					var sortKey = [];
@@ -17611,6 +17696,10 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 					},
 					"dropdownData": self.dropdownData
 				}, function () {
+					if (!self.config.map_search) {
+						jQuery('#groupingButton_distance_in_km').addClass('hide');
+					}
+					self.addStripes();
 					self.updateMeetingCount();
 					if (self.config['map_search'] != null || self.config['show_map']) {
 						jQuery(".bmlt-data-row").css({cursor: "pointer"});
@@ -18043,6 +18132,10 @@ crouton_Handlebars.registerPartial('offerIcsButton',
     "{{#if (hasBMLT2ics)}}{{> icsButton}}<br/>{{/if}}");
 crouton_Handlebars.registerPartial('directionsButton', hbs_Crouton.templates['directionsButton']);
 crouton_Handlebars.registerPartial('meetingDetailsButton', hbs_Crouton.templates['meetingDetailsButton']);
+crouton_Handlebars.registerPartial('distance',`
+<div class='meeting-distance{{#unless this.distance}} hide{{/unless}}' data-id='{{this.id_bigint}}'>
+{{getWord 'Distance'}}: {{this.distance}}
+</div>`);
 function convertToPunyCode(str) {
 	return str !== undefined ? punycode.toASCII(str.toLowerCase()).replace(/\W|_/g, "-") : "";
 }
@@ -18536,6 +18629,9 @@ function MeetingMap(inConfig) {
 			retrieveGeolocation().then(position => {
 				filterVisible(false);
 				gDelegate.setViewToPosition(position, filterMeetingsAndBounds, filterVisible);
+				gSearchPoint = {"lat": position.latitude, "lng": position.longitude};
+				crouton.updateDistances();
+
 			}).catch(error => {
 				console.log(error.message);
 				jQuery('.geo').removeClass("hide").addClass("show").html(`<p>${error.message}</p>`);
@@ -18715,6 +18811,8 @@ function MeetingMap(inConfig) {
 						coords = {latitude: position.coords.latitude, longitude: position.coords.longitude};
 						filterVisible(false);
 						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, filterVisible);
+						gSearchPoint = {"lat": position.coords.latitude, "lng": position.coords.longitude};
+						crouton.updateDistances();
 					},
 					showGeocodingDialog
 				);
@@ -18772,6 +18870,7 @@ function MeetingMap(inConfig) {
 			g_suspendedFullscreen = true;
 			toggleFullscreen();
 		}
+		if (!modal) return;
 		modal.style.display = "block";
 		swipableModal = swipe;
 		modal.focus();
@@ -18817,10 +18916,14 @@ function MeetingMap(inConfig) {
 		jQuery("#table_page").addClass("hide");
 		jQuery("#bmlt-map").css("display", "block");
 	}
-	function resetVisibleThenFilterMeetingsAndBounds(bounds) {
+	function resetVisibleThenFilterMeetingsAndBounds(bounds, center=null) {
 		filterVisible(false);
 		const ret = filterMeetingsAndBounds(bounds);
 		filterVisible(true);
+		if (gSearchPoint.lat != center.lat || gSearchPoint.lng != center.lng) {
+			gSearchPoint = center;
+			crouton.updateDistances();
+		}
 		return ret;
 	}
 	function lookupLocation(fullscreen) {