@bmlt-enabled/croutonjs 3.20.0 → 3.20.2

package/crouton-map.js

@@ -69,7 +69,11 @@ function MeetingMap(inConfig) {
 			if (gDelegate.createMap(inDiv, loc)) {
 				gDelegate.addListener('zoomend', function (ev) {
 					if (shouldRedrawMarkers() && gAllMeetings) {
-						searchResponseCallback();
+						if (listOnlyVisible) {
+							const oldValue = filterVisible(false);
+							searchResponseCallback();
+							filterVisible(oldValue);
+						} else searchResponseCallback();
 					}
 				}, false);
 				if (config.map_search) {
@@ -153,10 +157,10 @@ function MeetingMap(inConfig) {
 		controlDiv.querySelector("#nearbyMeetings").addEventListener('click', function (e) {
 			retrieveGeolocation().then(position => {
 				filterVisible(false);
-				gDelegate.setViewToPosition(position, filterMeetingsAndBounds);
+				gDelegate.setViewToPosition(position, filterMeetingsAndBounds, filterVisible);
 			}).catch(error => {
 				console.error(error.message);
-				$('.geo').removeClass("hide").addClass("show").html(`<p>${error.message}</p>`);
+				jQuery('.geo').removeClass("hide").addClass("show").html(`<p>${error.message}</p>`);
 			});
 			dropdownContent = document.getElementById("map-menu-dropdown").style.display = "none";
 		});
@@ -173,9 +177,10 @@ function MeetingMap(inConfig) {
 			let dropdownContent = document.getElementById("map-menu-dropdown");
 			if (dropdownContent.style.display == "inline-block") {
 				dropdownContent.style.display = "none";
-				filterVisible(false);
-			} else
+			} else {
+				jQuery("#filteringByVisibility").html(listOnlyVisible?'&#10004;':'');
 				dropdownContent.style.display = "inline-block";
+			}
 		});
 		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
 		controlDiv.querySelector("#close_table").addEventListener('click', hideListView);
@@ -222,7 +227,7 @@ function MeetingMap(inConfig) {
 	function filterFromCrouton(filter) {
 		gMeetingIdsFromCrouton = filter;
 		if (gAllMeetings)
-			searchResponseCallback(fitDuringFilter);
+			searchResponseCallback(fitDuringFilter && !listOnlyVisible);
 	};
 	function nearMeSearch() {
 		retrieveGeolocation().then(position => {
@@ -235,7 +240,7 @@ function MeetingMap(inConfig) {
 		});
 	};
 	function clickSearch(e) {
-		croutonMap.showMap();
+		croutonMap.showMap(false,false);
 		gDelegate.clickSearch(e, function(lat,lng) {
 			showThrobber();
 			crouton.searchByCoordinates(lat, lng, config.map_search.width);
@@ -300,20 +305,23 @@ function MeetingMap(inConfig) {
 		}
 		searchResponseCallback();
 		hideThrobber();
+		if (config.filter_visible || config.centerMe || config.goto) crouton.forceShowMap();
 		if (config.centerMe) {
 			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition(
 					function (position) {
 						coords = {latitude: position.coords.latitude, longitude: position.coords.longitude};
-						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds);
+						filterVisible(false);
+						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, filterVisible);
 					},
 					showGeocodingDialog
 				);
 			} else if (fitAll) {
 				showGeocodingDialog();
 			}
-		} else if (config.goto) {
-			gDelegate.callGeocoder(config.goto, filterMeetingsAndBounds);
+		} else {
+			if (!config.centerMe && !config.goto) gDelegate.afterInit(()=>filterVisible(config.filter_visible));
+			if (config.goto) gDelegate.callGeocoder(config.goto, resetVisibleThenFilterMeetingsAndBounds);
 		}
 	}
 	function createCityHash(allMeetings) {
@@ -407,7 +415,9 @@ function MeetingMap(inConfig) {
 	}
 	function resetVisibleThenFilterMeetingsAndBounds(bounds) {
 		filterVisible(false);
-		filterMeetingsAndBounds(bounds);
+		const ret = filterMeetingsAndBounds(bounds);
+		filterVisible(true);
+		return ret;
 	}
 	function lookupLocation(fullscreen) {
 		if (document.getElementById('goto-text').value != '') {
@@ -579,11 +589,16 @@ function MeetingMap(inConfig) {
 			marker_html, null ,meetings.map((m)=>parseInt(m.id_bigint)));
 	};
 	var listOnlyVisible = false;
+	var listener = null;
 	function filterBounds(bounds) {
 		return gAllMeetings.filter((meeting) => gDelegate.contains(bounds, meeting.latitude, meeting.longitude));
 	}
+	function showAllMeetings() {
+		filterVisible(false);
+		gDelegate.addListener('dragend', filterVisible, true);
+	}
 	function filterVisible(on=true) {
-		if (on===listOnlyVisible) return;
+		if (on==listOnlyVisible) return on;
 		let mtgs = on ? filterBounds(gDelegate.getBounds()) : gAllMeetings;
 		let visible = mtgs.map((m)=>m.id_bigint);
 		jQuery(".bmlt-data-row").each(function(index,row) {
@@ -596,6 +611,12 @@ function MeetingMap(inConfig) {
 		fitDuringFilter = true;
 		jQuery("#filteringByVisibility").html(on?'&#10004;':'');
 		listOnlyVisible = on;
+		if (on) listener = gDelegate.addListener('dragstart', showAllMeetings, true);
+		else if (listener) {
+			gDelegate.removeListener(listener);
+			listener = null;
+		}
+		return !on;
 	}
 	function toggleVisible() {
 		filterVisible(!listOnlyVisible);
@@ -677,14 +698,14 @@ function MeetingMap(inConfig) {
 		}
 		gDelegate.invalidateSize();
 	}
-	function showMap(isModal=false) {
+	function showMap(isModal=false, fitBounds=true) {
 		if (isModal && gModalDelegate) {
 			gModalDelegate.invalidateSize();
 			return;
 		}
 		gDelegate.invalidateSize();
 		if (!gAllMeetings) return;
-		gDelegate.fitBounds(
+		if (fitBounds) gDelegate.fitBounds(
 			((gMeetingIdsFromCrouton) ? gAllMeetings.filter((m) => gMeetingIdsFromCrouton.includes(m.id_bigint)) : gAllMeetings)
 				.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[])
 		);
@@ -702,6 +723,7 @@ function MeetingMap(inConfig) {
 	this.openModalWindow = openModalWindow;
 	this.closeModalWindow = closeModalWindow;
 	this.loadPopupMap = loadPopupMap;
+	this.filterVisible = filterVisible;
 };
 MeetingMap.prototype.initialize = null;
 MeetingMap.prototype.showMap = null;
@@ -713,6 +735,7 @@ MeetingMap.prototype.refreshMeetings = null;
 MeetingMap.prototype.openModalWindow = null;
 MeetingMap.prototype.closeModalWindow = null;
 MeetingMap.prototype.loadPopupMap = null;
+MeetingMap.prototype.filterVisible = null;
 
 function MapDelegate(config) {
     var g_icon_image_single = L.icon({
@@ -781,25 +804,33 @@ function MapDelegate(config) {
 		if (ev=='idle') {
 			ev = 'moveend';
 		}
+		if (ev=='dragstart') {
+			ev = 'movestart';
+		}
+		if (ev=='dragend') {
+			ev = 'moveend';
+		}
         if (once) {
 			gMainMap.once(ev, f);
 		} else {
 			gMainMap.on(ev, f);
 		}
+		return {'event': ev, 'f': f};
     }
+	function removeListener(o) {
+		gMainMap.off(o.event, o.f);
+	}
     function setViewToPosition(position, filterMeetings, extra=null) {
         var latlng = L.latLng(position.latitude, position.longitude);
 		gMainMap.flyTo(latlng);
-        gMainMap.on('moveend', function(ev) {
-			gMainMap.off('moveend');
+        gMainMap.once('moveend', function(ev) {
 			newZoom = getZoomAdjust(false, filterMeetings);
 			if (gMainMap.getZoom() != newZoom) {
 				gMainMap.setZoom(newZoom);
-				gMainMap.on('zoomend',function() {
-					gMainMap.off('zoomend'); 
+				gMainMap.once('zoomend',function() {
 					gMainMap.invalidateSize();
 					if (extra) {
-						gMainMap.on('load moveend', extra);
+						gMainMap.once('load moveend', extra);
 					}
 				});
 			} else {
@@ -853,7 +884,7 @@ function MapDelegate(config) {
 			if (knt == 0) {
 				ret -= 1;
 			}
-		} 
+		}
 		return ret;
 	}
     function setZoom(filterMeetings, force=0) {
@@ -866,7 +897,7 @@ function MapDelegate(config) {
 		return gMainMap.latLngToLayerPoint(L.latLng(lat,lng));
     }
 	function createMarker (	inCoords,		///< The long/lat for the marker.
-        multi,	///< The URI for the main icon
+        multi,	///< Flag if marker has multiple meetings
         in_html,		///< The info window HTML
         in_title,        ///< The tooltip
 		in_ids
@@ -881,10 +912,10 @@ function MapDelegate(config) {
 		if (typeof crouton != 'undefined') crouton.dayTabFromId(id);
 	}
     var marker = L.marker(inCoords, {icon: in_main_icon, title: in_title}).bindPopup(in_html);
+	marker.isMulti = multi;
 	if (gClusterLayer) gClusterLayer.addLayer(marker);
 	else marker.addTo(gMainMap);
 	marker.on('popupopen', function(e) {
-        marker.oldIcon = marker.getIcon();
 		marker.setIcon(g_icon_image_selected);
 		gMainMap.on('zoomstart',function(){
 			marker.closePopup();
@@ -897,7 +928,7 @@ function MapDelegate(config) {
         });
 	});
     marker.on('popupclose', function(e) {
-        marker.setIcon(marker.oldIcon);
+        marker.setIcon(marker.isMulti ? g_icon_image_multi : g_icon_image_single);
 		jQuery(".bmlt-data-row > td").removeClass("rowHighlight");
     });
     gAllMarkers.push( {ids: in_ids, marker: marker} );
@@ -1025,7 +1056,7 @@ function addControl(div,pos,cb) {
             gMainMap.on('moveend', function(ev) {
 				gMainMap.off('moveend');
 				gMainMap.setZoom(getZoomAdjust(true, filterMeetings));
-				gMainMap.on('moveend',function() {
+				gMainMap.once('moveend',function() {
 					gTileLayer.redraw();
 				});
 			});
@@ -1093,9 +1124,13 @@ function addControl(div,pos,cb) {
 	function modalOff() {
 		if (gMainMap) gMainMap.dragging.enable()
 	}
+	function afterInit(f) {
+		f();
+	}
 	function returnTrue() {return true;}
     this.createMap = createMap;
     this.addListener = addListener;
+	this.removeListener = removeListener;
     this.addControl = addControl;
     this.setViewToPosition = setViewToPosition;
     this.clearAllMarkers = clearAllMarkers;
@@ -1118,9 +1153,11 @@ function addControl(div,pos,cb) {
 	this.getGeocodeCenter = getGeocodeCenter;
 	this.modalOn = modalOn;
 	this.modalOff = modalOff;
+	this.afterInit = afterInit;
 }
 MapDelegate.prototype.createMap = null;
 MapDelegate.prototype.addListener = null;
+MapDelegate.prototype.removeListener = null;
 MapDelegate.prototype.addControl = null;
 MapDelegate.prototype.setViewToPosition = null;
 MapDelegate.prototype.clearAllMarkers = null;
@@ -1143,6 +1180,7 @@ MapDelegate.prototype.clickSearch = null;
 MapDelegate.prototype.getGeocodeCenter = null;
 MapDelegate.prototype.modalOn = null;
 MapDelegate.prototype.modalOff = null;
+MapDelegate.prototype.afterInit = null;
 
 /* @preserve
  * Leaflet 1.5.1+Detached: 2e3e0ffbe87f246eb76d86d2633ddd59b262830b.2e3e0ff, a JS library for interactive maps. http://leafletjs.com