@bmlt-enabled/croutonjs 4.1.2 → 4.1.4

package/crouton-gmaps.js

@@ -15283,7 +15283,7 @@ function Crouton(config) {
 	self.currentView = "weekday";
 	self.distanceTabAllowed = false;
 	self.config = {
-		version: '4.1.2',            // CroutonJS version for debugging
+		version: '4.1.4',            // CroutonJS version for debugging
 		on_complete: null,            // Javascript function to callback when data querying is completed.
 		root_server: null,			  // The root server to use.
 		placeholder_id: "bmlt-tabs",  // The DOM id that will be used for rendering
@@ -16100,8 +16100,12 @@ function Crouton(config) {
 			});
 		}
 		const sorted = parent.children().sort(function (a, b) {
-			const distanceA =parseFloat( jQuery(a).data('distance'));
-			const distanceB =parseFloat( jQuery(b).data('distance'));
+			const idA =parseFloat( jQuery(a).data('meetingid').replace("meeting-data-row-", ""));
+			const idB =parseFloat( jQuery(b).data('meetingid').replace("meeting-data-row-", ""));
+			const dataA = self.meetingData.find((m) => m.id_bigint==idA);
+			const dataB = self.meetingData.find((m) => m.id_bigint==idB);
+			const distanceA = dataA ? parseFloat(dataA['distance_in_km']) : Number.POSITIVE_INFINITY;
+			const distanceB = dataB ? parseFloat(dataB['distance_in_km']) : Number.POSITIVE_INFINITY;
       		return (distanceA < distanceB) ? -1 : (distanceA > distanceB) ? 1 : 0;
    		});
 		parent.html(sorted);
@@ -17189,7 +17193,9 @@ function MeetingMap(inConfig) {
 			}
 		});
 	}
-
+	function isFilterVisible() {
+		return config.filter_visible && config.filter_visible == 1;
+	}
 	/************************************************************************************//**
 	 *	\brief Load the map and set it up.													*
 	 ****************************************************************************************/
@@ -17216,7 +17222,7 @@ function MeetingMap(inConfig) {
 			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};
 			if (gDelegate.createMap(inDiv, loc, hide)) {
 				// crouton_map and filter_visible triggers a query, Otherwise, redraw markers
-				if (config.map_search && config.filter_visible) {
+				if (config.map_search && isFilterVisible()) {
 					gDelegate.addListener('idle', triggerCroutonMapNewQuery, false);
 				} else {
 					gDelegate.addListener('zoomend', function (ev) {
@@ -17514,7 +17520,7 @@ function MeetingMap(inConfig) {
 			let lat_lngs = gAllMeetings.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
 			const maxRadius = config.maxTomatoWidth/2.0;
 			if (gSearchPoint) lat_lngs.push([gSearchPoint.lat, gSearchPoint.lng]);
-			if (config.map_search && config.filter_visible) {
+			if (config.map_search && isFilterVisible()) {
 				lat_lngs.sort((a,b) =>  getDistance({"lat":a[0],"lng":a[1]},gSearchPoint) - getDistance({"lat":b[0],"lng":b[1]},gSearchPoint));
 				while (getLatLngRadius(lat_lngs) > maxRadius && lat_lngs.length > 3) {
 					lat_lngs = lat_lngs.slice(0, lat_lngs.length/2);
@@ -17526,7 +17532,7 @@ function MeetingMap(inConfig) {
 		}
 		searchResponseCallback();
 		hideThrobber();
-		if (config.filter_visible || config.centerMe || config.goto) crouton.forceShowMap();
+		if (isFilterVisible() || config.centerMe || config.goto) crouton.forceShowMap();
 		if (config.centerMe) {
 			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition(
@@ -17535,7 +17541,7 @@ function MeetingMap(inConfig) {
 						filterVisible(false);
 						if (config.zoom) gDelegate.setZoom(false, config.zoom);
 						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, () => {
-							filterVisible(config.filter_visible == 1);
+							filterVisible(isFilterVisible());
 						});
 						gSearchPoint = {"lat": position.coords.latitude, "lng": position.coords.longitude};
 						crouton.updateDistances();
@@ -17546,10 +17552,10 @@ function MeetingMap(inConfig) {
 				showGeocodingDialog();
 			}
 		} else {
-			if ((!config.centerMe && !config.goto) && !(config.map_search && config.filter_visible)) {
-			  gDelegate.afterInit(()=>filterVisible(config.filter_visible));
+			if ((!config.centerMe && !config.goto) && !(config.map_search && isFilterVisible())) {
+			  gDelegate.afterInit(()=>filterVisible(isFilterVisible()));
 			}
-			if (config.goto) gDelegate.callGeocoder(config.goto, config.filter_visible == 1 ? resetVisibleThenFilterMeetingsAndBounds : setVisibleThenFilterMeetingsAndBounds);
+			if (config.goto) gDelegate.callGeocoder(config.goto, isFilterVisible() ? resetVisibleThenFilterMeetingsAndBounds : setVisibleThenFilterMeetingsAndBounds);
 		}
 	}
 	function createCityHash(allMeetings) {
@@ -17858,7 +17864,7 @@ function MeetingMap(inConfig) {
 	function onDragEnd() {
 		isMouseDown = false;
 		// if no [crouton_map], then turn filter visible back on.
-		if (config.map_search && config.filter_visible) triggerCroutonMapNewQuery(null);
+		if (config.map_search && isFilterVisible()) triggerCroutonMapNewQuery(null);
 		else filterVisible(true);
 	}
 	function triggerCroutonMapNewQuery(ev) {
@@ -18180,10 +18186,13 @@ function MapDelegate(in_config) {
         gAllMarkers = [];
         gOpenMarker = false;
     };
+    function isFilterVisible() {
+		return config.filter_visible && config.filter_visible == 1;
+	}
     function getZoomAdjust(only_out,filterMeetings) {
         if (!gMainMap) return 12;
         var ret = gMainMap.getZoom();
-        if (config.map_search && config.filter_visible) return ret;
+        if (config.map_search && isFilterVisible()) return ret;
         var center = gMainMap.getCenter();
         var bounds = gMainMap.getBounds();
         var zoomedOut = false;
@@ -18247,10 +18256,6 @@ function MapDelegate(in_config) {
         var worldPoint = gMainMap.getProjection().fromLatLngToPoint(latLng);
         return new google.maps.Point(worldPoint.x * scale, worldPoint.y * scale);
     };
-    function setZoom(filterMeetings) {
-        if (!gMainMap) return;
-        gMainMap.setZoom(getZoomAdjust(false,filterMeetings));
-    }
     function createClusterLayer() {
         gIsClustering = true;
     }